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

Replaced NULL by nullptr.

parent 0e2f33e4
......@@ -75,8 +75,8 @@ static int DataType = -1;
static char *filename;
static const char **ifiles;
static char *ifile = NULL;
static const char *ofile = NULL;
static char *ifile = nullptr;
static const char *ofile = nullptr;
static int ofileidx = 0;
......@@ -119,7 +119,7 @@ FreeMean(struct Variable *vars)
if (vars[code].mean)
{
Free(vars[code].mean);
vars[code].mean = NULL;
vars[code].mean = nullptr;
}
}
......@@ -527,21 +527,21 @@ after_moveTimestep(struct Variable *vars)
if (vars[code].hybrid0)
{
vars[code].hybrid = vars[code].hybrid0;
vars[code].hybrid0 = NULL;
vars[code].hybrid0 = nullptr;
}
for (code = 0; code < MaxCodes; code++)
if (vars[code].spectral0)
{
vars[code].spectral = vars[code].spectral0;
vars[code].spectral0 = NULL;
vars[code].spectral0 = nullptr;
}
for (code = 0; code < MaxCodes; code++)
if (vars[code].grid0)
{
vars[code].grid = vars[code].grid0;
vars[code].grid0 = NULL;
vars[code].grid0 = nullptr;
}
}
......@@ -566,7 +566,7 @@ after_check_content(struct Variable *vars, int timestep)
if (code == PS) continue;
if (code == HUMIDITY)
{
if (vars[code].needed && !vars[code].selected && vars[code].spectral == NULL && vars[code].hybrid == NULL)
if (vars[code].needed && !vars[code].selected && vars[code].spectral == nullptr && vars[code].hybrid == nullptr)
{
static bool lwarn = true;
if (lwarn) Warning("No humidity in data file, set to zero !");
......@@ -576,7 +576,7 @@ after_check_content(struct Variable *vars, int timestep)
}
else
{
if (vars[code].needed && !vars[code].comp && vars[code].spectral == NULL && vars[code].hybrid == NULL)
if (vars[code].needed && !vars[code].comp && vars[code].spectral == nullptr && vars[code].hybrid == nullptr)
{
if (labort_after)
Error("Code %3d not found at timestep %d!", code, timestep);
......@@ -594,12 +594,12 @@ after_check_content(struct Variable *vars, int timestep)
code = HALF_PRESS;
if ( vars[code].needed && !vars[code].comp &&
vars[code].spectral == NULL && vars[code].hybrid == NULL )
vars[code].spectral == nullptr && vars[code].hybrid == nullptr )
Error( "Hybrid model level not found!");
code = FULL_PRESS;
if ( vars[code].needed && !vars[code].comp &&
vars[code].spectral == NULL && vars[code].hybrid == NULL )
vars[code].spectral == nullptr && vars[code].hybrid == nullptr )
Error( "Hybrid model level not found!");
*/
}
......@@ -613,12 +613,12 @@ after_control(struct Control *globs, struct Variable *vars)
int rtime, vtime;
int code;
RARG rarg;
void *read_task = NULL;
void *read_task = nullptr;
if (lparallelread)
{
read_task = cdo_task_new();
if (read_task == NULL)
if (read_task == nullptr)
{
lparallelread = false;
cdoWarning("CDO tasks not available!");
......@@ -1129,7 +1129,7 @@ after_setCodes(struct Control *globs, struct Variable *vars, int maxCodes, int n
{
int modelID = vlistInqVarModel(globs->ivlistID, 0);
table = 128;
tableID = tableInq(modelID, table, NULL);
tableID = tableInq(modelID, table, nullptr);
vars[code].tableID = tableID;
}
......@@ -1141,7 +1141,7 @@ after_setCodes(struct Control *globs, struct Variable *vars, int maxCodes, int n
vlistInqVarLongname(globs->ivlistID, varID, longname);
}
if (!name[0]) tableInqEntry(tableID, code, -1, name, longname, NULL);
if (!name[0]) tableInqEntry(tableID, code, -1, name, longname, nullptr);
if (globs->Verbose)
{
......@@ -1460,7 +1460,7 @@ after_precntl(struct Control *globs, struct Variable *vars)
{
globs->nvct = zaxisInqVctSize(zaxisID);
if (globs->vct == NULL)
if (globs->vct == nullptr)
{
globs->vct = (double *) Malloc(globs->nvct * sizeof(double));
arrayCopy(globs->nvct, zaxisInqVctPtr(zaxisID), globs->vct);
......@@ -1630,7 +1630,7 @@ after_postcntl(struct Control *globs, struct Variable *vars)
tableID = vlistInqVarTable(globs->ivlistID, ivarID);
vars[code].missval = vlistInqVarMissval(globs->ivlistID, ivarID);
vars[code].samp = NULL;
vars[code].samp = nullptr;
if (DataType != -1)
datatype = DataType;
......@@ -1704,7 +1704,7 @@ after_readVct(struct Control *globs, const char *vctfile)
double va, vb;
FILE *fp = fopen(vctfile, "r");
if (fp == NULL) SysError("Open failed on %s", vctfile);
if (fp == nullptr) SysError("Open failed on %s", vctfile);
while (fgets(line, 1023, fp))
{
......
......@@ -123,8 +123,8 @@ CMOR_table(void *process)
{
cdoInitialize(process);
const int DUMP_CMOR_TABLE = cdoOperatorAdd("dump_cmor_table", 0, 0, NULL);
const int CONV_CMOR_TABLE = cdoOperatorAdd("conv_cmor_table", 0, 0, NULL);
const int DUMP_CMOR_TABLE = cdoOperatorAdd("dump_cmor_table", 0, 0, nullptr);
const int CONV_CMOR_TABLE = cdoOperatorAdd("conv_cmor_table", 0, 0, nullptr);
int operatorID = cdoOperatorID();
......@@ -134,7 +134,7 @@ CMOR_table(void *process)
if (Options::cdoVerbose) cdoPrint("Parse file: %s", filename);
FILE *fp = fopen(filename, "r");
if (fp == NULL) cdoAbort("Open failed on: %s\n", filename);
if (fp == nullptr) cdoAbort("Open failed on: %s\n", filename);
PMList pmlist;
pmlist.readCmortable(fp, filename);
......@@ -147,5 +147,5 @@ CMOR_table(void *process)
cdoFinish();
return 0;
return nullptr;
}
......@@ -63,7 +63,7 @@ int
Set_magics_param_CCOLS(const char *user_name, const char *param_value)
{
if (user_name == NULL) return 1;
if (user_name == nullptr) return 1;
printf("Setting the CCOLS magics params \n");
SetMagicsParameterValue("contour_shade_colour_method", "string", "list");
......@@ -84,7 +84,7 @@ Reset_magics_param_CCOLS(const char *user_name)
int
Set_magics_param_CLEVS(const char *user_name, const char *param_value)
{
if (user_name == NULL) return 1;
if (user_name == nullptr) return 1;
SetMagicsParameterValue("contour_level_selection_type", "string", "level_list");
SetMagicsParameterValue("contour_level_list", "floatarray", param_value);
......@@ -106,7 +106,7 @@ Set_magics_param_CTABLE(const char *user_name, const char *param_value)
{
(void) param_value;
if (user_name == NULL) return 1;
if (user_name == nullptr) return 1;
printf("Setting the CTABLE magics params \n");
#if 0
SetMagicsParameterValue( "contour_level_list", "floatarray", param_value );
......
......@@ -154,7 +154,7 @@ Change(void *process)
int chints[MAXARG];
char *chnames[MAXARG];
char varname[CDI_MAX_NAME];
char *chname = NULL;
char *chname = nullptr;
int chcode = 0;
int i;
size_t nmiss;
......@@ -248,7 +248,7 @@ Change(void *process)
for (i = 0; i < nch; i += 2)
if (tabnum == chints[i])
{
tableID = tableDef(-1, chints[i + 1], NULL);
tableID = tableDef(-1, chints[i + 1], nullptr);
vlistDefVarTable(vlistID2, varID, tableID);
}
}
......@@ -290,7 +290,7 @@ Change(void *process)
for (index = 0; index < nzaxis; index++)
{
const int zaxisID1 = vlistZaxis(vlistID2, index);
if (zaxisInqLevels(zaxisID1, NULL))
if (zaxisInqLevels(zaxisID1, nullptr))
{
const int nlevs = zaxisInqSize(zaxisID1);
std::vector<double> levels(nlevs);
......@@ -340,7 +340,7 @@ Change(void *process)
}
const int zaxisID1 = vlistInqVarZaxis(vlistID2, varID);
if (zaxisInqLevels(zaxisID1, NULL))
if (zaxisInqLevels(zaxisID1, nullptr))
{
const int nlevs = zaxisInqSize(zaxisID1);
std::vector<double> levels(nlevs);
......@@ -420,5 +420,5 @@ Change(void *process)
cdoFinish();
return 0;
return nullptr;
}
......@@ -71,7 +71,7 @@ Change_e5slm(void *process)
if (nmiss > 0) cdoAbort("SLM with missing values are unsupported!");
double minval, maxval;
arrayMinMaxMask(gridsize, cland.data(), NULL, &minval, &maxval);
arrayMinMaxMask(gridsize, cland.data(), nullptr, &minval, &maxval);
if (minval < 0 || maxval > 1) cdoWarning("Values of SLM out of bounds! (minval=%g, maxval=%g)", minval, maxval);
streamClose(streamIDslm);
......@@ -157,5 +157,5 @@ Change_e5slm(void *process)
cdoFinish();
return 0;
return nullptr;
}
......@@ -101,9 +101,9 @@ genGrid(int ngrids, int nfiles, std::vector<ensfileType> &ef, bool ginit, int ig
if (ngrids > 1 && gridtype == GRID_GENERIC && gridInqXsize(gridID) == 0 && gridInqYsize(gridID) == 0) return gridID2;
if (gridtype == GRID_UNSTRUCTURED) lunstructured = true;
int nv = lunstructured ? gridInqNvertex(gridID) : 0;
bool lcenter = globalGridType == CDI_UNDEFID && gridInqXvals(gridID, NULL) > 0 && gridInqYvals(gridID, NULL) > 0;
bool lcenter = globalGridType == CDI_UNDEFID && gridInqXvals(gridID, nullptr) > 0 && gridInqYvals(gridID, nullptr) > 0;
bool lbounds
= lunstructured && globalGridType == CDI_UNDEFID && gridInqXbounds(gridID, NULL) > 0 && gridInqYbounds(gridID, NULL) > 0;
= lunstructured && globalGridType == CDI_UNDEFID && gridInqXbounds(gridID, nullptr) > 0 && gridInqYbounds(gridID, nullptr) > 0;
std::vector<long> xsize(nfiles);
std::vector<long> ysize(nfiles);
......@@ -608,5 +608,5 @@ Collgrid(void *process)
cdoFinish();
return 0;
return nullptr;
}
......@@ -33,7 +33,7 @@ struct vars_t
char units[CDI_MAX_NAME];
};
vars_t *all_vars = NULL;
vars_t *all_vars = nullptr;
int gl_streamID = 0;
int gl_vlistID = 0;
......@@ -42,7 +42,7 @@ int gl_nvars = 0;
int levelID = 0;
int gl_tsID1 = 0;
int gl_tsID2 = 0;
double *gl_data = NULL;
double *gl_data = nullptr;
#define MAX_LINE 256
......@@ -71,7 +71,7 @@ command_t commands[] = { { "help", com_help, "Display this text" },
{ "set", com_set, "set variables" },
{ "vars", com_vars, "list variables" },
// { "stat", com_stat, "Print out statistics on FILE" },
{ NULL, NULL, NULL } };
{ nullptr, nullptr, nullptr } };
/* Return non-zero if ARG is a valid argument for CALLER, else print an error message and return zero. */
int
......@@ -209,7 +209,7 @@ com_vars(const char *arg)
return 0;
}
/* Look up NAME as the name of a command, and return a pointer to that command. Return a NULL pointer if NAME isn't a command name.
/* Look up NAME as the name of a command, and return a pointer to that command. Return a nullptr pointer if NAME isn't a command name.
*/
command_t *
find_command(char *name)
......@@ -217,7 +217,7 @@ find_command(char *name)
for (int i = 0; commands[i].name; i++)
if (strcmp(name, commands[i].name) == 0) return &commands[i];
return (command_t *) NULL;
return (command_t *) nullptr;
}
// Execute a command line.
......
......@@ -49,12 +49,12 @@ Comp(void *process)
cdoInitialize(process);
int EQ = cdoOperatorAdd("eq", 0, 0, NULL);
int NE = cdoOperatorAdd("ne", 0, 0, NULL);
int LE = cdoOperatorAdd("le", 0, 0, NULL);
int LT = cdoOperatorAdd("lt", 0, 0, NULL);
int GE = cdoOperatorAdd("ge", 0, 0, NULL);
int GT = cdoOperatorAdd("gt", 0, 0, NULL);
int EQ = cdoOperatorAdd("eq", 0, 0, nullptr);
int NE = cdoOperatorAdd("ne", 0, 0, nullptr);
int LE = cdoOperatorAdd("le", 0, 0, nullptr);
int LT = cdoOperatorAdd("lt", 0, 0, nullptr);
int GE = cdoOperatorAdd("ge", 0, 0, nullptr);
int GT = cdoOperatorAdd("gt", 0, 0, nullptr);
int operatorID = cdoOperatorID();
......@@ -302,5 +302,5 @@ Comp(void *process)
cdoFinish();
return 0;
return nullptr;
}
......@@ -41,12 +41,12 @@ Compc(void *process)
cdoInitialize(process);
int EQC = cdoOperatorAdd("eqc", 0, 0, NULL);
int NEC = cdoOperatorAdd("nec", 0, 0, NULL);
int LEC = cdoOperatorAdd("lec", 0, 0, NULL);
int LTC = cdoOperatorAdd("ltc", 0, 0, NULL);
int GEC = cdoOperatorAdd("gec", 0, 0, NULL);
int GTC = cdoOperatorAdd("gtc", 0, 0, NULL);
int EQC = cdoOperatorAdd("eqc", 0, 0, nullptr);
int NEC = cdoOperatorAdd("nec", 0, 0, nullptr);
int LEC = cdoOperatorAdd("lec", 0, 0, nullptr);
int LTC = cdoOperatorAdd("ltc", 0, 0, nullptr);
int GEC = cdoOperatorAdd("gec", 0, 0, nullptr);
int GTC = cdoOperatorAdd("gtc", 0, 0, nullptr);
int operatorID = cdoOperatorID();
......@@ -139,5 +139,5 @@ Compc(void *process)
cdoFinish();
return 0;
return nullptr;
}
......@@ -29,8 +29,8 @@ Complextorect(void *process)
cdoInitialize(process);
int COMPLEXTORECT = cdoOperatorAdd("complextorect", 0, 0, NULL);
int COMPLEXTOPOL = cdoOperatorAdd("complextopol", 0, 0, NULL);
int COMPLEXTORECT = cdoOperatorAdd("complextorect", 0, 0, nullptr);
int COMPLEXTOPOL = cdoOperatorAdd("complextopol", 0, 0, nullptr);
int operatorID = cdoOperatorID();
......@@ -123,5 +123,5 @@ Complextorect(void *process)
cdoFinish();
return 0;
return nullptr;
}
......@@ -49,8 +49,8 @@ Cond(void *process)
cdoInitialize(process);
// clang-format off
int IFTHEN = cdoOperatorAdd("ifthen", 0, 0, NULL);
int IFNOTTHEN = cdoOperatorAdd("ifnotthen", 0, 0, NULL);
int IFTHEN = cdoOperatorAdd("ifthen", 0, 0, nullptr);
int IFNOTTHEN = cdoOperatorAdd("ifnotthen", 0, 0, nullptr);
// clang-format on
int operatorID = cdoOperatorID();
......@@ -193,5 +193,5 @@ Cond(void *process)
cdoFinish();
return 0;
return nullptr;
}
......@@ -45,7 +45,7 @@ Cond2(void *process)
cdoInitialize(process);
cdoOperatorAdd("ifthenelse", 0, 0, NULL);
cdoOperatorAdd("ifthenelse", 0, 0, nullptr);
int streamID1 = cdoStreamOpenRead(cdoStreamName(0));
int streamID2 = cdoStreamOpenRead(cdoStreamName(1));
......@@ -184,5 +184,5 @@ Cond2(void *process)
cdoFinish();
return 0;
return nullptr;
}
......@@ -38,8 +38,8 @@ Condc(void *process)
cdoInitialize(process);
// clang-format off
int IFTHENC = cdoOperatorAdd("ifthenc", 0, 0, NULL);
int IFNOTTHENC = cdoOperatorAdd("ifnotthenc", 0, 0, NULL);
int IFTHENC = cdoOperatorAdd("ifthenc", 0, 0, nullptr);
int IFNOTTHENC = cdoOperatorAdd("ifnotthenc", 0, 0, nullptr);
// clang-format on
int operatorID = cdoOperatorID();
......@@ -107,5 +107,5 @@ Condc(void *process)
cdoFinish();
return 0;
return nullptr;
}
......@@ -135,7 +135,7 @@ Consecstat(void *process)
cdoInitialize(process);
cdoOperatorAdd("consecsum", CONSECSUM, 0, "refval");
cdoOperatorAdd("consects", CONSECTS, 0, NULL);
cdoOperatorAdd("consects", CONSECTS, 0, nullptr);
int operatorID = cdoOperatorID();
if (operatorID == CONSECSUM)
......@@ -261,5 +261,5 @@ Consecstat(void *process)
cdoFinish();
return 0;
return nullptr;
}
......@@ -42,7 +42,7 @@ Copy(void *process)
int nrecs;
int varID, levelID;
size_t nmiss;
void *array = NULL;
void *array = nullptr;
par_io_t parIO;
cdoInitialize(process);
......@@ -50,9 +50,9 @@ Copy(void *process)
bool lcopy = UNCHANGED_RECORD;
// clang-format off
cdoOperatorAdd("copy", 0, 0, NULL);
int SELALL = cdoOperatorAdd("selall", 0, 0, NULL);
int SZIP = cdoOperatorAdd("szip", 0, 0, NULL);
cdoOperatorAdd("copy", 0, 0, nullptr);
int SELALL = cdoOperatorAdd("selall", 0, 0, nullptr);
int SZIP = cdoOperatorAdd("szip", 0, 0, nullptr);
// clang-format on
#ifdef HIRLAM_EXTENSIONS
......@@ -207,5 +207,5 @@ Copy(void *process)
cdoFinish();
return 0;
return nullptr;
}
......@@ -37,8 +37,8 @@ Deltime(void *process)
bool lcopy = UNCHANGED_RECORD;
// clang-format off
int DELDAY = cdoOperatorAdd("delday", 0, 0, NULL);
int DEL29FEB = cdoOperatorAdd("del29feb", 0, 0, NULL);
int DELDAY = cdoOperatorAdd("delday", 0, 0, nullptr);
int DEL29FEB = cdoOperatorAdd("del29feb", 0, 0, nullptr);
// clang-format on
UNUSED(DELDAY);
......@@ -147,5 +147,5 @@ Deltime(void *process)
cdoFinish();
return 0;
return nullptr;
}
......@@ -50,7 +50,7 @@ Derivepar(void *process)
char paramstr[32];
char varname[CDI_MAX_NAME], stdname[CDI_MAX_NAME];
double *single2;
// double *lwater = NULL, *iwater = NULL;
// double *lwater = nullptr, *iwater = nullptr;
size_t nmiss, nmissout = 0;
double minval, maxval;
gribcode_t gribcodes;
......@@ -59,8 +59,8 @@ Derivepar(void *process)
cdoInitialize(process);
// clang-format off
int GHEIGHT = cdoOperatorAdd("gheight", 0, 0, NULL);
int SEALEVELPRESSURE = cdoOperatorAdd("sealevelpressure", 0, 0, NULL);
int GHEIGHT = cdoOperatorAdd("gheight", 0, 0, nullptr);
int SEALEVELPRESSURE = cdoOperatorAdd("sealevelpressure", 0, 0, nullptr);
// clang-format on
int operatorID = cdoOperatorID();
......@@ -333,11 +333,11 @@ Derivepar(void *process)
if (zaxisIDh != -1)
{
// check range of ps_prog
arrayMinMaxMask(gridsize, ps.data(), NULL, &minval, &maxval);
arrayMinMaxMask(gridsize, ps.data(), nullptr, &minval, &maxval);
if (minval < MIN_PS || maxval > MAX_PS) cdoWarning("Surface pressure out of range (min=%g max=%g)!", minval, maxval);
// check range of surface geopot
arrayMinMaxMask(gridsize, sgeopot.data(), NULL, &minval, &maxval);
arrayMinMaxMask(gridsize, sgeopot.data(), nullptr, &minval, &maxval);
if (minval < MIN_FIS || maxval > MAX_FIS) cdoWarning("Orography out of range (min=%g max=%g)!", minval, maxval);
}
......@@ -348,7 +348,7 @@ Derivepar(void *process)
offset = gridsize * levelID;
single2 = &temp[offset];
arrayMinMaxMask(gridsize, single2, NULL, &minval, &maxval);
arrayMinMaxMask(gridsize, single2, nullptr, &minval, &maxval);
if (minval < MIN_T || maxval > MAX_T)
cdoWarning("Input temperature at level %d out of range (min=%g max=%g)!", levelID + 1, minval, maxval);
}
......@@ -364,7 +364,7 @@ Derivepar(void *process)
// corr_hum(gridsize, single2, MIN_Q);
arrayMinMaxMask(gridsize, single2, NULL, &minval, &maxval);
arrayMinMaxMask(gridsize, single2, nullptr, &minval, &maxval);
if (minval < -0.1 || maxval > MAX_Q)
cdoWarning("Input humidity at level %d out of range (min=%g max=%g)!", levelID + 1, minval, maxval);
}
......@@ -372,7 +372,7 @@ Derivepar(void *process)
if (operatorID == GHEIGHT)
{
presh(NULL, half_press.data(), vct, ps.data(), nhlevf, gridsize);
presh(nullptr, half_press.data(), vct, ps.data(), nhlevf, gridsize);
arrayCopy(gridsize, sgeopot.data(), gheight.data() + gridsize * nhlevf);
MakeGeopotHeight(gheight.data(), temp.data(), hum.data(), half_press.data(), gridsize, nhlevf);
......@@ -410,5 +410,5 @@ Derivepar(void *process)
cdoFinish();
return 0;
return nullptr;
}
......@@ -155,7 +155,7 @@ Detrend(void *process)
pstreamDefRecord(streamID2, varID, levelID);
pstreamWriteRecord(streamID2, vars[tsID][varID][levelID].ptr, nmiss);
Free(vars[tsID][varID][levelID].ptr);
vars[tsID][varID][levelID].ptr = NULL;
vars[tsID][varID][levelID].ptr = nullptr;
}
}
}
......@@ -168,5 +168,5 @@ Detrend(void *process)
cdoFinish();
return 0;
return nullptr;
}
......@@ -87,10 +87,10 @@ Diff(void *process)
cdoInitialize(process);
// clang-format off
const int DIFF = cdoOperatorAdd("diff", 0, 0, NULL);
const int DIFFP = cdoOperatorAdd("diffp", 0, 0, NULL);
const int DIFFN = cdoOperatorAdd("diffn", 0, 0, NULL);
const int DIFFC = cdoOperatorAdd("diffc", 0, 0, NULL);
const int DIFF = cdoOperatorAdd("diff", 0, 0, nullptr);
const int DIFFP = cdoOperatorAdd("diffp", 0, 0, nullptr);
const int DIFFN = cdoOperatorAdd("diffn", 0, 0, nullptr);
const int DIFFC = cdoOperatorAdd("diffc", 0, 0, nullptr);
// clang-format on
const int operatorID = cdoOperatorID();
......@@ -332,5 +332,5 @@ Diff(void *process)
cdoFinish();
return 0;
return nullptr;
}
......@@ -45,9 +45,9 @@ genGrids(int gridID1, int *gridIDs, size_t nxvals, size_t nyvals, size_t nxblock
size_t nx = gridInqXsize(gridID1);
size_t ny = lunstructured ? 1 : gridInqYsize(gridID1);
bool lxcoord = gridInqXvals(gridID1, NULL) > 0;
bool lycoord = gridInqYvals(gridID1, NULL) > 0;
bool lbounds = !lregular && gridInqXbounds(gridID1, NULL) > 0 && gridInqYbounds(gridID1, NULL) > 0;
bool lxcoord = gridInqXvals(gridID1, nullptr) > 0;
bool lycoord = gridInqYvals(gridID1, nullptr) > 0;
bool lbounds = !lregular && gridInqXbounds(gridID1, nullptr) > 0 && gridInqYbounds(gridID1, nullptr) > 0;
std::vector<size_t> xlsize(nxblocks);
std::vector<size_t> ylsize(nyblocks);
......@@ -191,7 +191,7 @@ genGrids(int gridID1, int *gridIDs, size_t nxvals, size_t nyvals, size_t nxblock
grid_copy_attributes(projID1, projID2);
grid_copy_mapping(projID1, projID2);
bool lxpcoord = gridInqXvals(projID1, NULL) > 0;
bool lxpcoord = gridInqXvals(projID1, nullptr) > 0;
if (lxpcoord)
{
if (!xpvals.size())
......@@ -201,7 +201,7 @@ genGrids(int gridID1, int *gridIDs, size_t nxvals, size_t nyvals, size_t nxblock
}