Commit 0bf44a1c authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

renamed farstdx() to farstd()

parent 70bd11f2
......@@ -223,16 +223,16 @@ void *Runstat(void *argument)
if ( runstat_nomiss )
{
if ( lstd )
farcstdx(&vars1[0][varID][levelID], vars2[0][varID][levelID], ndates, divisor);
farcstd(&vars1[0][varID][levelID], vars2[0][varID][levelID], ndates, divisor);
else
farcvarx(&vars1[0][varID][levelID], vars2[0][varID][levelID], ndates, divisor);
farcvar(&vars1[0][varID][levelID], vars2[0][varID][levelID], ndates, divisor);
}
else
{
if ( lstd )
farstdx(&vars1[0][varID][levelID], vars2[0][varID][levelID], samp1[0][varID][levelID], divisor);
farstd(&vars1[0][varID][levelID], vars2[0][varID][levelID], samp1[0][varID][levelID], divisor);
else
farvarx(&vars1[0][varID][levelID], vars2[0][varID][levelID], samp1[0][varID][levelID], divisor);
farvar(&vars1[0][varID][levelID], vars2[0][varID][levelID], samp1[0][varID][levelID], divisor);
}
}
}
......
......@@ -268,16 +268,16 @@ void *Seasstat(void *argument)
if ( samp1[varID][levelID].ptr == NULL )
{
if ( lstd )
farcstdx(&vars1[varID][levelID], vars2[varID][levelID], nsets, divisor);
farcstd(&vars1[varID][levelID], vars2[varID][levelID], nsets, divisor);
else
farcvarx(&vars1[varID][levelID], vars2[varID][levelID], nsets, divisor);
farcvar(&vars1[varID][levelID], vars2[varID][levelID], nsets, divisor);
}
else
{
if ( lstd )
farstdx(&vars1[varID][levelID], vars2[varID][levelID], samp1[varID][levelID], divisor);
farstd(&vars1[varID][levelID], vars2[varID][levelID], samp1[varID][levelID], divisor);
else
farvarx(&vars1[varID][levelID], vars2[varID][levelID], samp1[varID][levelID], divisor);
farvar(&vars1[varID][levelID], vars2[varID][levelID], samp1[varID][levelID], divisor);
}
}
}
......
......@@ -243,16 +243,16 @@ void *Timselstat(void *argument)
if ( samp1[varID][levelID].ptr == NULL )
{
if ( lstd )
farcstdx(&vars1[varID][levelID], vars2[varID][levelID], nsets, divisor);
farcstd(&vars1[varID][levelID], vars2[varID][levelID], nsets, divisor);
else
farcvarx(&vars1[varID][levelID], vars2[varID][levelID], nsets, divisor);
farcvar(&vars1[varID][levelID], vars2[varID][levelID], nsets, divisor);
}
else
{
if ( lstd )
farstdx(&vars1[varID][levelID], vars2[varID][levelID], samp1[varID][levelID], divisor);
farstd(&vars1[varID][levelID], vars2[varID][levelID], samp1[varID][levelID], divisor);
else
farvarx(&vars1[varID][levelID], vars2[varID][levelID], samp1[varID][levelID], divisor);
farvar(&vars1[varID][levelID], vars2[varID][levelID], samp1[varID][levelID], divisor);
}
}
}
......
......@@ -354,16 +354,16 @@ void *Timstat(void *argument)
if ( samp1[varID][levelID].ptr == NULL )
{
if ( lstd )
farcstdx(&vars1[varID][levelID], vars2[varID][levelID], nsets, divisor);
farcstd(&vars1[varID][levelID], vars2[varID][levelID], nsets, divisor);
else
farcvarx(&vars1[varID][levelID], vars2[varID][levelID], nsets, divisor);
farcvar(&vars1[varID][levelID], vars2[varID][levelID], nsets, divisor);
}
else
{
if ( lstd )
farstdx(&vars1[varID][levelID], vars2[varID][levelID], samp1[varID][levelID], divisor);
farstd(&vars1[varID][levelID], vars2[varID][levelID], samp1[varID][levelID], divisor);
else
farvarx(&vars1[varID][levelID], vars2[varID][levelID], samp1[varID][levelID], divisor);
farvar(&vars1[varID][levelID], vars2[varID][levelID], samp1[varID][levelID], divisor);
}
}
}
......
......@@ -408,16 +408,16 @@ void *Vertstat(void *argument)
if ( samp1[varID].ptr == NULL )
{
if ( lstd )
farcstdx(&vars1[varID], vars2[varID], vars1[varID].nsamp, divisor);
farcstd(&vars1[varID], vars2[varID], vars1[varID].nsamp, divisor);
else
farcvarx(&vars1[varID], vars2[varID], vars1[varID].nsamp, divisor);
farcvar(&vars1[varID], vars2[varID], vars1[varID].nsamp, divisor);
}
else
{
if ( lstd )
farstdx(&vars1[varID], vars2[varID], samp1[varID], divisor);
farstd(&vars1[varID], vars2[varID], samp1[varID], divisor);
else
farvarx(&vars1[varID], vars2[varID], samp1[varID], divisor);
farvar(&vars1[varID], vars2[varID], samp1[varID], divisor);
}
}
......
......@@ -248,16 +248,16 @@ void *Ydaystat(void *argument)
if ( samp1[dayoy][varID][levelID].ptr == NULL )
{
if ( lstd )
farcstdx(&vars1[dayoy][varID][levelID], vars2[dayoy][varID][levelID], nsets[dayoy], divisor);
farcstd(&vars1[dayoy][varID][levelID], vars2[dayoy][varID][levelID], nsets[dayoy], divisor);
else
farcvarx(&vars1[dayoy][varID][levelID], vars2[dayoy][varID][levelID], nsets[dayoy], divisor);
farcvar(&vars1[dayoy][varID][levelID], vars2[dayoy][varID][levelID], nsets[dayoy], divisor);
}
else
{
if ( lstd )
farstdx(&vars1[dayoy][varID][levelID], vars2[dayoy][varID][levelID], samp1[dayoy][varID][levelID], divisor);
farstd(&vars1[dayoy][varID][levelID], vars2[dayoy][varID][levelID], samp1[dayoy][varID][levelID], divisor);
else
farvarx(&vars1[dayoy][varID][levelID], vars2[dayoy][varID][levelID], samp1[dayoy][varID][levelID], divisor);
farvar(&vars1[dayoy][varID][levelID], vars2[dayoy][varID][levelID], samp1[dayoy][varID][levelID], divisor);
}
}
}
......
......@@ -455,8 +455,8 @@ void ydstatFinalize(YDAY_STATS *stats, int operfunc)
if ( vlistInqVarTsteptype(stats->vlist, varID) == TSTEP_CONSTANT ) continue;
nlevels = zaxisInqSize(vlistInqVarZaxis(stats->vlist, varID));
for ( levelID = 0; levelID < nlevels; levelID++ )
farcstdx(&stats->vars1[dayoy][varID][levelID], stats->vars2[dayoy][varID][levelID],
stats->nsets[dayoy], divisor);
farcstd(&stats->vars1[dayoy][varID][levelID], stats->vars2[dayoy][varID][levelID],
stats->nsets[dayoy], divisor);
}
break;
......@@ -467,7 +467,7 @@ void ydstatFinalize(YDAY_STATS *stats, int operfunc)
if ( vlistInqVarTsteptype(stats->vlist, varID) == TSTEP_CONSTANT ) continue;
nlevels = zaxisInqSize(vlistInqVarZaxis(stats->vlist, varID));
for ( levelID = 0; levelID < nlevels; levelID++ )
farcvarx(&stats->vars1[dayoy][varID][levelID], stats->vars2[dayoy][varID][levelID],
farcvar(&stats->vars1[dayoy][varID][levelID], stats->vars2[dayoy][varID][levelID],
stats->nsets[dayoy], divisor);
}
break;
......
......@@ -265,16 +265,16 @@ void *Yhourstat(void *argument)
if ( samp1[houroy][varID][levelID].ptr == NULL )
{
if ( lstd )
farcstdx(&vars1[houroy][varID][levelID], vars2[houroy][varID][levelID], nsets[houroy], divisor);
farcstd(&vars1[houroy][varID][levelID], vars2[houroy][varID][levelID], nsets[houroy], divisor);
else
farcvarx(&vars1[houroy][varID][levelID], vars2[houroy][varID][levelID], nsets[houroy], divisor);
farcvar(&vars1[houroy][varID][levelID], vars2[houroy][varID][levelID], nsets[houroy], divisor);
}
else
{
if ( lstd )
farstdx(&vars1[houroy][varID][levelID], vars2[houroy][varID][levelID], samp1[houroy][varID][levelID], divisor);
farstd(&vars1[houroy][varID][levelID], vars2[houroy][varID][levelID], samp1[houroy][varID][levelID], divisor);
else
farvarx(&vars1[houroy][varID][levelID], vars2[houroy][varID][levelID], samp1[houroy][varID][levelID], divisor);
farvar(&vars1[houroy][varID][levelID], vars2[houroy][varID][levelID], samp1[houroy][varID][levelID], divisor);
}
}
}
......
......@@ -289,16 +289,16 @@ void *Ymonstat(void *argument)
if ( samp1[month][varID][levelID].ptr == NULL )
{
if ( lstd )
farcstdx(&vars1[month][varID][levelID], vars2[month][varID][levelID], nsets[month], divisor);
farcstd(&vars1[month][varID][levelID], vars2[month][varID][levelID], nsets[month], divisor);
else
farcvarx(&vars1[month][varID][levelID], vars2[month][varID][levelID], nsets[month], divisor);
farcvar(&vars1[month][varID][levelID], vars2[month][varID][levelID], nsets[month], divisor);
}
else
{
if ( lstd )
farstdx(&vars1[month][varID][levelID], vars2[month][varID][levelID], samp1[month][varID][levelID], divisor);
farstd(&vars1[month][varID][levelID], vars2[month][varID][levelID], samp1[month][varID][levelID], divisor);
else
farvarx(&vars1[month][varID][levelID], vars2[month][varID][levelID], samp1[month][varID][levelID], divisor);
farvar(&vars1[month][varID][levelID], vars2[month][varID][levelID], samp1[month][varID][levelID], divisor);
}
}
}
......
......@@ -272,16 +272,16 @@ void *Yseasstat(void *argument)
if ( samp1[seas][varID][levelID].ptr == NULL )
{
if ( lstd )
farcstdx(&vars1[seas][varID][levelID], vars2[seas][varID][levelID], nsets[seas], divisor);
farcstd(&vars1[seas][varID][levelID], vars2[seas][varID][levelID], nsets[seas], divisor);
else
farcvarx(&vars1[seas][varID][levelID], vars2[seas][varID][levelID], nsets[seas], divisor);
farcvar(&vars1[seas][varID][levelID], vars2[seas][varID][levelID], nsets[seas], divisor);
}
else
{
if ( lstd )
farstdx(&vars1[seas][varID][levelID], vars2[seas][varID][levelID], samp1[seas][varID][levelID], divisor);
farstd(&vars1[seas][varID][levelID], vars2[seas][varID][levelID], samp1[seas][varID][levelID], divisor);
else
farvarx(&vars1[seas][varID][levelID], vars2[seas][varID][levelID], samp1[seas][varID][levelID], divisor);
farvar(&vars1[seas][varID][levelID], vars2[seas][varID][levelID], samp1[seas][varID][levelID], divisor);
}
}
}
......
......@@ -152,14 +152,10 @@ void farmul(field_t *field1, field_t field2);
void fardiv(field_t *field1, field_t field2);
void farmin(field_t *field1, field_t field2);
void farmax(field_t *field1, field_t field2);
void farvar(field_t *field1, field_t field2, field_t field3);
void farstd(field_t *field1, field_t field2, field_t field3);
void farvarx(field_t *field1, field_t field2, field_t field3, const double divisor);
void farstdx(field_t *field1, field_t field2, field_t field3, const double divisor);
void farcvar(field_t *field1, field_t field2, const double rconst1);
void farcstd(field_t *field1, field_t field2, const double rconst1);
void farcvarx(field_t *field1, field_t field2, const double rconst1, const double divisor);
void farcstdx(field_t *field1, field_t field2, const double rconst1, const double divisor);
void farvar(field_t *field1, field_t field2, field_t field3, const double divisor);
void farstd(field_t *field1, field_t field2, field_t field3, const double divisor);
void farcvar(field_t *field1, field_t field2, const double rconst1, const double divisor);
void farcstd(field_t *field1, field_t field2, const double rconst1, const double divisor);
void farmoq(field_t *field1, field_t field2);
void faratan2(field_t *field1, field_t field2);
......
......@@ -456,8 +456,8 @@ void farmax(field_t *field1, field_t field2)
}
}
void farvar(field_t *field1, field_t field2, field_t field3)
// not used
void farvar0(field_t *field1, field_t field2, field_t field3)
{
size_t i, len;
int nwpv = field1->nwpv;
......@@ -512,7 +512,7 @@ void farvar(field_t *field1, field_t field2, field_t field3)
}
void farvarx(field_t *field1, field_t field2, field_t field3, const double divisor)
void farvar(field_t *field1, field_t field2, field_t field3, const double divisor)
{
size_t i, len;
int nwpv = field1->nwpv;
......@@ -548,8 +548,8 @@ void farvarx(field_t *field1, field_t field2, field_t field3, const double divis
}
}
void farstd(field_t *field1, field_t field2, field_t field3)
// not used
void farstd0(field_t *field1, field_t field2, field_t field3)
{
size_t i, len;
int nwpv = field1->nwpv;
......@@ -565,7 +565,7 @@ void farstd(field_t *field1, field_t field2, field_t field3)
if ( len != (size_t) (nwpv*gridInqSize(grid2)) )
cdoAbort("Fields have different gridsize (%s)", __func__);
farvar(field1, field2, field3);
farvar0(field1, field2, field3);
field1->nmiss = 0;
for ( i = 0; i < len; i++ )
......@@ -581,7 +581,7 @@ void farstd(field_t *field1, field_t field2, field_t field3)
}
void farstdx(field_t *field1, field_t field2, field_t field3, const double divisor)
void farstd(field_t *field1, field_t field2, field_t field3, const double divisor)
{
size_t i, len;
int nwpv = field1->nwpv;
......@@ -597,7 +597,7 @@ void farstdx(field_t *field1, field_t field2, field_t field3, const double divis
if ( len != (size_t) (nwpv*gridInqSize(grid2)) )
cdoAbort("Fields have different gridsize (%s)", __func__);
farvarx(field1, field2, field3, divisor);
farvar(field1, field2, field3, divisor);
field1->nmiss = 0;
for ( i = 0; i < len; i++ )
......@@ -612,8 +612,8 @@ void farstdx(field_t *field1, field_t field2, field_t field3, const double divis
}
}
void farcvar(field_t *field1, field_t field2, const double rconst1)
// not used
void farcvar0(field_t *field1, field_t field2, const double rconst1)
{
size_t i, len;
int nwpv = field1->nwpv;
......@@ -668,7 +668,7 @@ void farcvar(field_t *field1, field_t field2, const double rconst1)
}
void farcvarx(field_t *field1, field_t field2, const double rconst1, const double divisor)
void farcvar(field_t *field1, field_t field2, const double rconst1, const double divisor)
{
size_t i, len;
int nwpv = field1->nwpv;
......@@ -703,8 +703,8 @@ void farcvarx(field_t *field1, field_t field2, const double rconst1, const doubl
}
}
void farcstd(field_t *field1, field_t field2, const double rconst1)
// not used
void farcstd0(field_t *field1, field_t field2, const double rconst1)
{
size_t i, len;
int nwpv = field1->nwpv;
......@@ -720,7 +720,7 @@ void farcstd(field_t *field1, field_t field2, const double rconst1)
if ( len != (size_t) (nwpv*gridInqSize(grid2)) )
cdoAbort("Fields have different gridsize (%s)", __func__);
farcvar(field1, field2, rconst1);
farcvar0(field1, field2, rconst1);
field1->nmiss = 0;
for ( i = 0; i < len; i++ )
......@@ -736,7 +736,7 @@ void farcstd(field_t *field1, field_t field2, const double rconst1)
}
void farcstdx(field_t *field1, field_t field2, const double rconst1, const double divisor)
void farcstd(field_t *field1, field_t field2, const double rconst1, const double divisor)
{
size_t i, len;
int nwpv = field1->nwpv;
......@@ -752,7 +752,7 @@ void farcstdx(field_t *field1, field_t field2, const double rconst1, const doubl
if ( len != (size_t) (nwpv*gridInqSize(grid2)) )
cdoAbort("Fields have different gridsize (%s)", __func__);
farcvarx(field1, field2, rconst1, divisor);
farcvar(field1, field2, rconst1, divisor);
field1->nmiss = 0;
for ( i = 0; i < len; i++ )
......
......@@ -1113,6 +1113,7 @@ int gridFromFile(FILE *gfp, const char *dname)
if ( grid.nvertex == 0 )
{
if ( grid.type == GRID_LONLAT ) grid.nvertex = 2;
if ( grid.type == GRID_CURVILINEAR ) grid.nvertex = 4;
}
......@@ -1156,6 +1157,7 @@ int gridFromFile(FILE *gfp, const char *dname)
if ( grid.nvertex == 0 )
{
if ( grid.type == GRID_LONLAT ) grid.nvertex = 2;
if ( grid.type == GRID_CURVILINEAR ) grid.nvertex = 4;
}
......
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