[pre-commit.ci] auto fixes from pre-commit.com hooks

pre-commit-ci[bot] · pre-commit-ci[bot] · commit 17bef003f3c6 · 2025-02-10T20:28:07.000Z
for more information, see https://pre-commit.ci
diff --git a/src/Assimilate.cpp b/src/Assimilate.cpp
@@ -170,7 +170,7 @@ void CModel::PrepareAssimilation(const optStruct &Options,const time_struct &tt)
             _aDAoverride [p]=true;
             _aDAobsQ     [p]=Qobs;
             _aDADrainSum [p]=0.0; //??? maybe doesnt matter
-            if (pdown != DOESNT_EXIST) {      
+            if (pdown != DOESNT_EXIST) {
               _aDADrainSum [pdown]+=_pSubBasins[p]->GetDrainageArea(); //DOES THIS HANDLE NESTING RIGHT?
             }
           }
@@ -182,17 +182,17 @@ void CModel::PrepareAssimilation(const optStruct &Options,const time_struct &tt)
             _aDAlength   [p]=0.0;
             _aDAoverride [p]=false;
             _aDAobsQ     [p]=0.0;
-            if (pdown != DOESNT_EXIST) {        
+            if (pdown != DOESNT_EXIST) {
               _aDADrainSum[pdown] += _aDADrainSum[p];
             }
           }
           ObsExists=true;
           break; //avoids duplicate observations
         }
       }
-    } 
+    }
     else {
-      if (pdown != DOESNT_EXIST) {        
+      if (pdown != DOESNT_EXIST) {
         _aDADrainSum[pdown] += _aDADrainSum[p];
       }
     }
diff --git a/src/DemandOptimization.cpp b/src/DemandOptimization.cpp
@@ -1644,7 +1644,7 @@ void CDemandOptimizer::SolveDemandProblem(CModel *pModel, const optStruct &Optio
       retval = lp_lib::add_constraintex(pLinProg,i,row_val,col_ind,ROWTYPE_EQ,RHS);
       ExitGracefullyIf(retval==0,"SolveDemandProblem::Error adding mass balance constraint",RUNTIME_ERR);
       IncrementAndSetRowName(pLinProg,rowcount,"reach_MB_"+to_string(pSB->GetID()));
-        
+
       lpsbrow[p]=lp_lib::get_Nrows(pLinProg);
     }
   }
diff --git a/src/DemandOptimization.h b/src/DemandOptimization.h
@@ -302,7 +302,7 @@ class CDemandOptimizer
   void   OverrideSDCurve       (const int p);
 
   void   AddGoalOrConstraint   (const managementGoal *pGoal);
-  
+
   void   AddUserDecisionVar    (const decision_var *pDV);
   void   SetUserDecisionVarBounds(const string name, const double &min, const double &max);
   void   AddUserConstant       (const string name, const double &val);
diff --git a/src/EnKF.cpp b/src/EnKF.cpp
@@ -458,11 +458,11 @@ void CEnKFEnsemble::CloseTimeStepOps(CModel* pModel,optStruct& Options,const tim
           //cout<<"GRABBING OUTPUT ens: "<<e<<" nn="<<curr_nn<<" obs: "<<_output_matrix[e][j]<<" "<<obsval<<" duration "<<Options.duration<<endl;
           j++;
           break; //escape loop
-        } 
+        }
         else {
           j++;
         }
-        
+
       }
     }
   }
diff --git a/src/ModelParamCheck.cpp b/src/ModelParamCheck.cpp
@@ -112,7 +112,7 @@ void CModel::AddFromPotMeltParamList(string *aP,class_type *aPC,int &nP,const po
     aP[nP]="MELT_FACTOR"; aPC[nP]=CLASS_LANDUSE; nP++;
     aP[nP]="DD_MELT_TEMP";aPC[nP]=CLASS_LANDUSE; nP++;
     aP[nP]="REFREEZE_FACTOR";aPC[nP]=CLASS_LANDUSE; nP++;
-  }  
+  }
   else if(pot_melt==POTMELT_RESTRICTED)
   {
     aP[nP]="MELT_FACTOR"; aPC[nP]=CLASS_LANDUSE; nP++;
diff --git a/src/ParseFEWSRunInfo.cpp b/src/ParseFEWSRunInfo.cpp
@@ -280,7 +280,7 @@ bool ParseNetCDFRunInfoFile(CModel *&pModel, optStruct &Options, bool runname_ov
       delete[] boolean;
     }
 
-    // Other attributes with info embedded in attribute name 
+    // Other attributes with info embedded in attribute name
     int nAttributes;
     char att_name[NC_MAX_NAME];
     double att_value;
@@ -292,7 +292,7 @@ bool ParseNetCDFRunInfoFile(CModel *&pModel, optStruct &Options, bool runname_ov
           string att_name_s=to_string(att_name);
 
           // NamedConstant(s) ----------------------------------------------------
-          if (att_name_s.substr(0, 14) == "NamedConstant_") 
+          if (att_name_s.substr(0, 14) == "NamedConstant_")
           {
             string name=att_name_s.substr(14,att_name_s.length());
 
@@ -534,7 +534,7 @@ bool ParseNetCDFStateFile(CModel *&pModel,const optStruct &Options)
 // .The state variable corresponding to the model start time will be used for initialization of flow/stage; all other values in the time vector are ignored
 //  The naming convention of this attribute is one of: {QOUT, STAGE,  }
 //
-bool ParseNetCDFFlowStateFile(CModel*& pModel,const optStruct& Options) 
+bool ParseNetCDFFlowStateFile(CModel*& pModel,const optStruct& Options)
 {
   if(Options.flowinfo_filename=="") { return true; }
 
diff --git a/src/ParseInput.cpp b/src/ParseInput.cpp
@@ -326,7 +326,7 @@ bool ParseMainInputFile (CModel     *&pModel,
   Options.aNetCDFattribs          =NULL;
   Options.assimilate_flow         =false;
   Options.assimilate_stage        =false;
-  Options.assimilation_start      =-1.0; //start before simulation 
+  Options.assimilation_start      =-1.0; //start before simulation
   Options.time_zone               =0;
   Options.rvl_read_frequency      =0.0; //do not read at all
   Options.custom_interval         =1.0; //daily
diff --git a/src/ParseManagementFile.cpp b/src/ParseManagementFile.cpp
@@ -651,7 +651,7 @@ bool ParseManagementFile(CModel *&pModel,const optStruct &Options)
      */
       if (Options.noisy) { cout << "Workflow Variable Definition Statement" << endl; }
 
-      workflowVar* pWV; 
+      workflowVar* pWV;
       if (pDO->GetWorkflowVarStruct(to_string(s[1])) != NULL){//already declared
         pWV=pDO->GetWorkflowVarStruct(to_string(s[1]));
       }
@@ -820,7 +820,7 @@ bool ParseManagementFile(CModel *&pModel,const optStruct &Options)
     }
     case(32):  //----------------------------------------------
     {/*:LookupTableFromCSV [name] [filename.csv]
-       format: 
+       format:
         HeaderX, HeaderY
         x1, y1
         x2, y2
@@ -840,15 +840,15 @@ bool ParseManagementFile(CModel *&pModel,const optStruct &Options)
       string  name = s[1];
       string  filename="";
       for (int i=2;i<Len;i++){filename+=to_string(s[i]); }
-      
+
       ifstream    LUCSV;
       LUCSV.open(filename.c_str());
       if (LUCSV.fail()){cout << "ERROR opening file: "<<filename<<endl; return false;}
 
       CParser *ppCSV=new CParser(LUCSV,filename,line2);
 
       ppCSV->Tokenize(s,Len); //headers
-     
+
       N=0;
       do {
         eof=ppCSV->Tokenize(s,Len);
@@ -875,7 +875,7 @@ bool ParseManagementFile(CModel *&pModel,const optStruct &Options)
       delete ppCSV;
       break;
     }
-    
+
     case(40):  //----------------------------------------------
     { /*:LoopThrough [SB_GROUP or DEMAND_GROUP] [group name]  */
       if(Options.noisy) { cout <<"Start Loop"<<endl; }
@@ -1124,7 +1124,7 @@ bool ParseManagementFile(CModel *&pModel,const optStruct &Options)
         ExitGracefully(":ResetDate must be between :WaterDemand and :EndWaterDemand commands.",BAD_DATA_WARN);
       }
       else {
-        
+
         pDO->SetCumulativeDate(s_to_i(s[1]), to_string(demand_ID));
       }
       break;
@@ -1358,7 +1358,7 @@ bool ParseManagementFile(CModel *&pModel,const optStruct &Options)
   } //end while !end_of_file
   RVM.close();
 
-  pDO->InitializeDemands    (pModel,Options); 
+  pDO->InitializeDemands    (pModel,Options);
   pDO->InitializePostRVMRead(pModel,Options);
 
   if (loopCount != 0) {
diff --git a/src/RavenAlgParams.dat b/src/RavenAlgParams.dat
@@ -195,11 +195,11 @@ ROUTE_NONE RoutingMethod
 ROUTE_DIFFUSIVE_WAVE RoutingMethod
 ROUTE_DUMP CatchmentRoute
 
-POTMELT_DEGREE_DAY PotentialMelt MELT_FACTOR LULT 
+POTMELT_DEGREE_DAY PotentialMelt MELT_FACTOR LULT
 POTMELT_DEGREE_DAY PotentialMelt DD_MELT_TEMP LULT
-POTMELT_DD_FREEZE PotentialMelt MELT_FACTOR LULT 
+POTMELT_DD_FREEZE PotentialMelt MELT_FACTOR LULT
 POTMELT_DD_FREEZE PotentialMelt DD_MELT_TEMP LULT
-POTMELT_DD_FREEZE PotentialMelt REFREEZE_FACTOR LULT 
+POTMELT_DD_FREEZE PotentialMelt REFREEZE_FACTOR LULT
 POTMELT_RESTRICTED PotentialMelt MELT_FACTOR LULT
 POTMELT_RESTRICTED PotentialMelt DD_MELT_TEMP LULT
 POTMELT_HBV PotentialMelt MELT_FACTOR LULT
@@ -226,4 +226,4 @@ POTMELT_HMETS PotentialMelt MIN_MELT_FACTOR LULT
 POTMELT_HMETS PotentialMelt MAX_MELT_FACTOR LULT
 POTMELT_HMETS PotentialMelt DD_MELT_TEMP LULT
 POTMELT_HMETS PotentialMelt DD_AGGRADATION LULT
-POTMELT_RILEY PotentialMelt MELT_FACTOR LULT
+POTMELT_RILEY PotentialMelt MELT_FACTOR LULT
diff --git a/src/SoilClass.cpp b/src/SoilClass.cpp
@@ -390,7 +390,7 @@ void CSoilClass::InitializeSoilProperties(soil_struct &S, bool is_template,int n
   S.evap_res_fc =S.shuttleworth_b          =DefaultParameterValue(is_template,true);
   S.PET_correction                         =1.0;
 
-  S.albedo_wet                             =0.16; 
+  S.albedo_wet                             =0.16;
   S.albedo_dry                             =0.24;
 
   //Conceptual parameters
diff --git a/src/TimeSeries.cpp b/src/TimeSeries.cpp
@@ -331,7 +331,7 @@ void CTimeSeries::InitializeResample(const int nSampVal, const double sampInterv
 /// \brief Returns index of time period for time t_loc in terms of local time
 ///
 /// \param &t_loc [in] Local time for time series (=0 for first time data present)
-/// \return Index of time period for time t_loc; if t_loc<0, returns 0, if t_loc>_nPulses-1, returns nPulses-1 
+/// \return Index of time period for time t_loc; if t_loc<0, returns 0, if t_loc>_nPulses-1, returns nPulses-1
 /// ?OR? \return Index of time period for local time t_loc; if t_loc<0 or >_nPulses-1, return DOESNT_EXIST//JRCNEWTS
 /// right now this has some unintended consequences for the final time step of solution when the input data is the same duration as the simulation. Needs to be looked into further.
 //
@@ -1375,7 +1375,7 @@ CTimeSeries **CTimeSeries::ParseEnsimTb0(string filename, int &nTS, forcing_type
 //
 CTimeSeries *CTimeSeries::ReadTimeSeriesFromNetCDF(const optStruct &Options, string name,
                                                    long long loc_ID, string gauge_name,
-                                                   bool shift_to_per_ending, bool shift_from_per_ending, 
+                                                   bool shift_to_per_ending, bool shift_from_per_ending,
                                                    string FileNameNC, string VarNameNC,
                                                    string DimNamesNC_stations, string DimNamesNC_time,
                                                    int StationIdx, double TimeShift, double LinTrans_a, double LinTrans_b)

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ void CModel::PrepareAssimilation(const optStruct &Options,const time_struct &tt)`
`170`	`170`	`_aDAoverride [p]=true;`
`171`	`171`	`_aDAobsQ [p]=Qobs;`
`172`	`172`	`_aDADrainSum [p]=0.0; //??? maybe doesnt matter`
`173`		`- if (pdown != DOESNT_EXIST) {`
	`173`	`+ if (pdown != DOESNT_EXIST) {`
`174`	`174`	`_aDADrainSum [pdown]+=_pSubBasins[p]->GetDrainageArea(); //DOES THIS HANDLE NESTING RIGHT?`
`175`	`175`	`}`
`176`	`176`	`}`
`@@ -182,17 +182,17 @@ void CModel::PrepareAssimilation(const optStruct &Options,const time_struct &tt)`
`182`	`182`	`_aDAlength [p]=0.0;`
`183`	`183`	`_aDAoverride [p]=false;`
`184`	`184`	`_aDAobsQ [p]=0.0;`
`185`		`- if (pdown != DOESNT_EXIST) {`
	`185`	`+ if (pdown != DOESNT_EXIST) {`
`186`	`186`	`_aDADrainSum[pdown] += _aDADrainSum[p];`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`	`ObsExists=true;`
`190`	`190`	`break; //avoids duplicate observations`
`191`	`191`	`}`
`192`	`192`	`}`
`193`		`- }`
	`193`	`+ }`
`194`	`194`	`else {`
`195`		`- if (pdown != DOESNT_EXIST) {`
	`195`	`+ if (pdown != DOESNT_EXIST) {`
`196`	`196`	`_aDADrainSum[pdown] += _aDADrainSum[p];`
`197`	`197`	`}`
`198`	`198`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1644,7 +1644,7 @@ void CDemandOptimizer::SolveDemandProblem(CModel *pModel, const optStruct &Optio`
`1644`	`1644`	`retval = lp_lib::add_constraintex(pLinProg,i,row_val,col_ind,ROWTYPE_EQ,RHS);`
`1645`	`1645`	`ExitGracefullyIf(retval==0,"SolveDemandProblem::Error adding mass balance constraint",RUNTIME_ERR);`
`1646`	`1646`	`IncrementAndSetRowName(pLinProg,rowcount,"reach_MB_"+to_string(pSB->GetID()));`
`1647`		`-`
	`1647`	`+`
`1648`	`1648`	`lpsbrow[p]=lp_lib::get_Nrows(pLinProg);`
`1649`	`1649`	`}`
`1650`	`1650`	`}`
Original file line number	Diff line number	Diff line change
`@@ -458,11 +458,11 @@ void CEnKFEnsemble::CloseTimeStepOps(CModel* pModel,optStruct& Options,const tim`
`458`	`458`	`//cout<<"GRABBING OUTPUT ens: "<<e<<" nn="<<curr_nn<<" obs: "<<_output_matrix[e][j]<<" "<<obsval<<" duration "<<Options.duration<<endl;`
`459`	`459`	`j++;`
`460`	`460`	`break; //escape loop`
`461`		`- }`
	`461`	`+ }`
`462`	`462`	`else {`
`463`	`463`	`j++;`
`464`	`464`	`}`
`465`		`-`
	`465`	`+`
`466`	`466`	`}`
`467`	`467`	`}`
`468`	`468`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ void CModel::AddFromPotMeltParamList(string aP,class_type aPC,int &nP,const po`
`112`	`112`	`aP[nP]="MELT_FACTOR"; aPC[nP]=CLASS_LANDUSE; nP++;`
`113`	`113`	`aP[nP]="DD_MELT_TEMP";aPC[nP]=CLASS_LANDUSE; nP++;`
`114`	`114`	`aP[nP]="REFREEZE_FACTOR";aPC[nP]=CLASS_LANDUSE; nP++;`
`115`		`- }`
	`115`	`+ }`
`116`	`116`	`else if(pot_melt==POTMELT_RESTRICTED)`
`117`	`117`	`{`
`118`	`118`	`aP[nP]="MELT_FACTOR"; aPC[nP]=CLASS_LANDUSE; nP++;`