#3/4 #include <ngspice/...> --> #include "ngspice/..." for adms

This commit is contained in:
rlar 2011-12-11 18:16:09 +00:00
parent 4e3cc188d9
commit 225f5aef19
19 changed files with 162 additions and 104 deletions

View File

@ -1,3 +1,7 @@
2011-12-11 Robert Larice
* src/spicelib/devices/adms/admst/ngspiceMODULE*.xml :
#3/4 #include <ngspice/...> --> #include "ngspice/..." for adms
2011-12-11 Robert Larice
* src/xspice/cmpp/pp_mod.c ,
* src/xspice/cmpp/writ_ifs.c :

View File

@ -3,7 +3,10 @@
<!--
$Id$
$Log$
Revision 1.7 2011-08-20 17:49:37 rlar
Revision 1.8 2011-12-11 18:16:09 rlar
#3/4 #include <ngspice/...> --> #include "ngspice/..." for adms
Revision 1.7 2011/08/20 17:49:37 rlar
#6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
Revision 1.6 2011/07/23 07:57:07 dwarning
@ -57,10 +60,10 @@
<admst:value-of select="attribute[name='ngspicename']/value"/>
<admst:variable name="module" select="%s"/>
#include &lt;ngspice/ngspice.h&gt;
#include &lt;ngspice/devdefs.h&gt;
#include &quot;ngspice/ngspice.h&quot;
#include &quot;ngspice/devdefs.h&quot;
#include &quot;$(module)defs.h&quot;
#include &lt;ngspice/suffix.h&gt;
#include &quot;ngspice/suffix.h&quot;
<admst:text format="IFparm $(module)pTable[] = {\n"/>
<admst:join select="variable[parametertype='instance' and input='yes']" separator=",\n">

View File

@ -3,7 +3,10 @@
<!--
$Id$
$Log$
Revision 1.7 2011-08-20 17:49:37 rlar
Revision 1.8 2011-12-11 18:16:09 rlar
#3/4 #include <ngspice/...> --> #include "ngspice/..." for adms
Revision 1.7 2011/08/20 17:49:37 rlar
#6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
Revision 1.6 2011/01/13 17:05:46 dwarning
@ -70,11 +73,11 @@
<admst:value-of select="attribute[name='ngspicename']/value"/>
<admst:variable name="module" select="%s"/>
#include &lt;ngspice/ngspice.h&gt;
#include &lt;ngspice/cktdefs.h&gt;
#include &quot;ngspice/ngspice.h&quot;
#include &quot;ngspice/cktdefs.h&quot;
#include &quot;$(module)defs.h&quot;
#include &lt;ngspice/sperror.h&gt;
#include &lt;ngspice/suffix.h&gt;
#include &quot;ngspice/sperror.h&quot;
#include &quot;ngspice/suffix.h&quot;
int $(module)acLoad(GENmodel *inModel, CKTcircuit *ckt)
{

View File

@ -3,7 +3,10 @@
<!--
$Id$
$Log$
Revision 1.8 2011-08-20 17:49:37 rlar
Revision 1.9 2011-12-11 18:16:09 rlar
#3/4 #include <ngspice/...> --> #include "ngspice/..." for adms
Revision 1.8 2011/08/20 17:49:37 rlar
#6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
Revision 1.7 2011/08/12 15:18:41 rlar
@ -61,13 +64,13 @@
<admst:value-of select="attribute[name='ngspicename']/value"/>
<admst:variable name="module" select="%s"/>
#include &lt;ngspice/ngspice.h&gt;
#include &lt;ngspice/const.h&gt;
#include &lt;ngspice/cktdefs.h&gt;
#include &quot;ngspice/ngspice.h&quot;
#include &quot;ngspice/const.h&quot;
#include &quot;ngspice/cktdefs.h&quot;
#include &quot;$(module)defs.h&quot;
#include &lt;ngspice/ifsim.h&gt;
#include &lt;ngspice/sperror.h&gt;
#include &lt;ngspice/suffix.h&gt;
#include &quot;ngspice/ifsim.h&quot;
#include &quot;ngspice/sperror.h&quot;
#include &quot;ngspice/suffix.h&quot;
int $(module)ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *select)
{

View File

@ -3,7 +3,10 @@
<!--
$Id$
$Log$
Revision 1.18 2011-08-20 17:49:37 rlar
Revision 1.19 2011-12-11 18:16:09 rlar
#3/4 #include <ngspice/...> --> #include "ngspice/..." for adms
Revision 1.18 2011/08/20 17:49:37 rlar
#6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
Revision 1.17 2011/01/13 17:05:46 dwarning
@ -99,11 +102,11 @@
#ifndef $(module)
#define $(module)
#include &lt;ngspice/cktdefs.h&gt;
#include &lt;ngspice/ifsim.h&gt;
#include &lt;ngspice/gendefs.h&gt;
#include &lt;ngspice/complex.h&gt;
#include &lt;ngspice/noisedef.h&gt;
#include &quot;ngspice/cktdefs.h&quot;
#include &quot;ngspice/ifsim.h&quot;
#include &quot;ngspice/gendefs.h&quot;
#include &quot;ngspice/complex.h&quot;
#include &quot;ngspice/noisedef.h&quot;
<admst:for-each select="variable">
<admst:value-of select="name"/>

View File

@ -3,7 +3,10 @@
<!--
$Id$
$Log$
Revision 1.4 2011-08-20 17:49:37 rlar
Revision 1.5 2011-12-11 18:16:09 rlar
#3/4 #include <ngspice/...> --> #include "ngspice/..." for adms
Revision 1.4 2011/08/20 17:49:37 rlar
#6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
Revision 1.3 2011/01/13 17:05:46 dwarning
@ -60,10 +63,10 @@
<admst:value-of select="attribute[name='ngspicename']/value"/>
<admst:variable name="module" select="%s"/>
#include &lt;ngspice/ngspice.h&gt;
#include &quot;ngspice/ngspice.h&quot;
#include &quot;$(module)defs.h&quot;
#include &lt;ngspice/sperror.h&gt;
#include &lt;ngspice/suffix.h&gt;
#include &quot;ngspice/sperror.h&quot;
#include &quot;ngspice/suffix.h&quot;
int $(module)delete(GENmodel *inModel, IFuid name, GENinstance **inInst)

View File

@ -3,7 +3,10 @@
<!--
$Id$
$Log$
Revision 1.4 2011-08-20 17:49:37 rlar
Revision 1.5 2011-12-11 18:16:09 rlar
#3/4 #include <ngspice/...> --> #include "ngspice/..." for adms
Revision 1.4 2011/08/20 17:49:37 rlar
#6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
Revision 1.3 2011/01/13 17:05:46 dwarning
@ -60,9 +63,9 @@
<admst:value-of select="attribute[name='ngspicename']/value"/>
<admst:variable name="module" select="%s"/>
#include &lt;ngspice/ngspice.h&gt;
#include &quot;ngspice/ngspice.h&quot;
#include &quot;$(module)defs.h&quot;
#include &lt;ngspice/suffix.h&gt;
#include &quot;ngspice/suffix.h&quot;
void $(module)destroy(GENmodel **inModel)

View File

@ -3,7 +3,10 @@
<!--
$Id$
$Log$
Revision 1.16 2011-08-20 17:49:37 rlar
Revision 1.17 2011-12-11 18:16:09 rlar
#3/4 #include <ngspice/...> --> #include "ngspice/..." for adms
Revision 1.16 2011/08/20 17:49:37 rlar
#6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
Revision 1.15 2011/08/12 15:18:41 rlar
@ -258,14 +261,14 @@
<admst:template match="code">
#include &lt;ngspice/ngspice.h&gt;
#include &lt;ngspice/cktdefs.h&gt;
#include &lt;ngspice/smpdefs.h&gt;
#include &quot;ngspice/ngspice.h&quot;
#include &quot;ngspice/cktdefs.h&quot;
#include &quot;ngspice/smpdefs.h&quot;
#include &quot;$(module)defs.h&quot;
#include &lt;ngspice/const.h&gt;
#include &lt;ngspice/sperror.h&gt;
#include &lt;ngspice/ifsim.h&gt;
#include &lt;ngspice/suffix.h&gt;
#include &quot;ngspice/const.h&quot;
#include &quot;ngspice/sperror.h&quot;
#include &quot;ngspice/ifsim.h&quot;
#include &quot;ngspice/suffix.h&quot;
#define jacobian(a,b) here-&gt;PTR_J_##a##_##b##_required=1;
#define static_jacobian4(p,q,r,s) jacobian(p,r) jacobian(p,s) jacobian(q,r) jacobian(q,s)

View File

@ -3,7 +3,10 @@
<!--
$Id$
$Log$
Revision 1.9 2011-08-20 17:49:37 rlar
Revision 1.10 2011-12-11 18:16:09 rlar
#3/4 #include <ngspice/...> --> #include "ngspice/..." for adms
Revision 1.9 2011/08/20 17:49:37 rlar
#6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
Revision 1.8 2011/08/20 17:27:13 rlar
@ -62,7 +65,7 @@
<admst:template match="code">
#include "config.h"
#include &lt;ngspice/devdefs.h&gt;
#include &quot;ngspice/devdefs.h&quot;
<admst:value-of select="attribute[name='ngspicename']/value"/>
<admst:variable name="module" select="%s"/>

View File

@ -3,7 +3,10 @@
<!--
$Id$
$Log$
Revision 1.11 2011-08-20 17:49:37 rlar
Revision 1.12 2011-12-11 18:16:09 rlar
#3/4 #include <ngspice/...> --> #include "ngspice/..." for adms
Revision 1.11 2011/08/20 17:49:37 rlar
#6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
Revision 1.10 2011/08/12 15:18:41 rlar
@ -86,14 +89,14 @@
<admst:value-of select="attribute[name='ngspicename']/value"/>
<admst:variable name="module" select="%s"/>
#include &lt;ngspice/ngspice.h&gt;
#include &lt;ngspice/cktdefs.h&gt;
#include &quot;ngspice/ngspice.h&quot;
#include &quot;ngspice/cktdefs.h&quot;
#include &quot;$(module)defs.h&quot;
#include &lt;ngspice/const.h&gt;
#include &lt;ngspice/trandefs.h&gt;
#include &lt;ngspice/sperror.h&gt;
#include &lt;ngspice/devdefs.h&gt;
#include &lt;ngspice/suffix.h&gt;
#include &quot;ngspice/const.h&quot;
#include &quot;ngspice/trandefs.h&quot;
#include &quot;ngspice/sperror.h&quot;
#include &quot;ngspice/devdefs.h&quot;
#include &quot;ngspice/suffix.h&quot;
/*fixme: noise not implemented in ngspice*/
#define ngspice_flickernoise(p,n,mag,freq,info)\\

View File

@ -3,7 +3,10 @@
<!--
$Id$
$Log$
Revision 1.8 2011-08-20 17:49:37 rlar
Revision 1.9 2011-12-11 18:16:09 rlar
#3/4 #include <ngspice/...> --> #include "ngspice/..." for adms
Revision 1.8 2011/08/20 17:49:37 rlar
#6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
Revision 1.7 2011/08/12 15:18:41 rlar
@ -60,14 +63,14 @@
<admst:value-of select="attribute[name='ngspicename']/value"/>
<admst:variable name="module" select="%s"/>
#include &lt;ngspice/ngspice.h&gt;
#include &lt;ngspice/const.h&gt;
#include &lt;ngspice/ifsim.h&gt;
#include &lt;ngspice/cktdefs.h&gt;
#include &lt;ngspice/devdefs.h&gt;
#include &quot;ngspice/ngspice.h&quot;
#include &quot;ngspice/const.h&quot;
#include &quot;ngspice/ifsim.h&quot;
#include &quot;ngspice/cktdefs.h&quot;
#include &quot;ngspice/devdefs.h&quot;
#include &quot;$(module)defs.h&quot;
#include &lt;ngspice/sperror.h&gt;
#include &lt;ngspice/suffix.h&gt;
#include &quot;ngspice/sperror.h&quot;
#include &quot;ngspice/suffix.h&quot;
int $(module)mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
{

View File

@ -3,7 +3,10 @@
<!--
$Id$
$Log$
Revision 1.4 2011-08-20 17:49:37 rlar
Revision 1.5 2011-12-11 18:16:09 rlar
#3/4 #include <ngspice/...> --> #include "ngspice/..." for adms
Revision 1.4 2011/08/20 17:49:37 rlar
#6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
Revision 1.3 2011/01/13 17:05:46 dwarning
@ -60,10 +63,10 @@
<admst:value-of select="attribute[name='ngspicename']/value"/>
<admst:variable name="module" select="%s"/>
#include &lt;ngspice/ngspice.h&gt;
#include &quot;ngspice/ngspice.h&quot;
#include &quot;$(module)defs.h&quot;
#include &lt;ngspice/sperror.h&gt;
#include &lt;ngspice/suffix.h&gt;
#include &quot;ngspice/sperror.h&quot;
#include &quot;ngspice/suffix.h&quot;
int $(module)mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)

View File

@ -3,7 +3,10 @@
<!--
$Id$
$Log$
Revision 1.7 2011-08-20 17:49:37 rlar
Revision 1.8 2011-12-11 18:16:09 rlar
#3/4 #include <ngspice/...> --> #include "ngspice/..." for adms
Revision 1.7 2011/08/20 17:49:37 rlar
#6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
Revision 1.6 2011/01/13 17:05:46 dwarning
@ -58,12 +61,12 @@
<admst:value-of select="attribute[name='ngspicename']/value"/>
<admst:variable name="module" select="%s"/>
#include &lt;ngspice/ngspice.h&gt;
#include &lt;ngspice/const.h&gt;
#include &lt;ngspice/ifsim.h&gt;
#include &quot;ngspice/ngspice.h&quot;
#include &quot;ngspice/const.h&quot;
#include &quot;ngspice/ifsim.h&quot;
#include &quot;$(module)defs.h&quot;
#include &lt;ngspice/sperror.h&gt;
#include &lt;ngspice/suffix.h&gt;
#include &quot;ngspice/sperror.h&quot;
#include &quot;ngspice/suffix.h&quot;
int $(module)mParam(int param, IFvalue *value, GENmodel *inMod)
{

View File

@ -3,7 +3,10 @@
<!--
$Id$
$Log$
Revision 1.3 2011-08-20 17:49:37 rlar
Revision 1.4 2011-12-11 18:16:09 rlar
#3/4 #include <ngspice/...> --> #include "ngspice/..." for adms
Revision 1.3 2011/08/20 17:49:37 rlar
#6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
Revision 1.2 2011/01/13 17:05:46 dwarning
@ -48,12 +51,12 @@
<admst:template match="code">
<admst:variable name="module" select="%(attribute[name='ngspicename']/value)"/>
#include &lt;ngspice/ngspice.h&gt;
#include &quot;ngspice/ngspice.h&quot;
#include &quot;$(module)defs.h&quot;
#include &lt;ngspice/cktdefs.h&gt;
#include &lt;ngspice/iferrmsg.h&gt;
#include &lt;ngspice/noisedef.h&gt;
#include &lt;ngspice/suffix.h&gt;
#include &quot;ngspice/cktdefs.h&quot;
#include &quot;ngspice/iferrmsg.h&quot;
#include &quot;ngspice/noisedef.h&quot;
#include &quot;ngspice/suffix.h&quot;
extern void NevalSrc();
extern double Nintegrate();

View File

@ -3,7 +3,10 @@
<!--
$Id$
$Log$
Revision 1.8 2011-08-20 17:49:37 rlar
Revision 1.9 2011-12-11 18:16:09 rlar
#3/4 #include <ngspice/...> --> #include "ngspice/..." for adms
Revision 1.8 2011/08/20 17:49:37 rlar
#6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
Revision 1.7 2011/08/12 15:18:41 rlar
@ -60,12 +63,12 @@
<admst:value-of select="attribute[name='ngspicename']/value"/>
<admst:variable name="module" select="%s"/>
#include &lt;ngspice/ngspice.h&gt;
#include &lt;ngspice/const.h&gt;
#include &lt;ngspice/ifsim.h&gt;
#include &quot;ngspice/ngspice.h&quot;
#include &quot;ngspice/const.h&quot;
#include &quot;ngspice/ifsim.h&quot;
#include &quot;$(module)defs.h&quot;
#include &lt;ngspice/sperror.h&gt;
#include &lt;ngspice/suffix.h&gt;
#include &quot;ngspice/sperror.h&quot;
#include &quot;ngspice/suffix.h&quot;
int $(module)par(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
{

View File

@ -3,7 +3,10 @@
<!--
$Id$
$Log$
Revision 1.5 2011-08-20 17:49:37 rlar
Revision 1.6 2011-12-11 18:16:09 rlar
#3/4 #include <ngspice/...> --> #include "ngspice/..." for adms
Revision 1.5 2011/08/20 17:49:37 rlar
#6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
Revision 1.4 2011/08/12 15:18:41 rlar
@ -64,12 +67,12 @@
<admst:value-of select="attribute[name='ngspicename']/value"/>
<admst:variable name="module" select="%s"/>
#include &lt;ngspice/ngspice.h&gt;
#include &lt;ngspice/cktdefs.h&gt;
#include &lt;ngspice/complex.h&gt;
#include &quot;ngspice/ngspice.h&quot;
#include &quot;ngspice/cktdefs.h&quot;
#include &quot;ngspice/complex.h&quot;
#include &quot;$(module)defs.h&quot;
#include &lt;ngspice/sperror.h&gt;
#include &lt;ngspice/suffix.h&gt;
#include &quot;ngspice/sperror.h&quot;
#include &quot;ngspice/suffix.h&quot;
int $(module)pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
{

View File

@ -3,7 +3,10 @@
<!--
$Id$
$Log$
Revision 1.7 2011-08-20 17:49:37 rlar
Revision 1.8 2011-12-11 18:16:09 rlar
#3/4 #include <ngspice/...> --> #include "ngspice/..." for adms
Revision 1.7 2011/08/20 17:49:37 rlar
#6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
Revision 1.6 2011/01/13 17:05:46 dwarning
@ -70,14 +73,14 @@
<admst:value-of select="attribute[name='ngspicename']/value"/>
<admst:variable name="module" select="%s"/>
#include &lt;ngspice/ngspice.h&gt;
#include &lt;ngspice/cktdefs.h&gt;
#include &lt;ngspice/smpdefs.h&gt;
#include &quot;ngspice/ngspice.h&quot;
#include &quot;ngspice/cktdefs.h&quot;
#include &quot;ngspice/smpdefs.h&quot;
#include &quot;$(module)defs.h&quot;
#include &lt;ngspice/const.h&gt;
#include &lt;ngspice/sperror.h&gt;
#include &lt;ngspice/ifsim.h&gt;
#include &lt;ngspice/suffix.h&gt;
#include &quot;ngspice/const.h&quot;
#include &quot;ngspice/sperror.h&quot;
#include &quot;ngspice/ifsim.h&quot;
#include &quot;ngspice/suffix.h&quot;
int $(module)setup (SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
/* load the $(module) device structure with those pointers needed later

View File

@ -3,7 +3,10 @@
<!--
$Id$
$Log$
Revision 1.8 2011-08-20 17:49:37 rlar
Revision 1.9 2011-12-11 18:16:09 rlar
#3/4 #include <ngspice/...> --> #include "ngspice/..." for adms
Revision 1.8 2011/08/20 17:49:37 rlar
#6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
Revision 1.7 2011/08/12 15:18:41 rlar
@ -74,14 +77,14 @@
<admst:value-of select="attribute[name='ngspicename']/value"/>
<admst:variable name="module" select="%s"/>
#include &lt;ngspice/ngspice.h&gt;
#include &lt;ngspice/cktdefs.h&gt;
#include &lt;ngspice/smpdefs.h&gt;
#include &quot;ngspice/ngspice.h&quot;
#include &quot;ngspice/cktdefs.h&quot;
#include &quot;ngspice/smpdefs.h&quot;
#include &quot;$(module)defs.h&quot;
#include &lt;ngspice/const.h&gt;
#include &lt;ngspice/sperror.h&gt;
#include &lt;ngspice/ifsim.h&gt;
#include &lt;ngspice/suffix.h&gt;
#include &quot;ngspice/const.h&quot;
#include &quot;ngspice/sperror.h&quot;
#include &quot;ngspice/ifsim.h&quot;
#include &quot;ngspice/suffix.h&quot;
#define _STATIC
#define _DYNAMIC

View File

@ -4,7 +4,10 @@
<!--
$Id$
$Log$
Revision 1.3 2011-08-20 17:49:37 rlar
Revision 1.4 2011-12-11 18:16:09 rlar
#3/4 #include <ngspice/...> --> #include "ngspice/..." for adms
Revision 1.3 2011/08/20 17:49:37 rlar
#6/7 use a subdirectory "ngspice" for includes to create a uniq namespace
Revision 1.2 2011/01/13 17:05:46 dwarning
@ -58,11 +61,11 @@
<admst:value-of select="attribute[name='ngspicename']/value"/>
<admst:variable name="module" select="%s"/>
#include &lt;ngspice/ngspice.h&gt;
#include &lt;ngspice/cktdefs.h&gt;
#include &quot;ngspice/ngspice.h&quot;
#include &quot;ngspice/cktdefs.h&quot;
#include &quot;$(module)defs.h&quot;
#include &lt;ngspice/sperror.h&gt;
#include &lt;ngspice/suffix.h&gt;
#include &quot;ngspice/sperror.h&quot;
#include &quot;ngspice/suffix.h&quot;
int $(module)trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep)
{