Commit ddbddb1c authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

expr_run: typeVar verbose output cleanup

parent 93bd1f31
......@@ -998,9 +998,8 @@ nodeType *expr_run(nodeType *p, parse_param_t *parse_arg)
}
case typeVar:
{
if ( parse_arg->debug ) printf("\tpush\tvar\t%s\n", p->u.var.nm);
const char *vnm = p->u.var.nm;
// if ( parse_arg->debug ) printf("\tpush\tvar\t%s\n", vnm);
varID = param_search_name(parse_arg->nparams, params, vnm);
if ( varID == -1 && parse_arg->init )
{
......@@ -1126,6 +1125,8 @@ nodeType *expr_run(nodeType *p, parse_param_t *parse_arg)
}
rnode = p;
if ( parse_arg->debug ) printf("\tpush\tvar\t%s[nlev=%d][ngp=%d]\n", vnm, p->param.nlev, p->param.ngp);
break;
}
case typeFun:
......
......@@ -38,27 +38,27 @@ typedef struct {
// parameter
typedef struct {
bool select;
int coord;
int gridID;
int zaxisID;
int steptype;
int ngp;
int nlev;
int nmiss;
char *name;
char *longname;
char *units;
double missval;
bool select;
int coord;
int gridID;
int zaxisID;
int steptype;
int ngp;
int nlev;
int nmiss;
char *name;
char *longname;
char *units;
double missval;
double *data;
} paramType;
typedef struct nodeTypeTag {
bool ltmpvar;
bool ltmpvar;
paramType param;
nodeEnum type; // type of node
nodeEnum type; // type of node
// union must be last entry in nodeType
// because operNodeType may dynamically increase
......@@ -72,23 +72,23 @@ typedef struct nodeTypeTag {
typedef struct {
bool init;
bool debug;
bool *needed;
int maxparams;
int nparams;
int nvars1;
int pointID;
int surfaceID;
paramType param2;
bool init;
bool debug;
bool *needed;
int maxparams;
int nparams;
int nvars1;
int pointID;
int surfaceID;
paramType param2;
paramType *params;
} parse_param_t;
typedef union{
double cvalue; // constant value
char *varnm; // variable name
char *fname; // function name
double cvalue; // constant value
char *varnm; // variable name
char *fname; // function name
nodeType *nPtr; // node pointer
} stype_t;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment