Skip to content
GitLab
Commit 19f75552 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Added new operator ymonvar1 and ymonstd1

parent 57f8e487
Hide whitespace changes
Inline Side-by-side
ChangeLog
View file @ 19f75552
......@@ -3,6 +3,11 @@
* using CDI library version 1.6.0
* Version 1.6.0 released
2013-01-30 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* New operator: ymonvar1 - Multi-year monthly variance [Divisor is (n-1)]
* New operator: ymonstd1 - Multi-year monthly standard deviation [Divisor is(n-1)]
2013-01-25 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* New operator: timvar1 - Time variance [Divisor is (n-1)]
......
src/Timstat.c
View file @ 19f75552
......@@ -96,8 +96,10 @@ void *Timstat(void *argument)
int *recVarID, *recLevelID;
int taxis_has_bounds = FALSE;
int lvfrac = FALSE;
int lmean = FALSE, lvarstd = FALSE, lstd = FALSE;
char vdatestr[32], vtimestr[32];
double vfrac = 1;
double divisor;
double missval;
field_t **vars1 = NULL, **vars2 = NULL, **samp1 = NULL;
field_t field;
......@@ -153,6 +155,11 @@ void *Timstat(void *argument)
operatorID = cdoOperatorID();
operfunc = cdoOperatorF1(operatorID);
lmean = operfunc == func_mean || operfunc == func_avg;
lstd = operfunc == func_std || operfunc == func_std1;
lvarstd = operfunc == func_std || operfunc == func_var || operfunc == func_std1 || operfunc == func_var1;
divisor = operfunc == func_std1 || operfunc == func_var1;
if ( operfunc == func_mean )
{
int oargc = operatorArgc();
......@@ -224,7 +231,7 @@ void *Timstat(void *argument)
vars1 = field_malloc(vlistID1, FIELD_PTR);
samp1 = field_malloc(vlistID1, FIELD_NONE);
if ( operfunc == func_std || operfunc == func_var || operfunc == func_std1 || operfunc == func_var1 )
if ( lvarstd )
vars2 = field_malloc(vlistID1, FIELD_PTR);
tsID = 0;
......@@ -308,7 +315,7 @@ void *Timstat(void *argument)
samp1[varID][levelID].ptr[i]++;
}
if ( operfunc == func_std || operfunc == func_var || operfunc == func_std1 || operfunc == func_var1 )
if ( lvarstd )
{
farsumq(&vars2[varID][levelID], field);
farsum(&vars1[varID][levelID], field);
......@@ -320,7 +327,7 @@ void *Timstat(void *argument)
}
}
if ( nsets == 0 && (operfunc == func_std || operfunc == func_var || operfunc == func_std1 || operfunc == func_var1) )
if ( nsets == 0 && lvarstd )
for ( varID = 0; varID < nvars; varID++ )
{
if ( vlistInqVarTsteptype(vlistID1, varID) == TSTEP_CONSTANT ) continue;
......@@ -337,7 +344,7 @@ void *Timstat(void *argument)
if ( nrecs == 0 && nsets == 0 ) break;
if ( operfunc == func_mean || operfunc == func_avg )
if ( lmean )
for ( varID = 0; varID < nvars; varID++ )
{
if ( vlistInqVarTsteptype(vlistID1, varID) == TSTEP_CONSTANT ) continue;
......@@ -350,26 +357,23 @@ void *Timstat(void *argument)
fardiv(&vars1[varID][levelID], samp1[varID][levelID]);
}
}
else if ( operfunc == func_std || operfunc == func_var || operfunc == func_std1 || operfunc == func_var1 )
else if ( lvarstd )
for ( varID = 0; varID < nvars; varID++ )
{
if ( vlistInqVarTsteptype(vlistID1, varID) == TSTEP_CONSTANT ) continue;
nlevel = zaxisInqSize(vlistInqVarZaxis(vlistID1, varID));
for ( levelID = 0; levelID < nlevel; levelID++ )
{
double divisor = 0;
if ( operfunc == func_std1 || operfunc == func_var1 ) divisor = 1;
if ( samp1[varID][levelID].ptr == NULL )
{
if ( operfunc == func_std || operfunc == func_std1 )
if ( lstd )
farcstdx(&vars1[varID][levelID], vars2[varID][levelID], nsets, divisor);
else
farcvarx(&vars1[varID][levelID], vars2[varID][levelID], nsets, divisor);
}
else
{
if ( operfunc == func_std || operfunc == func_std1 )
if ( lstd )
farstdx(&vars1[varID][levelID], vars2[varID][levelID], samp1[varID][levelID], divisor);
else
farvarx(&vars1[varID][levelID], vars2[varID][levelID], samp1[varID][levelID], divisor);
......@@ -463,7 +467,7 @@ void *Timstat(void *argument)
field_free(vars1, vlistID1);
field_free(samp1, vlistID1);
if ( operfunc == func_std || operfunc == func_var || operfunc == func_std1 || operfunc == func_var1 )
if ( lvarstd )
field_free(vars2, vlistID1);
if ( cdoDiag ) streamClose(streamID3);
......
src/Ymonstat.c
View file @ 19f75552
......@@ -24,7 +24,9 @@
Ymonstat ymonmean Multi-year monthly mean
Ymonstat ymonavg Multi-year monthly average
Ymonstat ymonvar Multi-year monthly variance
Ymonstat ymonvar1 Multi-year monthly variance [Divisor is (n-1)]
Ymonstat ymonstd Multi-year monthly standard deviation
Ymonstat ymonstd1 Multi-year monthly standard deviation [Divisor is (n-1)]
*/
......@@ -59,7 +61,6 @@ void *Ymonstat(void *argument)
int i;
int varID;
int recID;
int gridID;
int vdate, vtime;
int year, month, day;
int nrecs, nrecords;
......@@ -75,7 +76,8 @@ void *Ymonstat(void *argument)
int vdates[NMONTH], vtimes[NMONTH];
int mon[NMONTH];
int nmon = 0;
double missval;
int lmean = FALSE, lvarstd = FALSE, lstd = FALSE;
double divisor;
field_t **vars1[NMONTH], **vars2[NMONTH], **samp1[NMONTH];
field_t field;
......@@ -87,11 +89,18 @@ void *Ymonstat(void *argument)
cdoOperatorAdd("ymonmean", func_mean, 0, NULL);
cdoOperatorAdd("ymonavg", func_avg, 0, NULL);
cdoOperatorAdd("ymonvar", func_var, 0, NULL);
cdoOperatorAdd("ymonvar1", func_var1, 0, NULL);
cdoOperatorAdd("ymonstd", func_std, 0, NULL);
cdoOperatorAdd("ymonstd1", func_std1, 0, NULL);
operatorID = cdoOperatorID();
operfunc = cdoOperatorF1(operatorID);
lmean = operfunc == func_mean || operfunc == func_avg;
lstd = operfunc == func_std || operfunc == func_std1;
lvarstd = operfunc == func_std || operfunc == func_var || operfunc == func_std1 || operfunc == func_var1;
divisor = operfunc == func_std1 || operfunc == func_var1;
for ( month = 0; month < NMONTH; month++ )
{
vars1[month] = NULL;
......@@ -143,42 +152,10 @@ void *Ymonstat(void *argument)
if ( vars1[month] == NULL )
{
mon[nmon++] = month;
vars1[month] = (field_t **) malloc(nvars*sizeof(field_t *));
samp1[month] = (field_t **) malloc(nvars*sizeof(field_t *));
if ( operfunc == func_std || operfunc == func_var )
vars2[month] = (field_t **) malloc(nvars*sizeof(field_t *));
for ( varID = 0; varID < nvars; varID++ )
{
gridID = vlistInqVarGrid(vlistID1, varID);
gridsize = gridInqSize(gridID);
nlevel = zaxisInqSize(vlistInqVarZaxis(vlistID1, varID));
missval = vlistInqVarMissval(vlistID1, varID);
vars1[month][varID] = (field_t *) malloc(nlevel*sizeof(field_t));
samp1[month][varID] = (field_t *) malloc(nlevel*sizeof(field_t));
if ( operfunc == func_std || operfunc == func_var )
vars2[month][varID] = (field_t *) malloc(nlevel*sizeof(field_t));
for ( levelID = 0; levelID < nlevel; levelID++ )
{
vars1[month][varID][levelID].grid = gridID;
vars1[month][varID][levelID].nmiss = 0;
vars1[month][varID][levelID].missval = missval;
vars1[month][varID][levelID].ptr = (double *) malloc(gridsize*sizeof(double));
samp1[month][varID][levelID].grid = gridID;
samp1[month][varID][levelID].nmiss = 0;
samp1[month][varID][levelID].missval = missval;
samp1[month][varID][levelID].ptr = NULL;
if ( operfunc == func_std || operfunc == func_var )
{
vars2[month][varID][levelID].grid = gridID;
vars2[month][varID][levelID].nmiss = 0;
vars2[month][varID][levelID].missval = missval;
vars2[month][varID][levelID].ptr = (double *) malloc(gridsize*sizeof(double));
}
}
}
vars1[month] = field_malloc(vlistID1, FIELD_PTR);
samp1[month] = field_malloc(vlistID1, FIELD_NONE);
if ( lvarstd )
vars2[month] = field_malloc(vlistID1, FIELD_PTR);
}
for ( recID = 0; recID < nrecs; recID++ )
......@@ -231,7 +208,7 @@ void *Ymonstat(void *argument)
samp1[month][varID][levelID].ptr[i]++;
}
if ( operfunc == func_std || operfunc == func_var )
if ( lvarstd )
{
farsumq(&vars2[month][varID][levelID], field);
farsum(&vars1[month][varID][levelID], field);
......@@ -243,7 +220,7 @@ void *Ymonstat(void *argument)
}
}
if ( nsets[month] == 0 && (operfunc == func_std || operfunc == func_var) )
if ( nsets[month] == 0 && lvarstd )
for ( varID = 0; varID < nvars; varID++ )
{
if ( vlistInqVarTsteptype(vlistID1, varID) == TSTEP_CONSTANT ) continue;
......@@ -281,7 +258,7 @@ void *Ymonstat(void *argument)
month = mon[i];
if ( nsets[month] == 0 ) cdoAbort("Internal problem, nsets[%d] not defined!", month);
if ( operfunc == func_mean || operfunc == func_avg )
if ( lmean )
for ( varID = 0; varID < nvars; varID++ )
{
if ( vlistInqVarTsteptype(vlistID1, varID) == TSTEP_CONSTANT ) continue;
......@@ -294,7 +271,7 @@ void *Ymonstat(void *argument)
fardiv(&vars1[month][varID][levelID], samp1[month][varID][levelID]);
}
}
else if ( operfunc == func_std || operfunc == func_var )
else if ( lvarstd )
for ( varID = 0; varID < nvars; varID++ )
{
if ( vlistInqVarTsteptype(vlistID1, varID) == TSTEP_CONSTANT ) continue;
......@@ -303,18 +280,17 @@ void *Ymonstat(void *argument)
{
if ( samp1[month][varID][levelID].ptr == NULL )
{
if ( operfunc == func_std )
farcstd(&vars1[month][varID][levelID], vars2[month][varID][levelID], 1.0/nsets[month]);
if ( lstd )
farcstdx(&vars1[month][varID][levelID], vars2[month][varID][levelID], nsets[month], divisor);
else
farcvar(&vars1[month][varID][levelID], vars2[month][varID][levelID], 1.0/nsets[month]);
farcvarx(&vars1[month][varID][levelID], vars2[month][varID][levelID], nsets[month], divisor);
}
else
{
farinv(&samp1[month][varID][levelID]);
if ( operfunc == func_std )
farstd(&vars1[month][varID][levelID], vars2[month][varID][levelID], samp1[month][varID][levelID]);
if ( lstd )
farstdx(&vars1[month][varID][levelID], vars2[month][varID][levelID], samp1[month][varID][levelID], divisor);
else
farvar(&vars1[month][varID][levelID], vars2[month][varID][levelID], samp1[month][varID][levelID]);
farvarx(&vars1[month][varID][levelID], vars2[month][varID][levelID], samp1[month][varID][levelID], divisor);
}
}
}
......@@ -342,24 +318,9 @@ void *Ymonstat(void *argument)
{
if ( vars1[month] != NULL )
{
for ( varID = 0; varID < nvars; varID++ )
{
nlevel = zaxisInqSize(vlistInqVarZaxis(vlistID1, varID));
for ( levelID = 0; levelID < nlevel; levelID++ )
{
free(vars1[month][varID][levelID].ptr);
if ( samp1[month][varID][levelID].ptr ) free(samp1[month][varID][levelID].ptr);
if ( operfunc == func_std || operfunc == func_var ) free(vars2[month][varID][levelID].ptr);
}
free(vars1[month][varID]);
free(samp1[month][varID]);
if ( operfunc == func_std || operfunc == func_var ) free(vars2[month][varID]);
}
free(vars1[month]);
free(samp1[month]);
if ( operfunc == func_std || operfunc == func_var ) free(vars2[month]);
field_free(vars1[month], vlistID1);
field_free(samp1[month], vlistID1);
if ( lvarstd ) field_free(vars2[month], vlistID1);
}
}
......
src/modules.c
View file @ 19f75552
......@@ -469,7 +469,7 @@ void *Maggraph(void *argument);
#define YhourstatOperators {"yhourmin", "yhourmax", "yhoursum", "yhourmean", "yhouravg", "yhourvar", "yhourstd"}
#define YmonarithOperators {"ymonadd", "ymonsub", "ymonmul", "ymondiv"}
#define YmonpctlOperators {"ymonpctl"}
#define YmonstatOperators {"ymonmin", "ymonmax", "ymonsum", "ymonmean", "ymonavg", "ymonvar", "ymonstd"}
#define YmonstatOperators {"ymonmin", "ymonmax", "ymonsum", "ymonmean", "ymonavg", "ymonstd", "ymonstd1", "ymonvar", "ymonvar1"}
#define YseaspctlOperators {"yseaspctl"}
#define YseasstatOperators {"yseasmin", "yseasmax", "yseassum", "yseasmean", "yseasavg", "yseasvar", "yseasstd"}
#define ZonstatOperators {"zonmin", "zonmax", "zonrange", "zonsum", "zonmean", "zonavg", "zonvar", "zonstd", "zonpctl"}
......
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

Imprint | Privacy Policy