Skip to content

Commit

Permalink
Fix extra lines from merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
flomnes committed Mar 25, 2024
1 parent e91e29c commit 0b72d59
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions src/solver/optimisation/post_process_commands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,6 @@ void DTGmarginForAdqPatchPostProcessCmd::execute(const optRuntimeData&)
// calculate DTG MRG CSR and adjust ENS if neccessary
if (problemeHebdo_->adequacyPatchRuntimeData->wasCSRTriggeredAtAreaHour(Area, hour))
{
dtgMrgCsr = std::max(0.0, dtgMrg - ens);
ens = std::max(0.0, ens - dtgMrg);
if (adqPatchParams_.curtailmentSharing.recomputeDTGMRG)
{
dtgMrgCsr = std::max(0.0, dtgMrg - ens);
Expand Down

0 comments on commit 0b72d59

Please sign in to comment.