Commit 470dccfa authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Added option --no_remap_weights: Switch off generation of remap weights,

parent b835e47c
...@@ -11,6 +11,7 @@ Version 1.9.8 (29 October 2019): ...@@ -11,6 +11,7 @@ Version 1.9.8 (29 October 2019):
* Expr: Added function rand(x) and isMissing(x) * Expr: Added function rand(x) and isMissing(x)
* Remap: Added support for Gaussian reduced grids * Remap: Added support for Gaussian reduced grids
* trend, detrend: Added parameter equal=false for unequal timesteps * trend, detrend: Added parameter equal=false for unequal timesteps
* Option --no_remap_weights: Switch off generation of remap weights
New operators: New operators:
* deltat: Difference between timesteps * deltat: Difference between timesteps
Fixed bugs: Fixed bugs:
......
...@@ -308,7 +308,8 @@ cdo_usage() ...@@ -308,7 +308,8 @@ cdo_usage()
fprintf(stderr, " Precision to use in displaying floating-point data (default: 7,15)\n"); fprintf(stderr, " Precision to use in displaying floating-point data (default: 7,15)\n");
if (ITSME) fprintf(stderr, " --pointsearchmethod [full/kdtree/nanoflann/spherepart/latbins]\n"); if (ITSME) fprintf(stderr, " --pointsearchmethod [full/kdtree/nanoflann/spherepart/latbins]\n");
fprintf(stderr, " --reduce_dim Reduce NetCDF dimensions\n"); fprintf(stderr, " --reduce_dim Reduce NetCDF dimensions\n");
fprintf(stderr, " --remap_weights [0/1] Generate remap weights (default: 1)\n"); fprintf(stderr, " --no_remap_weights Switch off generation of remap weights\n");
if (ITSME) fprintf(stderr, " --remap_weights [0/1] Generate remap weights (default: 1)\n");
fprintf(stderr, " -R, --regular Convert GRIB1 data from global reduced to regular Gaussian grid (cgribex only)\n"); fprintf(stderr, " -R, --regular Convert GRIB1 data from global reduced to regular Gaussian grid (cgribex only)\n");
fprintf(stderr, " -r Generate a relative time axis\n"); fprintf(stderr, " -r Generate a relative time axis\n");
fprintf(stderr, " -S Create an extra output stream for the module TIMSTAT. This stream\n"); fprintf(stderr, " -S Create an extra output stream for the module TIMSTAT. This stream\n");
...@@ -1065,6 +1066,7 @@ parseOptionsLong(int argc, char *argv[]) ...@@ -1065,6 +1066,7 @@ parseOptionsLong(int argc, char *argv[])
int lenableexcept; int lenableexcept;
int lgridsearchradius; int lgridsearchradius;
int lnetcdf_hdr_pad; int lnetcdf_hdr_pad;
int lno_remap_weights;
int lpedantic; int lpedantic;
int lpercentile; int lpercentile;
int lpointsearchmethod; int lpointsearchmethod;
...@@ -1098,6 +1100,7 @@ parseOptionsLong(int argc, char *argv[]) ...@@ -1098,6 +1100,7 @@ parseOptionsLong(int argc, char *argv[])
{ "remap_weights" , required_argument , &lremap_weights , 1 }, { "remap_weights" , required_argument , &lremap_weights , 1 },
{ "enableexcept" , required_argument , &lenableexcept , 1 }, { "enableexcept" , required_argument , &lenableexcept , 1 },
{ "timestat_date" , required_argument , &ltimestat_date , 1 }, { "timestat_date" , required_argument , &ltimestat_date , 1 },
{ "no_remap_weights" , no_argument , &lno_remap_weights , 1 },
{ "use_time_bounds" , no_argument , &luse_time_bounds , 1 }, { "use_time_bounds" , no_argument , &luse_time_bounds , 1 },
{ "cmor" , no_argument , &Options::CMOR_Mode , 1 }, { "cmor" , no_argument , &Options::CMOR_Mode , 1 },
{ "reduce_dim" , no_argument , &Options::CDO_Reduce_Dim , 1 }, { "reduce_dim" , no_argument , &Options::CDO_Reduce_Dim , 1 },
...@@ -1144,6 +1147,7 @@ parseOptionsLong(int argc, char *argv[]) ...@@ -1144,6 +1147,7 @@ parseOptionsLong(int argc, char *argv[])
lenableexcept = 0; lenableexcept = 0;
lgridsearchradius = 0; lgridsearchradius = 0;
lnetcdf_hdr_pad = 0; lnetcdf_hdr_pad = 0;
lno_remap_weights = 0;
lpedantic = 0; lpedantic = 0;
lpercentile = 0; lpercentile = 0;
lpointsearchmethod = 0; lpointsearchmethod = 0;
...@@ -1237,6 +1241,10 @@ parseOptionsLong(int argc, char *argv[]) ...@@ -1237,6 +1241,10 @@ parseOptionsLong(int argc, char *argv[])
if (fval < 0 || fval > 180) cdoAbort("%s=%g out of bounds (0-180 deg)!", "gridsearchradius", fval); if (fval < 0 || fval > 180) cdoAbort("%s=%g out of bounds (0-180 deg)!", "gridsearchradius", fval);
pointSearchRadius = fval; pointSearchRadius = fval;
} }
else if (lno_remap_weights)
{
Options::REMAP_genweights = 0;
}
else if (lremap_weights) else if (lremap_weights)
{ {
const int intarg = parameter2int(CDO_optarg); const int intarg = parameter2int(CDO_optarg);
......
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