Skip to content

Commit

Permalink
Move checkpower
Browse files Browse the repository at this point in the history
  • Loading branch information
payetvin committed Jun 13, 2024
1 parent 3c75a26 commit f9a4f2e
Showing 1 changed file with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ bool HydroMaxTimeSeriesReader::loadDailyMaxPowersAndEnergies(const AnyString& fo
Matrix<>::optFixedSize,
&fileContent)
&& ret;
ret = checkPower(dailyMaxPumpAndGen, areaName_) && ret;

}
return ret;
}
Expand Down Expand Up @@ -143,6 +141,7 @@ void HydroMaxTimeSeriesReader::copyDailyMaxPumpingEnergy() const
bool HydroMaxTimeSeriesReader::read(const AnyString& folder, bool usedBySolver)
{
bool ret = loadDailyMaxPowersAndEnergies(folder, usedBySolver);
ret = checkPower(dailyMaxPumpAndGen, areaName_) && ret;
copyDailyMaxEnergy();
hydro_.series->buildHourlyMaxPowerFromDailyTS(dailyMaxPumpAndGen[genMaxP],
dailyMaxPumpAndGen[pumpMaxP]);
Expand Down

0 comments on commit f9a4f2e

Please sign in to comment.