Commit 62b5e8b9 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

ecacore: set default value of epilog to ECA_NONE.

parent 58e9e22e
...@@ -154,7 +154,9 @@ static void calculateOuterPeriod(Field &field, int MaxMonths, int recentYear, in ...@@ -154,7 +154,9 @@ static void calculateOuterPeriod(Field &field, int MaxMonths, int recentYear, in
tempdpm[i] = 0; tempdpm[i] = 0;
int year, month, day, tsID = 0, nrecs = 0, varID, levelID; int year, month, day, tsID = 0, nrecs = 0, varID, levelID;
bool lHasStarted = false; bool lHasStarted = false;
if (Options::cdoVerbose) cdoPrint("Start to process variables"); if (Options::cdoVerbose) cdoPrint("Start to process variables");
while ( ( nrecs = streamInqTimestep(cdiStream, tsID++) ) ) while ( ( nrecs = streamInqTimestep(cdiStream, tsID++) ) )
{ {
int64_t vdate = taxisInqVdate(cdiTaxisID); int64_t vdate = taxisInqVdate(cdiTaxisID);
...@@ -211,13 +213,16 @@ static void calculateOuterPeriod(Field &field, int MaxMonths, int recentYear, in ...@@ -211,13 +213,16 @@ static void calculateOuterPeriod(Field &field, int MaxMonths, int recentYear, in
if (Options::cdoVerbose) cdoPrint("Finished Processing variables"); if (Options::cdoVerbose) cdoPrint("Finished Processing variables");
if ( year != endOfCalc ) if ( year != endOfCalc )
writeTimesteps(MaxMonths, year, cei, frequency, taxisID4, streamID4, otsID, recinfo, maxrecs, tempdpm, tempdpy, func2); writeTimesteps(MaxMonths, year, cei, frequency, taxisID4, streamID4, otsID, recinfo, maxrecs, tempdpm, tempdpy, func2);
fieldFill(cei[0][0][0], 0.); fieldFill(cei[0][0][0], 0.);
if ( frequency == 8 ) if ( frequency == 8 )
for ( int loopmonth = 1; loopmonth < MaxMonths; loopmonth++) for ( int loopmonth = 1; loopmonth < MaxMonths; loopmonth++)
{ {
tempdpm[loopmonth] = 0; tempdpm[loopmonth] = 0;
fieldFill(cei[loopmonth][0][0], 0.); fieldFill(cei[loopmonth][0][0], 0.);
} }
streamClose(cdiStream); streamClose(cdiStream);
} }
...@@ -826,6 +831,7 @@ EcaEtccdi(void *process) ...@@ -826,6 +831,7 @@ EcaEtccdi(void *process)
TN10P = cdoOperatorAdd("etccdi_tn10p", func_selle, 31, nullptr); TN10P = cdoOperatorAdd("etccdi_tn10p", func_selle, 31, nullptr);
ALLX = cdoOperatorAdd("etccdi", 0, 31, nullptr); ALLX = cdoOperatorAdd("etccdi", 0, 31, nullptr);
} }
ETCCDI_REQUEST request; ETCCDI_REQUEST request;
request.ndates = parameter2int(cdoOperatorArgv(0)); request.ndates = parameter2int(cdoOperatorArgv(0));
...@@ -901,6 +907,7 @@ EcaEtccdi(void *process) ...@@ -901,6 +907,7 @@ EcaEtccdi(void *process)
} }
request.pn = 10; request.pn = 10;
} }
etccdi_op(&request); etccdi_op(&request);
/* else /* else
EcaEtccdi(-1, ndates, startboot, endboot); */ EcaEtccdi(-1, ndates, startboot, endboot); */
......
...@@ -380,7 +380,6 @@ void *EcaCfd(void *process) ...@@ -380,7 +380,6 @@ void *EcaCfd(void *process)
request.var1.f3 = vfarmax; request.var1.f3 = vfarmax;
request.var1.mulc = 0.0; request.var1.mulc = 0.0;
request.var1.addc = 0.0; request.var1.addc = 0.0;
request.var1.epilog = ECA_NONE;
request.var2.name = cfd_name2; request.var2.name = cfd_name2;
request.var2.longname = cfd_longname2; request.var2.longname = cfd_longname2;
request.var2.units = CFD_UNITS2; request.var2.units = CFD_UNITS2;
...@@ -435,7 +434,6 @@ void *EcaCsu(void *process) ...@@ -435,7 +434,6 @@ void *EcaCsu(void *process)
request.var1.f3 = vfarmax; request.var1.f3 = vfarmax;
request.var1.mulc = 0.0; request.var1.mulc = 0.0;
request.var1.addc = 0.0; request.var1.addc = 0.0;
request.var1.epilog = ECA_NONE;
request.var2.name = csu_name2; request.var2.name = csu_name2;
request.var2.longname = csu_longname2; request.var2.longname = csu_longname2;
request.var2.units = CSU_UNITS2; request.var2.units = CSU_UNITS2;
...@@ -488,7 +486,6 @@ void *EcaCwdi(void *process) ...@@ -488,7 +486,6 @@ void *EcaCwdi(void *process)
request.var1.f4 = vfarnum2; request.var1.f4 = vfarnum2;
request.var1.f5 = vfarnum3; request.var1.f5 = vfarnum3;
request.var1.f5arg = argN; request.var1.f5arg = argN;
request.var1.epilog = ECA_NONE;
request.var2.name = CWDI_NAME2; request.var2.name = CWDI_NAME2;
request.var2.longname = CWDI_LONGNAME2; request.var2.longname = CWDI_LONGNAME2;
request.var2.units = CWDI_UNITS2; request.var2.units = CWDI_UNITS2;
...@@ -550,7 +547,6 @@ void *EcaCwfi(void *process) ...@@ -550,7 +547,6 @@ void *EcaCwfi(void *process)
request.var1.f4 = vfarnum2; request.var1.f4 = vfarnum2;
request.var1.f5 = vfarnum3; request.var1.f5 = vfarnum3;
request.var1.f5arg = argN; request.var1.f5arg = argN;
request.var1.epilog = ECA_NONE;
request.var2.name = CWFI_NAME2; request.var2.name = CWFI_NAME2;
request.var2.longname = CWFI_LONGNAME2; request.var2.longname = CWFI_LONGNAME2;
request.var2.units = CWFI_UNITS2; request.var2.units = CWFI_UNITS2;
...@@ -626,7 +622,6 @@ void *EcaFd(void *process) ...@@ -626,7 +622,6 @@ void *EcaFd(void *process)
request.var1.f2 = vfarnum; request.var1.f2 = vfarnum;
request.var1.mulc = 0.0; request.var1.mulc = 0.0;
request.var1.addc = 0.0; request.var1.addc = 0.0;
request.var1.epilog = ECA_NONE;
eca1(&request); eca1(&request);
...@@ -713,7 +708,6 @@ void *EcaHd(void *process) ...@@ -713,7 +708,6 @@ void *EcaHd(void *process)
request.var1.f2 = vfarsum; request.var1.f2 = vfarsum;
request.var1.mulc = -1.0; request.var1.mulc = -1.0;
request.var1.addc = TO_KELVIN(argX); request.var1.addc = TO_KELVIN(argX);
request.var1.epilog = ECA_NONE;
eca1(&request); eca1(&request);
...@@ -760,7 +754,6 @@ void *EcaHwdi(void *process) ...@@ -760,7 +754,6 @@ void *EcaHwdi(void *process)
request.var1.f4 = vfarnum2; request.var1.f4 = vfarnum2;
request.var1.f5 = vfarnum3; request.var1.f5 = vfarnum3;
request.var1.f5arg = argN; request.var1.f5arg = argN;
request.var1.epilog = ECA_NONE;
request.var2.name = HWDI_NAME2; request.var2.name = HWDI_NAME2;
request.var2.longname = HWDI_LONGNAME2; request.var2.longname = HWDI_LONGNAME2;
request.var2.units = HWDI_UNITS2; request.var2.units = HWDI_UNITS2;
...@@ -822,7 +815,6 @@ void *EcaHwfi(void *process) ...@@ -822,7 +815,6 @@ void *EcaHwfi(void *process)
request.var1.f4 = vfarnum2; request.var1.f4 = vfarnum2;
request.var1.f5 = vfarnum3; request.var1.f5 = vfarnum3;
request.var1.f5arg = argN; request.var1.f5arg = argN;
request.var1.epilog = ECA_NONE;
request.var2.name = HWFI_NAME2; request.var2.name = HWFI_NAME2;
request.var2.longname = HWFI_LONGNAME2; request.var2.longname = HWFI_LONGNAME2;
request.var2.units = HWFI_UNITS2; request.var2.units = HWFI_UNITS2;
...@@ -875,7 +867,6 @@ void *EcaId(void *process) ...@@ -875,7 +867,6 @@ void *EcaId(void *process)
request.var1.f2 = vfarnum; request.var1.f2 = vfarnum;
request.var1.mulc = 0.0; request.var1.mulc = 0.0;
request.var1.addc = 0.0; request.var1.addc = 0.0;
request.var1.epilog = ECA_NONE;
eca1(&request); eca1(&request);
...@@ -930,7 +921,6 @@ void *EcaSu(void *process) ...@@ -930,7 +921,6 @@ void *EcaSu(void *process)
request.var1.f2 = vfarnum; request.var1.f2 = vfarnum;
request.var1.mulc = 0.0; request.var1.mulc = 0.0;
request.var1.addc = 0.0; request.var1.addc = 0.0;
request.var1.epilog = ECA_NONE;
eca1(&request); eca1(&request);
...@@ -1082,7 +1072,6 @@ void *EcaTr(void *process) ...@@ -1082,7 +1072,6 @@ void *EcaTr(void *process)
request.var1.f2 = vfarnum; request.var1.f2 = vfarnum;
request.var1.mulc = 0.0; request.var1.mulc = 0.0;
request.var1.addc = 0.0; request.var1.addc = 0.0;
request.var1.epilog = ECA_NONE;
eca1(&request); eca1(&request);
...@@ -1211,7 +1200,6 @@ void *EcaCdd(void *process) ...@@ -1211,7 +1200,6 @@ void *EcaCdd(void *process)
request.var1.f3 = vfarmax; request.var1.f3 = vfarmax;
request.var1.mulc = 0.0; request.var1.mulc = 0.0;
request.var1.addc = 0.0; request.var1.addc = 0.0;
request.var1.epilog = ECA_NONE;
request.var2.name = cdd_name2; request.var2.name = cdd_name2;
request.var2.longname = cdd_longname2; request.var2.longname = cdd_longname2;
request.var2.units = CDD_UNITS2; request.var2.units = CDD_UNITS2;
...@@ -1286,7 +1274,6 @@ void *EcaCwd(void *process) ...@@ -1286,7 +1274,6 @@ void *EcaCwd(void *process)
request.var1.f3 = vfarmax; request.var1.f3 = vfarmax;
request.var1.mulc = 0.0; request.var1.mulc = 0.0;
request.var1.addc = 0.0; request.var1.addc = 0.0;
request.var1.epilog = ECA_NONE;
request.var2.name = cwd_name2; request.var2.name = cwd_name2;
request.var2.longname = cwd_longname2; request.var2.longname = cwd_longname2;
request.var2.units = CWD_UNITS2; request.var2.units = CWD_UNITS2;
...@@ -1411,7 +1398,6 @@ void *EcaPd(void *process) ...@@ -1411,7 +1398,6 @@ void *EcaPd(void *process)
request.var1.f2 = vfarnum; request.var1.f2 = vfarnum;
request.var1.mulc = 0.0; request.var1.mulc = 0.0;
request.var1.addc = 0.0; request.var1.addc = 0.0;
request.var1.epilog = ECA_NONE;
eca1(&request); eca1(&request);
...@@ -1660,9 +1646,9 @@ EcaRr1(void *process) ...@@ -1660,9 +1646,9 @@ EcaRr1(void *process)
request.var1.f2 = vfarnum; request.var1.f2 = vfarnum;
request.var1.mulc = 0.0; request.var1.mulc = 0.0;
request.var1.addc = 0.0; request.var1.addc = 0.0;
request.var1.epilog = ECA_NONE;
eca1(&request); eca1(&request);
cdoFinish(); cdoFinish();
return 0; return 0;
...@@ -1706,7 +1692,6 @@ EcaRx1day(void *process) ...@@ -1706,7 +1692,6 @@ EcaRx1day(void *process)
request.var1.f2 = vfarmax; request.var1.f2 = vfarmax;
request.var1.mulc = 0.0; request.var1.mulc = 0.0;
request.var1.addc = 0.0; request.var1.addc = 0.0;
request.var1.epilog = ECA_NONE;
eca1(&request); eca1(&request);
...@@ -1767,7 +1752,6 @@ EcaRx5day(void *process) ...@@ -1767,7 +1752,6 @@ EcaRx5day(void *process)
request.var1.f2 = vfarmax; request.var1.f2 = vfarmax;
request.var1.mulc = 0.0; request.var1.mulc = 0.0;
request.var1.addc = 0.0; request.var1.addc = 0.0;
request.var1.epilog = ECA_NONE;
request.var2.name = RX5DAY_NAME2; request.var2.name = RX5DAY_NAME2;
request.var2.longname = longname.data(); request.var2.longname = longname.data();
request.var2.units = RX5DAY_UNITS2; request.var2.units = RX5DAY_UNITS2;
...@@ -1853,7 +1837,6 @@ Fdns(void *process) ...@@ -1853,7 +1837,6 @@ Fdns(void *process)
request.var1.f2arg = 0.01; request.var1.f2arg = 0.01;
request.var1.f3 = vfaradd; // any f with f(a, b) = miss, if a = miss or b = miss will do here request.var1.f3 = vfaradd; // any f with f(a, b) = miss, if a = miss or b = miss will do here
request.var1.f4 = vfarnum; request.var1.f4 = vfarnum;
request.var1.epilog = ECA_NONE;
eca2(&request); eca2(&request);
...@@ -1896,7 +1879,6 @@ Strwin(void *process) ...@@ -1896,7 +1879,6 @@ Strwin(void *process)
request.var1.f2 = vfarnum; request.var1.f2 = vfarnum;
request.var1.mulc = 0.0; request.var1.mulc = 0.0;
request.var1.addc = 0.0; request.var1.addc = 0.0;
request.var1.epilog = ECA_NONE;
request.var2.name = STRWIN_NAME2; request.var2.name = STRWIN_NAME2;
request.var2.longname = STRWIN_LONGNAME2; request.var2.longname = STRWIN_LONGNAME2;
request.var2.units = STRWIN_UNITS2; request.var2.units = STRWIN_UNITS2;
...@@ -1936,7 +1918,6 @@ Strbre(void *process) ...@@ -1936,7 +1918,6 @@ Strbre(void *process)
request.var1.f2 = vfarnum; request.var1.f2 = vfarnum;
request.var1.mulc = 0.0; request.var1.mulc = 0.0;
request.var1.addc = 0.0; request.var1.addc = 0.0;
request.var1.epilog = ECA_NONE;
request.var2.name = STRBRE_NAME2; request.var2.name = STRBRE_NAME2;
request.var2.longname = STRBRE_LONGNAME2; request.var2.longname = STRBRE_LONGNAME2;
request.var2.units = STRWIN_UNITS2; request.var2.units = STRWIN_UNITS2;
...@@ -1975,7 +1956,6 @@ Strgal(void *process) ...@@ -1975,7 +1956,6 @@ Strgal(void *process)
request.var1.f2 = vfarnum; request.var1.f2 = vfarnum;
request.var1.mulc = 0.0; request.var1.mulc = 0.0;
request.var1.addc = 0.0; request.var1.addc = 0.0;
request.var1.epilog = ECA_NONE;
request.var2.name = STRBRE_NAME2; request.var2.name = STRBRE_NAME2;
request.var2.longname = STRBRE_LONGNAME2; request.var2.longname = STRBRE_LONGNAME2;
request.var2.units = STRWIN_UNITS2; request.var2.units = STRWIN_UNITS2;
...@@ -2014,7 +1994,6 @@ Hurr(void *process) ...@@ -2014,7 +1994,6 @@ Hurr(void *process)
request.var1.f2 = vfarnum; request.var1.f2 = vfarnum;
request.var1.mulc = 0.0; request.var1.mulc = 0.0;
request.var1.addc = 0.0; request.var1.addc = 0.0;
request.var1.epilog = ECA_NONE;
request.var2.name = HURR_NAME2; request.var2.name = HURR_NAME2;
request.var2.longname = HURR_LONGNAME2; request.var2.longname = HURR_LONGNAME2;
request.var2.units = STRWIN_UNITS2; request.var2.units = STRWIN_UNITS2;
......
...@@ -65,7 +65,7 @@ struct ECA_MAJOR_REQUEST_ELEMENT_1 ...@@ -65,7 +65,7 @@ struct ECA_MAJOR_REQUEST_ELEMENT_1
ECA_FUNC_2 f3 = nullptr; ECA_FUNC_2 f3 = nullptr;
double mulc; double mulc;
double addc; double addc;
ECA_EPILOG epilog; ECA_EPILOG epilog = ECA_NONE;
}; };
/** /**
...@@ -139,7 +139,7 @@ struct ECA_MAJOR_REQUEST_ELEMENT_2 ...@@ -139,7 +139,7 @@ struct ECA_MAJOR_REQUEST_ELEMENT_2
ECA_FUNC_2 f4 = nullptr; ECA_FUNC_2 f4 = nullptr;
ECA_FUNC_3 f5 = nullptr; ECA_FUNC_3 f5 = nullptr;
double f5arg; double f5arg;
ECA_EPILOG epilog; ECA_EPILOG epilog = ECA_NONE;
}; };
/** /**
......
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