ecacore: set default value of mulc/addc to 0.0.

src/EcaIndices.cc

@@ -378,8 +378,6 @@ void *EcaCfd(void *process)
   request.var1.f1arg    = TO_KELVIN(0.0);
   request.var1.f2       = vfarnum2;
   request.var1.f3       = vfarmax;
-  request.var1.mulc     = 0.0;
-  request.var1.addc     = 0.0;
   request.var2.name     = cfd_name2;
   request.var2.longname = cfd_longname2;
   request.var2.units    = CFD_UNITS2;
@@ -432,8 +430,6 @@ void *EcaCsu(void *process)
   request.var1.f1arg    = TO_KELVIN(argT);
   request.var1.f2       = vfarnum2;
   request.var1.f3       = vfarmax;
-  request.var1.mulc     = 0.0;
-  request.var1.addc     = 0.0;
   request.var2.name     = csu_name2;
   request.var2.longname = csu_longname2;
   request.var2.units    = CSU_UNITS2;
@@ -620,8 +616,6 @@ void *EcaFd(void *process)
   request.var1.f1       = vfarselltc; 
   request.var1.f1arg    = TO_KELVIN(0.0);
   request.var1.f2       = vfarnum;
-  request.var1.mulc     = 0.0;    
-  request.var1.addc     = 0.0;
    
   eca1(&request);
 
@@ -865,8 +859,6 @@ void *EcaId(void *process)
   request.var1.f1       = vfarselltc;
   request.var1.f1arg    = TO_KELVIN(0.0);
   request.var1.f2       = vfarnum;
-  request.var1.mulc     = 0.0;    
-  request.var1.addc     = 0.0;   
     
   eca1(&request);
 
@@ -919,8 +911,6 @@ void *EcaSu(void *process)
   request.var1.f1       = vfarselgtc;
   request.var1.f1arg    = TO_KELVIN(argT);
   request.var1.f2       = vfarnum;
-  request.var1.mulc     = 0.0;    
-  request.var1.addc     = 0.0;    
  
   eca1(&request);
 
@@ -1070,8 +1060,6 @@ void *EcaTr(void *process)
   request.var1.f1       = vfarselgtc;
   request.var1.f1arg    = TO_KELVIN(argT);
   request.var1.f2       = vfarnum;
-  request.var1.mulc     = 0.0;    
-  request.var1.addc     = 0.0;    
    
   eca1(&request);
   
@@ -1198,8 +1186,6 @@ void *EcaCdd(void *process)
   request.var1.f1arg    = threshold;
   request.var1.f2       = vfarnum2;
   request.var1.f3       = vfarmax;
-  request.var1.mulc     = 0.0;
-  request.var1.addc     = 0.0;
   request.var2.name     = cdd_name2;
   request.var2.longname = cdd_longname2;
   request.var2.units    = CDD_UNITS2;
@@ -1272,8 +1258,6 @@ void *EcaCwd(void *process)
   request.var1.f1arg    = threshold;
   request.var1.f2       = vfarnum2;
   request.var1.f3       = vfarmax;
-  request.var1.mulc     = 0.0;
-  request.var1.addc     = 0.0;
   request.var2.name     = cwd_name2;
   request.var2.longname = cwd_longname2;
   request.var2.units    = CWD_UNITS2;
@@ -1396,8 +1380,6 @@ void *EcaPd(void *process)
   request.var1.f1 = vfarselgec;
   request.var1.f1arg = threshold;
   request.var1.f2 = vfarnum;
-  request.var1.mulc = 0.0;
-  request.var1.addc = 0.0;
 
   eca1(&request);
 
@@ -1644,8 +1626,6 @@ EcaRr1(void *process)
   request.var1.f1 = vfarselgec;
   request.var1.f1arg = threshold;
   request.var1.f2 = vfarnum;
-  request.var1.mulc = 0.0;
-  request.var1.addc = 0.0;
 
   eca1(&request);
 
@@ -1690,8 +1670,6 @@ EcaRx1day(void *process)
       request.var1.units = RX1DAY_UNITS_ET;
     }
   request.var1.f2 = vfarmax;
-  request.var1.mulc = 0.0;
-  request.var1.addc = 0.0;
 
   eca1(&request);
 
@@ -1750,8 +1728,6 @@ EcaRx5day(void *process)
       request.var1.units = RX5DAY_UNITS_ET;
     }
   request.var1.f2 = vfarmax;
-  request.var1.mulc = 0.0;
-  request.var1.addc = 0.0;
   request.var2.name = RX5DAY_NAME2;
   request.var2.longname = longname.data();
   request.var2.units = RX5DAY_UNITS2;
@@ -1809,8 +1785,6 @@ EcaSdii(void *process)
   request.var1.f1 = vfarselgec;
   request.var1.f1arg = threshold;
   request.var1.f2 = vfarsum;
-  request.var1.mulc = 0.0;
-  request.var1.addc = 0.0;
   request.var1.epilog = MEAN;
 
   eca1(&request);
@@ -1877,8 +1851,6 @@ Strwin(void *process)
   request.var1.f1 = vfarselgec;
   request.var1.f1arg = maxWind;
   request.var1.f2 = vfarnum;
-  request.var1.mulc = 0.0;
-  request.var1.addc = 0.0;
   request.var2.name = STRWIN_NAME2;
   request.var2.longname = STRWIN_LONGNAME2;
   request.var2.units = STRWIN_UNITS2;
@@ -1916,8 +1888,6 @@ Strbre(void *process)
   request.var1.f1 = vfarselgec;
   request.var1.f1arg = maxWind;
   request.var1.f2 = vfarnum;
-  request.var1.mulc = 0.0;
-  request.var1.addc = 0.0;
   request.var2.name = STRBRE_NAME2;
   request.var2.longname = STRBRE_LONGNAME2;
   request.var2.units = STRWIN_UNITS2;
@@ -1954,8 +1924,6 @@ Strgal(void *process)
   request.var1.f1 = vfarselgec;
   request.var1.f1arg = maxWind;
   request.var1.f2 = vfarnum;
-  request.var1.mulc = 0.0;
-  request.var1.addc = 0.0;
   request.var2.name = STRBRE_NAME2;
   request.var2.longname = STRBRE_LONGNAME2;
   request.var2.units = STRWIN_UNITS2;
@@ -1992,8 +1960,6 @@ Hurr(void *process)
   request.var1.f1 = vfarselgec;
   request.var1.f1arg = maxWind;
   request.var1.f2 = vfarnum;
-  request.var1.mulc = 0.0;
-  request.var1.addc = 0.0;
   request.var2.name = HURR_NAME2;
   request.var2.longname = HURR_LONGNAME2;
   request.var2.units = STRWIN_UNITS2;

src/ecacore.cc

@@ -46,7 +46,7 @@ eca1(const ECA_REQUEST_1 *request)
   int64_t ivdate = 0, ovdate = 0, indate21 = 0;
   int ivtime = 0, ovtime = 0;
   int nrecs;
-  int varID, levelID;
+  int levelID;
   int itsID;
   int otsID;
   long nsets;
@@ -62,7 +62,7 @@ eca1(const ECA_REQUEST_1 *request)
   const auto zaxisID = vlistInqVarZaxis(ivlistID, FIRST_VAR_ID);
   const auto missval = vlistInqVarMissval(ivlistID, FIRST_VAR_ID);
 
-  varID = vlistDefVar(ovlistID, gridID, zaxisID, TIME_VARYING);
+  auto varID = vlistDefVar(ovlistID, gridID, zaxisID, TIME_VARYING);
 
   vlistDefVarMissval(ovlistID, varID, missval);
 
@@ -103,7 +103,7 @@ eca1(const ECA_REQUEST_1 *request)
   field3.resize(gridsize);
   if (IS_SET(request->var2.h2) || IS_SET(request->var2.h3)) field2.resize(gridsize);
 
-  const int nlevels = zaxisInqSize(zaxisID);
+  const auto nlevels = zaxisInqSize(zaxisID);
 
   FieldVector var12(nlevels), samp1(nlevels), samp2(nlevels);
   FieldVector var13, var21, var23;

src/ecacore.h

@@ -63,8 +63,8 @@ struct ECA_MAJOR_REQUEST_ELEMENT_1
   double f1arg;
   ECA_FUNC_2 f2 = nullptr;
   ECA_FUNC_2 f3 = nullptr;
-  double mulc;
-  double addc;
+  double mulc = 0.0;
+  double addc = 0.0;
   ECA_EPILOG epilog = ECA_NONE;
 };