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

Renamed remap_genweights to remap_weights.

parent 71656f45
......@@ -308,7 +308,7 @@ cdo_usage()
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");
fprintf(stderr, " --reduce_dim Reduce NetCDF dimensions\n");
if (ITSME) fprintf(stderr, " --remap_genweights [0/1]\n");
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 Generate a relative time axis\n");
fprintf(stderr, " -S Create an extra output stream for the module TIMSTAT. This stream\n");
......@@ -997,7 +997,7 @@ cdo_set_options()
}
static long
str_to_int(const char *intstring)
cstrToNumBytes(const char *intstring)
{
long intval = -1;
......@@ -1071,7 +1071,7 @@ parseOptionsLong(int argc, char *argv[])
int lprecision;
int lprintoperators;
int lprintoperatorsno;
int lremap_genweights;
int lremap_weights;
int lscmode;
int lseed;
int lsortname;
......@@ -1095,7 +1095,7 @@ parseOptionsLong(int argc, char *argv[])
{ "config" , required_argument , &lconfig , 1 },
{ "pointsearchmethod" , required_argument , &lpointsearchmethod , 1 },
{ "gridsearchradius" , required_argument , &lgridsearchradius , 1 },
{ "remap_genweights" , required_argument , &lremap_genweights , 1 },
{ "remap_weights" , required_argument , &lremap_weights , 1 },
{ "enableexcept" , required_argument , &lenableexcept , 1 },
{ "timestat_date" , required_argument , &ltimestat_date , 1 },
{ "use_time_bounds" , no_argument , &luse_time_bounds , 1 },
......@@ -1150,7 +1150,7 @@ parseOptionsLong(int argc, char *argv[])
lprecision = 0;
lprintoperators = 0;
lprintoperatorsno = 0;
lremap_genweights = 0;
lremap_weights = 0;
lscmode = 0;
lseed = 0;
lsortname = 0;
......@@ -1177,7 +1177,7 @@ parseOptionsLong(int argc, char *argv[])
case 0:
if (lnetcdf_hdr_pad)
{
const int netcdf_hdr_pad = str_to_int(CDO_optarg);
const int netcdf_hdr_pad = cstrToNumBytes(CDO_optarg);
if (netcdf_hdr_pad >= 0) CDO_netcdf_hdr_pad = netcdf_hdr_pad;
}
else if (lprecision)
......@@ -1237,10 +1237,10 @@ parseOptionsLong(int argc, char *argv[])
if (fval < 0 || fval > 180) cdoAbort("%s=%g out of bounds (0-180 deg)!", "gridsearchradius", fval);
pointSearchRadius = fval;
}
else if (lremap_genweights)
else if (lremap_weights)
{
const int intarg = parameter2int(CDO_optarg);
if (intarg != 0 && intarg != 1) cdoAbort("Unsupported value for option --remap_genweights %d [0/1]", intarg);
if (intarg != 0 && intarg != 1) cdoAbort("Unsupported value for option --remap_weights %d [0/1]", intarg);
Options::REMAP_genweights = intarg;
}
else if (lseed)
......
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