From 01114aaff37af7ebf22f8c4135f76d15b6f77a4c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2026 17:15:10 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/python-jsonschema/check-jsonschema: 0.36.0 → 0.37.1](https://github.com/python-jsonschema/check-jsonschema/compare/0.36.0...0.37.1) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5b36103..f321335 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,7 +26,7 @@ repos: # - id: include-what-you-use - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.36.0 + rev: 0.37.1 hooks: - id: check-github-workflows - repo: meta From 67ebf8f9c5695a936a5016f40b29be0f7a499224 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2026 17:15:23 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/Assimilate.cpp | 2 +- src/ChannelXSect.cpp | 2 +- src/ParsePropertyFile.cpp | 18 +++++++++--------- src/Reservoir.cpp | 8 ++++---- src/Reservoir.h | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Assimilate.cpp b/src/Assimilate.cpp index c080e6a..73fedc8 100644 --- a/src/Assimilate.cpp +++ b/src/Assimilate.cpp @@ -157,7 +157,7 @@ void CModel::PrepareAssimilation(const optStruct &Options,const time_struct &tt) { Qobs = _pObservedTS[i]->GetSampledValue(nn); //mean timestep flow Qobs2 = _pObservedTS[i]->GetSampledValue(nn+1); //mean timestep flow - + //override initial conditions directly if ((nn==1) && (Qobs!=RAV_BLANK_DATA)){ _pSubBasins[p]->SetQout(Qobs); diff --git a/src/ChannelXSect.cpp b/src/ChannelXSect.cpp index 0ad00a6..d950a88 100644 --- a/src/ChannelXSect.cpp +++ b/src/ChannelXSect.cpp @@ -389,7 +389,7 @@ double CChannelXSect::GetDiffusivity(const double &Q, const double &SB_slope, co { ExitGracefullyIf(Q<=0,"CChannelXSect::GetDiffusivity: Invalid channel flowrate",BAD_DATA); - ///< diffusivity from Roberson et al. 1995, Hydraulic Engineering + ///< diffusivity from Roberson et al. 1995, Hydraulic Engineering double slope_mult=1.0; double Q_mult =1.0; GetFlowCorrections(SB_slope,SB_n,slope_mult,Q_mult); diff --git a/src/ParsePropertyFile.cpp b/src/ParsePropertyFile.cpp index ddaf48c..3911732 100644 --- a/src/ParsePropertyFile.cpp +++ b/src/ParsePropertyFile.cpp @@ -38,10 +38,10 @@ void AddNewSoilClass (CSoilClass **&pSoilClasses, soil_struct **&parsed_s string *&soiltags, int &num_parsed_soils, int nConstits, const string name, bool isdefault, CModel *pModel); void AddNewLULTClass (CLandUseClass **&pLandUseClasses, surface_struct **&parsed_lults, - string *&lulttags, int &num_parsed_lults, + string *&lulttags, int &num_parsed_lults, const string name, bool isdefault, CModel *pModel); void AddNewVegClass (CVegetationClass **&pVegClasses, veg_struct **&parsed_vegs, - string *&vegtags, int &num_parsed_vegs, + string *&vegtags, int &num_parsed_vegs, const string name, bool isdefault, CModel *pModel); ////////////////////////////////////////////////////////////////// /// \brief This method parses the class properties .rvp file @@ -86,7 +86,7 @@ bool ParseClassPropertiesFile(CModel *&pModel, CSoilProfile **pProfiles=NULL; int num_parsed_aqstacks=0; - + bool invalid_index; int num_read; int *indices=NULL; @@ -518,7 +518,7 @@ bool ParseClassPropertiesFile(CModel *&pModel, invalid_index=ParsePropArray(p,indices,properties,num_read,soiltags,nParamStrings,num_parsed_soils,aAliases,nAliases); ExitGracefullyIf(invalid_index, "ParseClassPropertiesFile: Invalid soiltype code in SoilParameterList command",BAD_DATA); - + if (Options.noisy){ for (int j=0;jAutoCalculateSoilProps (*parsed_soils[c],*parsed_soils[0],pModel->GetTransportModel()->GetNumConstituents()); } for (int c=1;cAutoCalculateLandUseProps (*parsed_surf[c], *parsed_surf[0]); + pLUClasses [c]->AutoCalculateLandUseProps (*parsed_surf[c], *parsed_surf[0]); } for (int c=1;cAutoCalculateTerrainProps ( parsed_terrs[c], parsed_terrs[0]); @@ -1577,7 +1577,7 @@ bool ParseClassPropertiesFile(CModel *&pModel, pModel->CheckForChannelXSectsDuplicates(Options); - + delete p; return true; @@ -1648,7 +1648,7 @@ bool ParsePropArray(CParser *p, //parser tmpproperties[num_read][j-1]=AutoOrDoubleOrAlias(s[j],pAliases,nAliases); } DeletePropArray(indices,properties,num_read); - + properties=tmpproperties; indices=tmpind; num_read++; @@ -1808,7 +1808,7 @@ void AddNewSoilClass(CSoilClass **&pSoilClasses, /// \brief dynamically adds a new LULT class to the array of parsed LULT classes. // void AddNewLULTClass (CLandUseClass **&pLandUseClasses, surface_struct **&parsed_lults, - string *&lulttags, int &num_parsed_lults, + string *&lulttags, int &num_parsed_lults, const string name, bool isdefault, CModel *pModel){ CLandUseClass *pLC; pLC = new CLandUseClass(name, pModel); @@ -1838,7 +1838,7 @@ void AddNewLULTClass (CLandUseClass **&pLandUseClasses, surface_struct ** /// \brief dynamically adds a new veg class to the array of parsed vegetation classes. // void AddNewVegClass (CVegetationClass **&pVegClasses, veg_struct **&parsed_vegs, - string *&vegtags, int &num_parsed_vegs, + string *&vegtags, int &num_parsed_vegs, const string name, bool isdefault, CModel *pModel){ CVegetationClass *pVC; pVC = new CVegetationClass(name, pModel); diff --git a/src/Reservoir.cpp b/src/Reservoir.cpp index 186b0f4..aa36466 100644 --- a/src/Reservoir.cpp +++ b/src/Reservoir.cpp @@ -511,17 +511,17 @@ double CReservoir::GetLakeConvectionCoeff() const { return _lake_convcoeff; } ////////////////////////////////////////////////////////////////// /// \returns current outflow rate [m3/s] // -double CReservoir::GetOutflowRate (const bool adjusted) const { +double CReservoir::GetOutflowRate (const bool adjusted) const { if (adjusted){return max(_Qout+_DAadjust,0.0);} - else {return _Qout;} + else {return _Qout;} } ////////////////////////////////////////////////////////////////// /// \returns previous outflow rate [m3/s] // -double CReservoir::GetOldOutflowRate (const bool adjusted) const { +double CReservoir::GetOldOutflowRate (const bool adjusted) const { if (adjusted){return max(_Qout_last+_DAadjust_last,0.0);} - else {return _Qout_last;} + else {return _Qout_last;} } ////////////////////////////////////////////////////////////////// diff --git a/src/Reservoir.h b/src/Reservoir.h index 4578b0b..26bc365 100644 --- a/src/Reservoir.h +++ b/src/Reservoir.h @@ -99,7 +99,7 @@ class CReservoir double _DAadjust; //< outflow adjustment - used for reporting overriden flows [m3/s] double _DAadjust_last; //< outflow adjustment [m3/s] from previous time step - + int _dry_timesteps; //< number of time steps this reservoir dried out during simulation //state variables :