Mercurial > forge

changeset 12674:3ce60a1159f8 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix bug in documentation
author cdf
date Mon, 17 Aug 2015 16:51:00 +0000
parents 88676c510f30
children eda752bd797a
files extra/ocs/doc/iffspec_ocs.tex extra/ocs/src/Mshichmanhodgesmosfet.cc
diffstat 2 files changed, 15 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/extra/ocs/doc/iffspec_ocs.tex	Mon Aug 17 10:26:08 2015 +0000
+++ b/extra/ocs/doc/iffspec_ocs.tex	Mon Aug 17 16:51:00 2015 +0000
@@ -8,6 +8,9 @@
 \usepackage{amsmath}
 \usepackage{amsfonts}
 \usepackage{listings}
+\let\tt=\normalfont\ttfamily
+\let\bf=\normalfont\bfseries
+\let\it=\normalfont\itshape
 \newcommand{\Iff}{{\tt IFF}}
 \newcommand{\nlc}{{\tt NLC}}
 \newcommand{\cir}{{\tt CIR}}
--- a/extra/ocs/src/Mshichmanhodgesmosfet.cc	Mon Aug 17 10:26:08 2015 +0000
+++ b/extra/ocs/src/Mshichmanhodgesmosfet.cc	Mon Aug 17 16:51:00 2015 +0000
@@ -124,7 +124,7 @@
   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 dkdT = mu0*Cox*W*(-3.0/2)*xpow((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 - xpow(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-(xpow(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)*xpow((vgs-Vth),2) + vds/rd;
       *gm  = k*(vgs-Vth);
       *gd  = 1/rd;
-      *didT= (dkdT/(2))*pow((vgs-Vth),2);
+      *didT= (dkdT/(2))*xpow((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*xpow((T + Tshift)/300.0,-3.0/2.0)*W/L;
+  double dkdT = - mu0*Cox*W*(-3.0/2.0)*xpow((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 - xpow(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-(xpow(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)*xpow((vgs-Vth),2) + vds/rd;
       *gm  = k*(vgs-Vth);
       *gd  = 1/rd;
-      *didT= (dkdT/(2))*pow((vgs-Vth),2);
+      *didT= (dkdT/(2))*xpow((vgs-Vth),2);
     }  
 
   *P       = -(*ids)*vds;
@@ -543,7 +543,7 @@
       else
 	error("Mshichmanhodgesmosfet: unknown element type.\n");
 
-      return retval;
     }
 
+  return (retval);
 }