Browse Source

shared ngspice: external voltage source

pre-master-46
h_vogt 13 years ago
committed by rlar
parent
commit
8147b03465
  1. 2
      src/spicelib/devices/vsrc/vsrc.c
  2. 7
      src/spicelib/devices/vsrc/vsrcacct.c
  3. 2
      src/spicelib/devices/vsrc/vsrcdefs.h
  4. 13
      src/spicelib/devices/vsrc/vsrcload.c
  5. 11
      src/spicelib/devices/vsrc/vsrcpar.c

2
src/spicelib/devices/vsrc/vsrc.c

@ -23,7 +23,7 @@ IFparm VSRCpTable[] = { /* parameters */
IOP ("am", VSRC_AM, IF_REALVEC,"Amplitude modulation description"), IOP ("am", VSRC_AM, IF_REALVEC,"Amplitude modulation description"),
IOP ("trnoise", VSRC_TRNOISE, IF_REALVEC,"Transient noise description"), IOP ("trnoise", VSRC_TRNOISE, IF_REALVEC,"Transient noise description"),
IOP ("trrandom", VSRC_TRRANDOM, IF_REALVEC,"random source description"), IOP ("trrandom", VSRC_TRRANDOM, IF_REALVEC,"random source description"),
IOP ("external", VSRC_EXTERNAL, IF_REALVEC,"external source description"),
OPU ("pos_node",VSRC_POS_NODE, IF_INTEGER,"Positive node of source"), OPU ("pos_node",VSRC_POS_NODE, IF_INTEGER,"Positive node of source"),
OPU ("neg_node",VSRC_NEG_NODE, IF_INTEGER,"Negative node of source"), OPU ("neg_node",VSRC_NEG_NODE, IF_INTEGER,"Negative node of source"),
OPU ("function",VSRC_FCN_TYPE, IF_INTEGER,"Function of the source"), OPU ("function",VSRC_FCN_TYPE, IF_INTEGER,"Function of the source"),

7
src/spicelib/devices/vsrc/vsrcacct.c

@ -291,6 +291,13 @@ VSRCaccept(CKTcircuit *ckt, GENmodel *inModel)
} }
break; break;
#ifdef SHARED_MODULE
case EXTERNAL: {
/* no breakpoints (yet) */
}
break;
#endif
} // switch } // switch
} // if ... else } // if ... else
bkptset: ; bkptset: ;

2
src/spicelib/devices/vsrc/vsrcdefs.h

@ -99,6 +99,7 @@ typedef struct sVSRCmodel {
#define AM 6 #define AM 6
#define TRNOISE 7 #define TRNOISE 7
#define TRRANDOM 8 #define TRRANDOM 8
#define EXTERNAL 9
#endif /*PULSE*/ #endif /*PULSE*/
/* device parameters */ /* device parameters */
@ -129,6 +130,7 @@ typedef struct sVSRCmodel {
#define VSRC_TD 24 #define VSRC_TD 24
#define VSRC_TRNOISE 25 #define VSRC_TRNOISE 25
#define VSRC_TRRANDOM 26 #define VSRC_TRRANDOM 26
#define VSRC_EXTERNAL 27
/* model parameters */ /* model parameters */

13
src/spicelib/devices/vsrc/vsrcload.c

@ -18,6 +18,10 @@ Modified: 2000 AlansFixes
/* gtri - end - wbk - modify for supply ramping option */ /* gtri - end - wbk - modify for supply ramping option */
#endif #endif
#ifdef SHARED_MODULE
extern double getvsrcval(double, char*);
#endif
int int
VSRCload(GENmodel *inModel, CKTcircuit *ckt) VSRCload(GENmodel *inModel, CKTcircuit *ckt)
/* actually load the current value into the /* actually load the current value into the
@ -385,6 +389,15 @@ VNoi3 3 0 DC 0 TRNOISE(0 0 0 0 15m 22u 50u) : generate RTS noise
} }
break; break;
#ifdef SHARED_MODULE
case EXTERNAL: {
value = getvsrcval(time, here->VSRCname);
if(here -> VSRCdcGiven)
value += here->VSRCdcValue;
}
break;
#endif
} // switch } // switch
} // else (line 48) } // else (line 48)
loadDone: loadDone:

11
src/spicelib/devices/vsrc/vsrcpar.c

@ -261,6 +261,17 @@ VSRCparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
} }
break; break;
#ifdef SHARED_MODULE
case VSRC_EXTERNAL: {
here->VSRCfunctionType = EXTERNAL;
here->VSRCfuncTGiven = TRUE;
/* no coefficients
copy_coeffs(here, value);
*/
}
break;
#endif
default: default:
return(E_BADPARM); return(E_BADPARM);
} }

Loading…
Cancel
Save