luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prepare few things for VS compilation

This commit is contained in:
dwarning 2020-12-30 13:56:23 +01:00
parent 149bf2c8ca
commit faf0d29095
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml
View File

@ -82,7 +82,7 @@ int $(module)ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
default: default:
return(-1); return(-1);
} }
return(-1);
} }
</admst:template> </admst:template>

4
src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml
View File

@ -91,10 +91,10 @@
#define EXIT_IF_ISNAN(var) \\ #define EXIT_IF_ISNAN(var) \\
{ \\ { \\
} }
#ifndef _MSC_VER
static inline double max(double x,double y) { return ((x)&gt;(y))?(x):(y); } static inline double max(double x,double y) { return ((x)&gt;(y))?(x):(y); }
static inline double min(double x,double y) { return ((x)&lt;(y))?(x):(y); } static inline double min(double x,double y) { return ((x)&lt;(y))?(x):(y); }
#endif
/* ngspice \$simparam variables /* ngspice \$simparam variables
gdev (1/Ohms): Additional conductance to be added to nonlinear branches for conductance homotopy convergence algorithm. gdev (1/Ohms): Additional conductance to be added to nonlinear branches for conductance homotopy convergence algorithm.
gmin (1/Ohms): Minimum conductance placed in parallel with nonlinear branches. gmin (1/Ohms): Minimum conductance placed in parallel with nonlinear branches.

2
src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml
View File

@ -334,7 +334,7 @@ int $(module)guesstopology (SMPmatrix *matrix, CKTcircuit *ckt, $(module)model *
</admst:for-each> </admst:for-each>
<admst:for-each select="$localvariables"> <admst:for-each select="$localvariables">
<admst:if test="[type='integer']">int %(name);\n</admst:if> <admst:if test="[type='integer']">int %(name);\n</admst:if>
<admst:if test="[type='real']">double %(name)=0.0/0.0;\n</admst:if> <admst:if test="[type='real']">double %(name)=0.0;\n</admst:if>
<admst:if test="[type='string']">char* %(name);\n</admst:if> <admst:if test="[type='string']">char* %(name);\n</admst:if>
</admst:for-each> </admst:for-each>
<admst:for-each select="analog/code[datatypename='block']/item"> <admst:for-each select="analog/code[datatypename='block']/item">

2
src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml
View File

@ -63,7 +63,7 @@ int $(module)mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
default: default:
return(-1); return(-1);
} }
return(-1);
} }
</admst:template> </admst:template>

2
src/spicelib/devices/adms/admst/ngspiceVersion.xml
View File

@ -1031,7 +1031,7 @@
<admst:if test="[static='no' and dynamic='yes']">#if defined(_DYNAMIC)\n</admst:if> <admst:if test="[static='no' and dynamic='yes']">#if defined(_DYNAMIC)\n</admst:if>
<admst:value-of select="name"/> <admst:value-of select="name"/>
<admst:if test="[type='integer']">int %s;\n</admst:if> <admst:if test="[type='integer']">int %s;\n</admst:if>
<admst:if test="[type='real']">double %s=0.0/0.0;\n</admst:if> <admst:if test="[type='real']">double %s=0.0;\n</admst:if>
<admst:if test="[type='string']">char* %s;\n</admst:if> <admst:if test="[type='string']">char* %s;\n</admst:if>
<admst:if test="[insource='yes']"> <admst:if test="[insource='yes']">
<admst:if test="probe"> <admst:if test="probe">