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

change frequency to increment

parent ed01f661
......@@ -673,12 +673,11 @@ static
void remap_normalize(int norm_opt, int gridsize, double *array, double missval, remapgrid_t *tgt_grid)
{
/* used only to check the result of remapcon */
int i;
double grid_err;
if ( norm_opt == NORM_OPT_NONE )
{
for ( i = 0; i < gridsize; i++ )
for ( int i = 0; i < gridsize; i++ )
{
if ( !DBL_IS_EQUAL(array[i], missval) )
{
......@@ -693,7 +692,7 @@ void remap_normalize(int norm_opt, int gridsize, double *array, double missval,
}
else if ( norm_opt == NORM_OPT_DESTAREA )
{
for ( i = 0; i < gridsize; i++ )
for ( int i = 0; i < gridsize; i++ )
{
if ( !DBL_IS_EQUAL(array[i], missval) )
{
......
......@@ -167,7 +167,7 @@ void *Settime(void *argument)
int SETDATE = cdoOperatorAdd("setdate", 0, 1, "date (format: YYYY-MM-DD)");
int SETTIME = cdoOperatorAdd("settime", 0, 1, "time (format: hh:mm:ss)");
int SETTUNITS = cdoOperatorAdd("settunits", 0, 1, "time units (seconds, minutes, hours, days, months, years)");
int SETTAXIS = cdoOperatorAdd("settaxis", 0, -2, "date,time<,frequency> (format YYYY-MM-DD,hh:mm:ss)");
int SETTAXIS = cdoOperatorAdd("settaxis", 0, -2, "date,time<,increment> (format YYYY-MM-DD,hh:mm:ss)");
int SETTBOUNDS = cdoOperatorAdd("settbounds", 0, 1, "frequency (day, month, year)");
int SETREFTIME = cdoOperatorAdd("setreftime", 0, -2, "date,time<,units> (format YYYY-MM-DD,hh:mm:ss)");
int SETCALENDAR = cdoOperatorAdd("setcalendar", 0, 1, "calendar (standard, proleptic_gregorian, 360_day, 365_day, 366_day)");
......
......@@ -608,9 +608,9 @@ void remapNormalizeWeights(remapgrid_t *tgt_grid, remapvars_t *rv)
tgt_cell_add = rv->tgt_cell_add[n];
if ( IS_NOT_EQUAL(tgt_grid->cell_area[tgt_cell_add], 0) )
norm_factor = ONE/tgt_grid->cell_area[tgt_cell_add];
norm_factor = 1./tgt_grid->cell_area[tgt_cell_add];
else
norm_factor = ZERO;
norm_factor = 0.;
rv->wts[n*num_wts] *= norm_factor;
}
......@@ -630,9 +630,9 @@ void remapNormalizeWeights(remapgrid_t *tgt_grid, remapvars_t *rv)
tgt_cell_add = rv->tgt_cell_add[n];
if ( IS_NOT_EQUAL(tgt_grid->cell_frac[tgt_cell_add], 0) )
norm_factor = ONE/tgt_grid->cell_frac[tgt_cell_add];
norm_factor = 1./tgt_grid->cell_frac[tgt_cell_add];
else
norm_factor = ZERO;
norm_factor = 0.;
rv->wts[n*num_wts] *= norm_factor;
}
......
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