Browse Source

sensitivity, drop redundant #defines SENS_LIN/OCT/DEC/DEFPERT

use SENS_LINEAR/OCTAVE/DECADE/DEFPERTUB instead
pre-master-46
rlar 8 years ago
parent
commit
a729c2860c
  1. 5
      src/include/ngspice/sensdefs.h
  2. 6
      src/spicelib/analysis/sensaskq.c
  3. 12
      src/spicelib/analysis/senssetp.c

5
src/include/ngspice/sensdefs.h

@ -80,17 +80,12 @@ extern int sens_sens(CKTcircuit *,int);
#define SENS_STOP 11
#define SENS_STEPS 12
#define SENS_DEC 13
#define SENS_OCT 14
#define SENS_LIN 15
#define SENS_DECADE 13
#define SENS_OCTAVE 14
#define SENS_LINEAR 15
#define SENS_DC 16
#define SENS_DEFTOL 17
#define SENS_DEFPERT 18
#define SENS_DEFPERTURB 18
#define SENS_DEVDEFTOL 19
#define SENS_DEVDEFPERT 20

6
src/spicelib/analysis/sensaskq.c

@ -31,9 +31,9 @@ SENSask(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
value->iValue = job->n_freq_steps;
break;
case SENS_DEC:
case SENS_OCT:
case SENS_LIN:
case SENS_DECADE:
case SENS_OCTAVE:
case SENS_LINEAR:
case SENS_DC:
value->iValue = job->step_type == which;
break;

12
src/spicelib/analysis/senssetp.c

@ -53,15 +53,15 @@ SENSsetParam(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value)
job->n_freq_steps = value->iValue;
break;
case SENS_DEC:
case SENS_DECADE:
job->step_type = SENS_DECADE;
break;
case SENS_OCT:
case SENS_OCTAVE:
job->step_type = SENS_OCTAVE;
break;
case SENS_LIN:
case SENS_LINEAR:
job->step_type = SENS_LINEAR;
break;
@ -97,9 +97,9 @@ static IFparm SENSparms[] = {
{ "stop", SENS_STOP, IF_SET|IF_ASK|IF_REAL, "ending frequency" },
{ "numsteps", SENS_STEPS,IF_SET|IF_ASK|IF_INTEGER,
"number of frequencies"},
{ "dec", SENS_DEC, IF_SET|IF_FLAG, "step by decades" },
{ "oct", SENS_OCT, IF_SET|IF_FLAG, "step by octaves" },
{ "lin", SENS_LIN, IF_SET|IF_FLAG, "step linearly" },
{ "dec", SENS_DECADE, IF_SET|IF_FLAG, "step by decades" },
{ "oct", SENS_OCTAVE, IF_SET|IF_FLAG, "step by octaves" },
{ "lin", SENS_LINEAR, IF_SET|IF_FLAG, "step linearly" },
{ "dc", SENS_DC, IF_SET|IF_FLAG, "analysis at DC" },
};

Loading…
Cancel
Save