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

Renamed struct Control to AfterControl.

parent ba6b5165
......@@ -61,7 +61,7 @@ struct RARG
{
int lana, nrecs;
struct Variable *vars;
struct Control *globs;
AfterControl *globs;
};
cdo::Task *afterReadTask = nullptr;
......@@ -132,7 +132,7 @@ FreeMean(struct Variable *vars)
}
static void
after_PostProcess(struct Control *globs)
after_PostProcess(AfterControl *globs)
{
if (globs->EndOfInterval)
{
......@@ -161,7 +161,7 @@ after_PostProcess(struct Control *globs)
/* switch input file */
/* ================= */
static void
after_SwitchFile(struct Control *globs)
after_SwitchFile(AfterControl *globs)
{
bool echam4 = false;
int n;
......@@ -349,7 +349,7 @@ after_printProcessStatus(int tsID)
}
static int
after_setNextDate(struct Control *globs)
after_setNextDate(AfterControl *globs)
{
int nrecs = 0;
......@@ -480,7 +480,7 @@ after_readTimestep(void *arg)
}
static void
after_defineNextTimestep(struct Control *globs)
after_defineNextTimestep(AfterControl *globs)
{
static int otsID = 0;
const auto vdate = after_getDate(globs->OldDate);
......@@ -505,7 +505,7 @@ after_defineNextTimestep(struct Control *globs)
}
static void
after_setEndOfInterval(struct Control *globs, int nrecs)
after_setEndOfInterval(AfterControl *globs, int nrecs)
{
if (nrecs == 0)
{
......@@ -592,7 +592,7 @@ after_check_content(struct Variable *vars, int timestep)
}
static void
after_control(struct Control *globs, struct Variable *vars)
after_control(AfterControl *globs, struct Variable *vars)
{
int i;
int nrecs = 0;
......@@ -726,7 +726,7 @@ after_control(struct Control *globs, struct Variable *vars)
}
static void
after_setLevel(struct Control *globs)
after_setLevel(AfterControl *globs)
{
int k, l, found;
bool removeLevel[MaxLevel];
......@@ -884,7 +884,7 @@ after_setLevel(struct Control *globs)
}
static void
after_defineLevel(struct Control *globs, struct Variable *vars)
after_defineLevel(AfterControl *globs, struct Variable *vars)
{
int code, i;
......@@ -980,7 +980,7 @@ after_defineLevel(struct Control *globs, struct Variable *vars)
}
static void
after_defineGrid(struct Control *globs, struct Variable *vars)
after_defineGrid(AfterControl *globs, struct Variable *vars)
{
int ogridID = -1;
int code;
......@@ -1071,7 +1071,7 @@ after_defineGrid(struct Control *globs, struct Variable *vars)
}
static void
after_setCodes(struct Control *globs, struct Variable *vars, int maxCodes, int numCodes)
after_setCodes(AfterControl *globs, struct Variable *vars, int maxCodes, int numCodes)
{
if (globs->Verbose) lprintf(stdout);
......@@ -1137,7 +1137,7 @@ after_setCodes(struct Control *globs, struct Variable *vars, int maxCodes, int n
}
static void
after_checkNamelist(struct Control *globs)
after_checkNamelist(AfterControl *globs)
{
if (globs->Mean && globs->Type < 20) afterAbort("Mean is only available for TYPE >= 20!");
......@@ -1149,7 +1149,7 @@ after_checkNamelist(struct Control *globs)
}
static void
after_parini(struct Control *globs, struct Variable *vars)
after_parini(AfterControl *globs, struct Variable *vars)
{
char namelist[65536];
......@@ -1261,7 +1261,7 @@ after_parini(struct Control *globs, struct Variable *vars)
}
static void
after_dimcalc(struct Control *globs)
after_dimcalc(AfterControl *globs)
{
if (globs->AnalysisData) globs->NumLevel = globs->NumLevelRequest;
......@@ -1305,7 +1305,7 @@ after_dimcalc(struct Control *globs)
/* Extract basic dimension information */
/* ----------------------------------------------------------- */
static void
after_precntl(struct Control *globs, struct Variable *vars)
after_precntl(AfterControl *globs, struct Variable *vars)
{
int l;
int varID;
......@@ -1534,7 +1534,7 @@ after_precntl(struct Control *globs, struct Variable *vars)
* -----------------------------------------------------------
*/
static void
after_postcntl(struct Control *globs, struct Variable *vars)
after_postcntl(AfterControl *globs, struct Variable *vars)
{
int code = 0;
char name[CDI_MAX_NAME], longname[CDI_MAX_NAME], units[CDI_MAX_NAME];
......@@ -1657,7 +1657,7 @@ after_postcntl(struct Control *globs, struct Variable *vars)
}
static void
after_readVct(struct Control *globs, const char *vctfile)
after_readVct(AfterControl *globs, const char *vctfile)
{
char line[1024];
int nlines = 0;
......@@ -1693,7 +1693,7 @@ after_readVct(struct Control *globs, const char *vctfile)
}
static void
after_control_init(struct Control *globs)
after_control_init(AfterControl *globs)
{
globs->AnalysisData = 0; // 0 = ECHAM Data, 1 = ECMWF Spectral Analyses
globs->DayIn = 0; // day increment of infiles if Multi = true
......@@ -1727,7 +1727,7 @@ after_variable_init(struct Variable *vars)
}
static void
after_processing(struct Control *globs, struct Variable *vars)
after_processing(AfterControl *globs, struct Variable *vars)
{
globs->istreamID = streamOpenReadLocked(ifile);
......@@ -1878,7 +1878,7 @@ Afterburner(void *process)
lstdout = !Options::silentMode;
struct Control globs = {};
AfterControl globs = {};
after_control_init(&globs);
globs.Verbose = Options::cdoVerbose;
......
......@@ -46,7 +46,7 @@ struct Date
int mn;
};
struct Control
struct AfterControl
{
int Verbose;
......@@ -218,27 +218,27 @@ struct Variable
void after_read_vct(const char *vctfile, double **vct, int *nvct);
void after_gp2sp(struct Control *globs, struct Variable *vars, int ccode);
void after_gp2sp(AfterControl *globs, struct Variable *vars, int ccode);
void after_GP2FC(double *gp, double *fc, long nlat, long nlon, long nlev, long nfc);
void after_FC2GP(double *fc, double *gp, long nlat, long nlon, long nlev, long nfc);
void after_FCrh2FCsh(struct Control *globs, struct Variable *vars);
void after_SPuv2SPdv(struct Control *globs, struct Variable *vars);
void after_FCsh2FCrh(struct Control *globs, struct Variable *vars);
void after_FCrh2FCsh(AfterControl *globs, struct Variable *vars);
void after_SPuv2SPdv(AfterControl *globs, struct Variable *vars);
void after_FCsh2FCrh(AfterControl *globs, struct Variable *vars);
void after_EchamCompGP(struct Control *globs, struct Variable *vars);
void after_processPL(struct Control *globs, struct Variable *vars);
void after_processML(struct Control *globs, struct Variable *vars);
void after_EchamCompGP(AfterControl *globs, struct Variable *vars);
void after_processPL(AfterControl *globs, struct Variable *vars);
void after_processML(AfterControl *globs, struct Variable *vars);
void after_AnalysisAddRecord(struct Control *globs, struct Variable *vars, int code, int gridID, int zaxisID, int levelID,
void after_AnalysisAddRecord(AfterControl *globs, struct Variable *vars, int code, int gridID, int zaxisID, int levelID,
size_t nmiss);
double *after_get_dataptr(struct Variable *vars, int code, int gridID, int zaxisID, int levelID);
void after_EchamAddRecord(struct Control *globs, struct Variable *vars, int code, int gridID, int zaxisID, int levelID,
void after_EchamAddRecord(AfterControl *globs, struct Variable *vars, int code, int gridID, int zaxisID, int levelID,
size_t nmiss);
void after_AnalysisDependencies(struct Variable *vars, int ncodes);
void after_EchamDependencies(struct Variable *vars, int ncodes, int type, int source);
void after_legini_setup(struct Control *globs, struct Variable *vars);
void after_legini_setup(AfterControl *globs, struct Variable *vars);
template <typename... Args>
void
......
......@@ -230,7 +230,7 @@ after_read_vct(const char *vctfile, double **vct, int *nvct)
}
void
after_gp2sp(struct Control *globs, struct Variable *vars, int ccode)
after_gp2sp(AfterControl *globs, struct Variable *vars, int ccode)
{
struct Variable *var = &vars[ccode];
......@@ -397,7 +397,7 @@ rh2sh(double *sphum, double *rhum, double *t, int lev, int dimgpout, double *lev
}
void
after_FCrh2FCsh(struct Control *globs, struct Variable *vars)
after_FCrh2FCsh(AfterControl *globs, struct Variable *vars)
{
const long fieldSize = globs->DimGP * globs->NumLevelRequest;
......@@ -422,7 +422,7 @@ after_FCrh2FCsh(struct Control *globs, struct Variable *vars)
}
void
after_SPuv2SPdv(struct Control *globs, struct Variable *vars)
after_SPuv2SPdv(AfterControl *globs, struct Variable *vars)
{
double *Div, *DivOut, *Vor, *VorOut;
......@@ -455,7 +455,7 @@ after_SPuv2SPdv(struct Control *globs, struct Variable *vars)
}
void
after_FCsh2FCrh(struct Control *globs, struct Variable *vars)
after_FCsh2FCrh(AfterControl *globs, struct Variable *vars)
{
const long fieldSize = globs->DimGP * globs->NumLevelRequest;
......@@ -494,7 +494,7 @@ CheckAnalyses(struct Variable *vars)
/* Process Pressure Level data */
void
after_processPL(struct Control *globs, struct Variable *vars)
after_processPL(AfterControl *globs, struct Variable *vars)
{
int code, l;
long fieldSize;
......@@ -1105,7 +1105,7 @@ LayerCloud(double *cc, double *ll, double pmax, double pmin, int DimGP, int Half
/* Grid Point Computations */
void
after_EchamCompGP(struct Control *globs, struct Variable *vars)
after_EchamCompGP(AfterControl *globs, struct Variable *vars)
{
if (vars[GEOPOTHEIGHT].comp || vars[SLP].comp || vars[THETAF].needed || vars[HALF_PRESS].needed || vars[RHUMIDITY].comp
|| vars[OMEGA].comp || globs->Type >= 30)
......@@ -1476,7 +1476,7 @@ Derivate(double field[], double derilam[], int levels, int Waves, int Latitudes,
/* Process Model Level data */
void
after_processML(struct Control *globs, struct Variable *vars)
after_processML(AfterControl *globs, struct Variable *vars)
{
int code, l, i;
long fieldSize = 0;
......@@ -2280,7 +2280,7 @@ after_processML(struct Control *globs, struct Variable *vars)
}
void
after_AnalysisAddRecord(struct Control *globs, struct Variable *vars, int code, int gridID, int zaxisID, int levelID, size_t nmiss)
after_AnalysisAddRecord(AfterControl *globs, struct Variable *vars, int code, int gridID, int zaxisID, int levelID, size_t nmiss)
{
size_t fieldSize;
int truncation;
......@@ -2381,7 +2381,7 @@ after_get_dataptr(struct Variable *vars, int code, int gridID, int zaxisID, int
}
void
after_EchamAddRecord(struct Control *globs, struct Variable *vars, int code, int gridID, int zaxisID, int levelID, size_t nmiss)
after_EchamAddRecord(AfterControl *globs, struct Variable *vars, int code, int gridID, int zaxisID, int levelID, size_t nmiss)
{
auto gridtype = gridInqType(gridID);
auto leveltype = zaxisInqType(zaxisID);
......@@ -2691,7 +2691,7 @@ void after_legini_full(long ntr, long nlat, double *restrict poli, double *restr
void after_legini(long ntr, long nlat, double *restrict poli, double *restrict pold, double *restrict coslat);
void
after_legini_setup(struct Control *globs, struct Variable *vars)
after_legini_setup(AfterControl *globs, struct Variable *vars)
{
long ntr = globs->Truncation;
long nlat = globs->Latitudes;
......
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