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

analog/{square,triangle}, store boolean tran_init in STATIC_VAR itself

This commit is contained in:
rlar 2013-12-30 17:19:14 +01:00
parent 70f12fb1fd
commit a7a48ac8d3
4 changed files with 12 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/xspice/icm/analog/square/cfunc.mod
View File

@ -181,9 +181,6 @@ cm_square(ARGS)
Mif_Complex_t ac_gain;
Local_Data_t *loc; /* Pointer to local static data, not to be included
in the state vector */
/**** Retrieve frequently used parameters... ****/
cntl_size = PARAM_SIZE(cntl_array);
@ -210,11 +207,7 @@ cm_square(ARGS)
cm_analog_alloc(T3, sizeof(double));
cm_analog_alloc(T4, sizeof(double));
/*** allocate static storage for *loc ***/
STATIC_VAR(locdata) = calloc(1, sizeof(Local_Data_t));
loc = STATIC_VAR(locdata);
loc->tran_init = FALSE;
STATIC_VAR(tran_init) = MIF_FALSE;
}
x = (Mif_Value_t*) &PARAM(cntl_array[0]);
@ -253,11 +246,9 @@ cm_square(ARGS)
time3 = *t3;
time4 = *t4;
loc = STATIC_VAR(locdata);
if (!loc->tran_init) {
if (STATIC_VAR(tran_init) == MIF_FALSE) {
*phase1 = 0.0;
loc->tran_init = TRUE;
STATIC_VAR(tran_init) = MIF_TRUE;
}
/* Retrieve cntl_input value. */

6
src/xspice/icm/analog/square/ifspec.ifs
View File

@ -83,6 +83,6 @@ Null_Allowed: yes
STATIC_VAR_TABLE:
Static_Var_Name: locdata
Description: "local static data"
Data_Type: pointer
Static_Var_Name: tran_init
Description: "tran initialisation"
Data_Type: boolean

19
src/xspice/icm/analog/triangle/cfunc.mod
View File

@ -72,10 +72,6 @@ char *triangle_array_error = "\n**** Error ****\nTRIANGLE: Size of control array
/*=== LOCAL VARIABLES & TYPEDEFS =======*/
typedef struct {
int tran_init; /* for initialization of phase1) */
} Local_Data_t;
/*=== FUNCTION PROTOTYPE DEFINITIONS ===*/
@ -176,9 +172,6 @@ cm_triangle(ARGS)
Mif_Complex_t ac_gain;
Local_Data_t *loc; /* Pointer to local static data, not to be included
in the state vector */
/**** Retrieve frequently used parameters... ****/
@ -201,11 +194,7 @@ cm_triangle(ARGS)
cm_analog_alloc(T2, sizeof(double));
cm_analog_alloc(T3, sizeof(double));
/*** allocate static storage for *loc ***/
STATIC_VAR(locdata) = calloc(1, sizeof(Local_Data_t));
loc = STATIC_VAR(locdata);
loc->tran_init = FALSE;
STATIC_VAR(tran_init) = MIF_FALSE;
}
x = (Mif_Value_t*) &PARAM(cntl_array[0]);
@ -241,11 +230,9 @@ cm_triangle(ARGS)
time2 = *t2;
t_start = *t_end;
loc = STATIC_VAR(locdata);
if (! loc->tran_init) {
if (STATIC_VAR(tran_init) == MIF_FALSE) {
*phase1 = 0.0;
loc->tran_init = TRUE;
STATIC_VAR(tran_init) = MIF_TRUE;
}
/* Retrieve cntl_input value. */

6
src/xspice/icm/analog/triangle/ifspec.ifs
View File

@ -72,6 +72,6 @@ Null_Allowed: yes
STATIC_VAR_TABLE:
Static_Var_Name: locdata
Description: "local static data"
Data_Type: pointer
Static_Var_Name: tran_init
Description: "tran initialisation"
Data_Type: boolean