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

Replace TIME_CONSTANT by TSTEP_CONSTANT.

parent 2a68644f
......@@ -505,7 +505,7 @@ void *Expr(void *argument)
pstreamDefTimestep(streamID2, tsID);
for ( int varID = 0; varID < nvars1; varID++ )
if ( tsID == 0 || params[varID].steptype != TIME_CONSTANT )
if ( tsID == 0 || params[varID].steptype != TSTEP_CONSTANT )
params[varID].nmiss = 0;
for ( int recID = 0; recID < nrecs; recID++ )
......@@ -540,7 +540,7 @@ void *Expr(void *argument)
{
int pidx = varIDmap[varID];
if ( tsID > 0 && params[pidx].steptype == TIME_CONSTANT ) continue;
if ( tsID > 0 && params[pidx].steptype == TSTEP_CONSTANT ) continue;
double missval = vlistInqVarMissval(vlistID2, varID);
......
......@@ -1375,7 +1375,7 @@ nodeType *expr_run(nodeType *p, parse_param_t *parse_arg)
{
if ( i < maxout || (ngp > maxout && i >= (ngp-maxout)) )
{
if ( steptype == TIME_CONSTANT )
if ( steptype == TSTEP_CONSTANT )
fprintf(stdout, " %s[lev=%lu:gp=%lu] = %g\n", vname, k+1, i+1, data[k*ngp+i]);
else
fprintf(stdout, " %s[ts=%ld:lev=%lu:gp=%lu] = %g\n", vname, tsID, k+1, i+1, data[k*ngp+i]);
......@@ -1435,7 +1435,7 @@ nodeType *expr_run(nodeType *p, parse_param_t *parse_arg)
params[nvarID].missval = params[varID].missval;
params[nvarID].gridID = params[varID].gridID;
params[nvarID].zaxisID = parse_arg->surfaceID;
params[nvarID].steptype = TIME_CONSTANT;
params[nvarID].steptype = TSTEP_CONSTANT;
params[nvarID].ngp = params[varID].ngp;
params[nvarID].nlev = 1;
if ( units ) params[nvarID].units = strdup(units);
......@@ -1471,7 +1471,7 @@ nodeType *expr_run(nodeType *p, parse_param_t *parse_arg)
params[nvarID].missval = params[varID].missval;
params[nvarID].gridID = parse_arg->pointID;
params[nvarID].zaxisID = params[varID].zaxisID;
params[nvarID].steptype = TIME_CONSTANT;
params[nvarID].steptype = TSTEP_CONSTANT;
params[nvarID].ngp = 1;
params[nvarID].nlev = params[varID].nlev;
if ( units ) params[nvarID].units = strdup(units);
......
Markdown is supported
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