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

make use of analogfunction.xml

This commit is contained in:
rlar 2017-09-23 17:05:57 +02:00 committed by Holger Vogt
parent 4598f9fc53
commit 115e51aa47
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/spicelib/devices/adms/admst/ngspiceMODULE.hxx.xml
View File

@ -2018,7 +2018,7 @@ inline double _d1_pow(double x,double y) { return (x==0.0)?0.0:((log(x)/exp(0.
<admst:apply-templates select="." match="ddx"/>
<admst:variable name="dargs" select="$dargs$ep"/>
</admst:for-each>
<admst:variable name="e" select="$(fname)($args)"/>
<admst:variable name="e" select="$(module)_$(fname)($args)"/>
</admst:otherwise>
</admst:choose>
@ -2090,7 +2090,7 @@ inline double _d1_pow(double x,double y) { return (x==0.0)?0.0:((log(x)/exp(0.
</admst:choose>
</admst:when>
<admst:otherwise>
<admst:variable name="ep" select="d_$(fname)($args,$dargs)"/>
<admst:variable name="ep" select="$(module)_d_$(fname)($args,$dargs)"/>
</admst:otherwise>
</admst:choose>
<admst:if test="$qprobe">
@ -2163,7 +2163,7 @@ inline double _d1_pow(double x,double y) { return (x==0.0)?0.0:((log(x)/exp(0.
</admst:choose>
</admst:when>
<admst:otherwise>
<admst:variable name="eq" select="d_$(fname)($args,$dargs)"/>
<admst:variable name="eq" select="$(module)_d_$(fname)($args,$dargs)"/>
</admst:otherwise>
</admst:choose>

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

@ -37,7 +37,10 @@
<admst:when test="[name='\$model']"><admst:return name="fname" value="_modelname"/></admst:when>
<admst:when test="[name='\$instance']"><admst:return name="fname" value="_instancename"/></admst:when>
<admst:when test="[name='\$temperature']"><admst:return name="fname" value="_circuit_temp"/></admst:when>
<admst:otherwise><admst:return name="fname" value="%(name)"/></admst:otherwise>
<admst:when test="[name='abs' or name='acos' or name='asinh' or name='acosh' or name='atanh' or name='asin' or name='atan' or name='cos' or name='cosh' or name='exp' or name='hypot' or name='limexp' or name='ln' or name='log' or name='sin' or name='sinh' or name='sqrt' or name='tan' or name='tanh' or name='atan2' or name='pow' or name='max' or name='min']">
<admst:return name="fname" value="%(name)"/>
</admst:when>
<admst:otherwise><admst:return name="fname" value="$(module)_%(name)"/></admst:otherwise>
</admst:choose>
</admst:template>

4
src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
View File

@ -37,6 +37,7 @@ BUILT_SOURCES = \\
$(module).c \\
$(module).hxx \\
$(module)acld.c \\
$(module).analogfunction.c \\
$(module)ask.c \\
$(module)defs.h \\
$(module)del.c \\
@ -62,7 +63,6 @@ lib$(module)_la_SOURCES = \\
CLEANFILES = \\
\$(BUILT_SOURCES) \\
$(module)noise.c \\
$(module).analogfunction.c \\
.$(module).va.adms \\
.adms.implicit.xml \\
.interface.xml \\
@ -85,7 +85,7 @@ DISTCLEANFILES = Makefile.am \\
Makefile.in
\%.c \%.hxx \\
\%acld.c \%ask.c \%defs.h \%del.c \%dest.c \%ext.h \%guesstopology.c \\
\%acld.c \%.analogfunction.c \%ask.c \%defs.h \%del.c \%dest.c \%ext.h \%guesstopology.c \\
\%init.c \%init.h \%itf.h \%load.c \%mask.c \%mdel.c \%mpar.c \%par.c \\
\%pzld.c \%setup.c \%temp.c \%trunc.c \\
: \$(srcdir)/admsva/\%.va \\