Skip to content

Commit

Permalink
[DEV] const int nbpdt
Browse files Browse the repository at this point in the history
  • Loading branch information
payetvin committed Sep 18, 2023
1 parent 38cf1fd commit 6d2bc64
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void H2O_J_InitialiserLesBornesdesVariables(DONNEES_MENSUELLES* DonneesMensuelle

PROBLEME_HYDRAULIQUE& ProblemeHydraulique = DonneesMensuelles->ProblemeHydraulique;

int NbPdt = ProblemeHydraulique.NbJoursDUnProbleme[NumeroDeProbleme];
const int NbPdt = ProblemeHydraulique.NbJoursDUnProbleme[NumeroDeProbleme];

const CORRESPONDANCE_DES_VARIABLES& CorrespondanceDesVariables
= ProblemeHydraulique.CorrespondanceDesVariables[NumeroDeProbleme];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ void H2O_J_InitialiserLeSecondMembre(DONNEES_MENSUELLES* DonneesMensuelles, int

SecondMembre[NumeroDeContrainteDEnergieMensuelle] = DonneesMensuelles->TurbineDuMois;

int NbPdt = ProblemeHydraulique.NbJoursDUnProbleme[NumeroDeProbleme];
const int NbPdt = ProblemeHydraulique.NbJoursDUnProbleme[NumeroDeProbleme];
for (int Pdt = 0; Pdt < NbPdt; Pdt++)
{
int Cnt = CorrespondanceDesContraintes.NumeroDeContrainteSurXi[Pdt];
Expand Down
2 changes: 1 addition & 1 deletion src/solver/hydro/daily/h2o_j_instanciation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ DONNEES_MENSUELLES* H2O_J_Instanciation(void)

for (int i = 0; i < NombreDeProblemes; i++)
{
int NbPdt = NbJoursDUnProbleme[i];
const int NbPdt = NbJoursDUnProbleme[i];

CorrespondanceDesVariables[i].NumeroDeVariableTurbine.assign(NbPdt, 0);
CorrespondanceDesContraintes[i].NumeroDeContrainteSurXi.assign(NbPdt, 0);
Expand Down
2 changes: 1 addition & 1 deletion src/solver/hydro/daily/h2o_j_lisser_les_sur_turbines.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ void H2O_J_LisserLesSurTurbines(DONNEES_MENSUELLES* DonneesMensuelles, int Numer

char* Flag = (char*) ProblemeHydraulique.ProblemeLineairePartieVariable[NumeroDeProbleme].Xmax.data();

int NbPdt = ProblemeHydraulique.NbJoursDUnProbleme[NumeroDeProbleme];
const int NbPdt = ProblemeHydraulique.NbJoursDUnProbleme[NumeroDeProbleme];

double SurTurbineARepartir = 0.0;
for (int Pdt = 0; Pdt < NbPdt; Pdt++)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void H2O_M_ConstruireLesContraintes(DONNEES_ANNUELLES& DonneesAnnuelles)
int NumeroDeLaVariableXi = CorrespondanceDesVariables.NumeroDeLaVariableXi;

double ChgmtSens = -1.0;
int NbPdt = DonneesAnnuelles.NombreDePasDeTemps;
const int NbPdt = DonneesAnnuelles.NombreDePasDeTemps;
int NombreDeContraintes = 0;
int il = 0;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void H2O_M_ConstruireLesVariables(DONNEES_ANNUELLES& DonneesAnnuelles)
CORRESPONDANCE_DES_VARIABLES& CorrespondanceDesVariables
= ProblemeHydraulique.CorrespondanceDesVariables;

int NbPdt = DonneesAnnuelles.NombreDePasDeTemps;
const int NbPdt = DonneesAnnuelles.NombreDePasDeTemps;
int Var = 0;

CorrespondanceDesVariables.NumeroDeVariableVolume[0] = Var;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ void H2O_M_InitialiserBornesEtCoutsDesVariables(DONNEES_ANNUELLES& DonneesAnnuel

DonneesAnnuelles.Volume[0] = DonneesAnnuelles.VolumeInitial;

int NbPdt = DonneesAnnuelles.NombreDePasDeTemps;
const int NbPdt = DonneesAnnuelles.NombreDePasDeTemps;
double CoutDepassementVolume = DonneesAnnuelles.CoutDepassementVolume;
auto& TurbineMax = DonneesAnnuelles.TurbineMax;
const auto& TurbineMin = DonneesAnnuelles.TurbineMin;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ void H2O_M_InitialiserLeSecondMembre(DONNEES_ANNUELLES& DonneesAnnuelles)
= ProblemeHydraulique.ProblemeLineairePartieVariable;

double ChgmtSens = -1;
int NbPdt = DonneesAnnuelles.NombreDePasDeTemps;
const int NbPdt = DonneesAnnuelles.NombreDePasDeTemps;
int Cnt = 0;

auto& TurbineCible = DonneesAnnuelles.TurbineCible;
Expand Down
2 changes: 1 addition & 1 deletion src/solver/hydro/monthly/h2o_m_instanciation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ DONNEES_ANNUELLES H2O_M_Instanciation(int NombreDeReservoirs)
DONNEES_ANNUELLES DonneesAnnuelles{};

DonneesAnnuelles.NombreDePasDeTemps = 12;
int NbPdt = DonneesAnnuelles.NombreDePasDeTemps;
const int NbPdt = DonneesAnnuelles.NombreDePasDeTemps;

DonneesAnnuelles.TurbineMax.assign(NbPdt, 0.);
DonneesAnnuelles.TurbineMin.assign(NbPdt, 0.);
Expand Down

0 comments on commit 6d2bc64

Please sign in to comment.