[138491] trunk/dports/math/octave-ocs

[michaelld at macports.org]

Revision: 138491
          https://trac.macports.org/changeset/138491
Author:   michaelld at macports.org
Date:     2015-07-09 18:01:56 -0700 (Thu, 09 Jul 2015)
Log Message:
-----------
octave-ocs: update to 0.1.4; addresses ticket #48298.

Modified Paths:
--------------
    trunk/dports/math/octave-ocs/Portfile

Added Paths:
-----------
    trunk/dports/math/octave-ocs/files/
    trunk/dports/math/octave-ocs/files/patch-src-Mshichmanhodgesmosfet.cc.diff

Modified: trunk/dports/math/octave-ocs/Portfile
===================================================================
--- trunk/dports/math/octave-ocs/Portfile	2015-07-10 00:37:29 UTC (rev 138490)
+++ trunk/dports/math/octave-ocs/Portfile	2015-07-10 01:01:56 UTC (rev 138491)
@@ -4,15 +4,17 @@
 PortSystem          1.0
 PortGroup           octave 1.0
 
-octave.setup        ocs 0.1.3
+octave.setup        ocs 0.1.4
 platforms           darwin
 license             GPL-2+
-maintainers         nomaintainer
+maintainers         gmail.com:mschamschula openmaintainer
 description         Package for solving DC and transient \
                     electrical circuit equations.
 long_description    ${description}
 
-checksums           rmd160 35c7e5816bcce3a19177bc5c846201cc23bd728f \
-                    sha256 eb0e69b2bb498200947b598cd43181c49511d4df9acbaaeb14dd817719d55829
+checksums           rmd160 750636fe2f101c079f99e61a5e14c615ed386e9d \
+                    sha256 0f0ac9457de7d77b94e18989c78d5aa71a1e3363f012bd6e59bb951c1dac2bba
 
 depends_lib-append  port:octave-odepkg
+
+patchfiles          patch-src-Mshichmanhodgesmosfet.cc.diff

Added: trunk/dports/math/octave-ocs/files/patch-src-Mshichmanhodgesmosfet.cc.diff
===================================================================
--- trunk/dports/math/octave-ocs/files/patch-src-Mshichmanhodgesmosfet.cc.diff	                        (rev 0)
+++ trunk/dports/math/octave-ocs/files/patch-src-Mshichmanhodgesmosfet.cc.diff	2015-07-10 01:01:56 UTC (rev 138491)
@@ -0,0 +1,76 @@
+--- src/Mshichmanhodgesmosfet.cc.orig	2015-07-07 00:03:42.000000000 -0500
++++ src/Mshichmanhodgesmosfet.cc	2015-07-09 18:04:13.000000000 -0500
+@@ -123,8 +123,8 @@
+   double vb   = extvar(3); // V-bulk
+   double T    = extvar(4); // Temperature
+ 
+-  double k    = mu0*Cox*pow((T + Tshift)/300.0,-3.0/2.0)*W/L;
+-  double dkdT = mu0*Cox*W*(-3.0/2)*pow((T + Tshift)/300.0,-5.0/2.0 )*(1.0/300.0)/L;
++  double k    = mu0*Cox*std::pow((T + Tshift)/300.0,-3.0/2.0)*W/L;
++  double dkdT = mu0*Cox*W*(-3.0/2)*std::pow((T + Tshift)/300.0,-5.0/2.0 )*(1.0/300.0)/L;
+   
+   double vgs  = vg - vs;
+   double vds  = vd - vs;
+@@ -138,10 +138,10 @@
+     }  
+   else if ( ( (vgs-Vth)>= vds ) && (vds>=0))
+     {
+-      *ids  = k*((vgs-Vth)*vds - pow(vds,2)/2 ) + vds/rd;
++      *ids  = k*((vgs-Vth)*vds - std::pow(vds,2)/2 ) + vds/rd;
+       *gm   = k*vds;
+       *gd   = k*(vgs-Vth-vds) + (1/rd);
+-      *didT = dkdT*((vgs-Vth)*vds-(pow(vds,2))/2);
++      *didT = dkdT*((vgs-Vth)*vds-(std::pow(vds,2))/2);
+     }  
+   else if (((vgs-Vth)>=(vds))&&(vds<0))
+     {  
+@@ -152,10 +152,10 @@
+     }  
+   else // (i.e. if 0 <= vgs-vth <= vds)
+     {  
+-      *ids = (k/2)*pow((vgs-Vth),2) + vds/rd;
++      *ids = (k/2)*std::pow((vgs-Vth),2) + vds/rd;
+       *gm  = k*(vgs-Vth);
+       *gd  = 1/rd;
+-      *didT= (dkdT/(2))*pow((vgs-Vth),2);
++      *didT= (dkdT/(2))*std::pow((vgs-Vth),2);
+     }  
+ 
+   *P       = -(*ids)*vds;
+@@ -177,8 +177,8 @@
+   double vb   = extvar(3); // V-bulk
+   double T    = extvar(4); // Temperature
+ 
+-  double k    = - mu0*Cox*pow((T + Tshift)/300.0,-3.0/2.0)*W/L;
+-  double dkdT = - mu0*Cox*W*(-3.0/2.0)*pow((T + Tshift)/300.0,-5.0/2.0 )*(1.0/300.0)/L;
++  double k    = - mu0*Cox*std::pow((T + Tshift)/300.0,-3.0/2.0)*W/L;
++  double dkdT = - mu0*Cox*W*(-3.0/2.0)*std::pow((T + Tshift)/300.0,-5.0/2.0 )*(1.0/300.0)/L;
+ 
+   double vgs  = vg - vs;
+   double vds  = vd - vs;
+@@ -192,10 +192,10 @@
+     }  
+   else if ( ( (vgs-Vth)<= vds ) && (vds<=0))
+     {
+-      *ids  = k*((vgs-Vth)*vds - pow(vds,2)/2 ) + vds/rd;
++      *ids  = k*((vgs-Vth)*vds - std::pow(vds,2)/2 ) + vds/rd;
+       *gm   = k*vds;
+       *gd   = k*(vgs-Vth-vds) + (1/rd);
+-      *didT = dkdT*((vgs-Vth)*vds-(pow(vds,2))/2);
++      *didT = dkdT*((vgs-Vth)*vds-(std::pow(vds,2))/2);
+     }  
+   else if (((vgs-Vth)<=(vds))&&(vds>0))
+     {  
+@@ -206,10 +206,10 @@
+     }  
+   else // (i.e. if 0 <= vgs-vth <= vds)
+     {  
+-      *ids = (k/2)*pow((vgs-Vth),2) + vds/rd;
++      *ids = (k/2)*std::pow((vgs-Vth),2) + vds/rd;
+       *gm  = k*(vgs-Vth);
+       *gd  = 1/rd;
+-      *didT= (dkdT/(2))*pow((vgs-Vth),2);
++      *didT= (dkdT/(2))*std::pow((vgs-Vth),2);
+     }  
+ 
+   *P       = -(*ids)*vds;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150709/0354608a/attachment-0001.html>