Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove hidden hydro constraint #237

Open
wants to merge 1 commit into
base: New-Antares-Emulator-4
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions src/solver/optimisation/opt_restaurer_les_donnees.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ void OPT_RestaurerLesDonnees(PROBLEME_HEBDO* ProblemeHebdo)
double PmaxHydEcretee;
int Intervalle;
int Semaine;
double PmaxHydUplift; // Hydro generating power required to make use of energy stored from pumps

CONSOMMATIONS_ABATTUES* ConsommationsAbattues;
CONSOMMATIONS_ABATTUES* ConsommationsAbattuesRef;
Expand Down Expand Up @@ -136,23 +135,6 @@ void OPT_RestaurerLesDonnees(PROBLEME_HEBDO* ProblemeHebdo)
PmaxHydEcretee = CaracteristiquesHydrauliques->CntEnergieH2OParJour[Jour];
PmaxHydEcretee *= ProblemeHebdo->CoefficientEcretementPMaxHydraulique[Pays];
PmaxHydEcretee /= (double)ProblemeHebdo->NombreDePasDeTempsDUneJournee;
// The primary generating power allowance may need to be uplifted to match pumping power
// allowance
if (CaracteristiquesHydrauliques->PresenceDePompageModulable == OUI_ANTARES)
{
PmaxHydUplift = CaracteristiquesHydrauliques->ContrainteDePmaxPompageHoraire[Pdt];
PmaxHydUplift *= ProblemeHebdo->CoefficientEcretementPMaxHydraulique[Pays];
// The uplifted energy cannot, throughout the week, exceed the remaining stock
if (PmaxHydUplift * double(168)
> CaracteristiquesHydrauliques->NiveauInitialReservoir)
{
PmaxHydUplift
= CaracteristiquesHydrauliques->NiveauInitialReservoir / double(168);
}

if (PmaxHydEcretee < PmaxHydUplift)
PmaxHydEcretee = PmaxHydUplift;
}

// The generating power allowance cannot exceed the maximum available generating power
if (PmaxHydEcretee
Expand Down