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

Fix accurate remix hydro [ANT-1825] #2599

Open
wants to merge 68 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
cb98071
Save results for overflow
flomnes Aug 1, 2024
58aec04
Disable tests (windows)
flomnes Aug 1, 2024
fa1653a
Try boost fix
flomnes Aug 1, 2024
27aa0bd
Disable tests
flomnes Aug 1, 2024
2c96b63
Remove truncation
Aug 1, 2024
38473a4
Change overflow cost
Aug 1, 2024
b01a028
Change overflow cost
Aug 2, 2024
28999d9
Save results for overflow
flomnes Aug 1, 2024
a138d8b
Change overflow cost
Aug 1, 2024
39793d9
Change overflow cost
Aug 2, 2024
b050671
Fix infeasibility in H2O_J problem
flomnes Sep 11, 2024
ac97a13
Remove HydroLevelsUpdatePostProcessCmd, etc.
flomnes Sep 11, 2024
862c092
Add overflow cost
flomnes Sep 11, 2024
de425d1
SuiviNiveauHoraire = true
flomnes Sep 11, 2024
8c4508b
Remove unused class computeTimeStepLevel
flomnes Sep 11, 2024
53f4417
Merge remote-tracking branch 'github/develop' into fix/overflow
Sep 12, 2024
606fde2
Post-merge
Sep 12, 2024
dec51f4
Merge remote-tracking branch 'github/fix/overflow' into fix/overflow
Sep 12, 2024
c9848a8
Merge remote-tracking branch 'github/develop' into fix/overflow
Sep 12, 2024
ba54eed
Remove forgotten HydroLevelsUpdatePostProcessCmd
Sep 12, 2024
69d4ef7
Fix
Sep 12, 2024
792b1f6
Cout de remplissage
Sep 12, 2024
f04faf9
Counting
Sep 12, 2024
0f1e82b
Re-introduce computingHydroLevels, only for scaling
Sep 12, 2024
4245407
CoutDeRemplissage
Sep 12, 2024
0b08645
Fix
flomnes Sep 13, 2024
6398513
Merge remote-tracking branch 'github/develop' into fix/overflow
flomnes Sep 13, 2024
53bdf5f
Disable some tests
flomnes Sep 13, 2024
a67c089
Add reset for levelCost
flomnes Sep 16, 2024
4189a3e
Add load for levelCost
flomnes Sep 16, 2024
1d00468
Merge remote-tracking branch 'origin/develop' into HEAD
flomnes Jan 13, 2025
3808849
Fix build
flomnes Jan 13, 2025
b99e64b
Remove truncation
Juliette-Gerbaux Jan 14, 2025
045774a
Add logs
Jan 14, 2025
8116596
Edit logs
Jan 14, 2025
fa0b208
Edit logs
Jan 15, 2025
8c0da95
Change rhs hydro constraint
Jan 22, 2025
ae5e81a
Add efficiency and reservoir management
Jan 23, 2025
2944608
Increase tolerance
Jan 23, 2025
924d0e4
Time remix hydro
Jan 24, 2025
a8ef58c
Improve naming, fix unit tests, clean up
flomnes Feb 4, 2025
fef62a7
Merge remote-tracking branch 'github/develop' into fix/logs-accurate-…
flomnes Feb 4, 2025
6035dfc
Clean up logs
flomnes Feb 4, 2025
52b4fe1
Fix &&
flomnes Feb 4, 2025
0b59f8d
Use std::tie
flomnes Feb 4, 2025
746da9e
Remove a few HydroLevelsUpdatePostProcessCmd/computingHydroLevels
flomnes Feb 4, 2025
4d7fca1
Hard code a parameter, rename another
flomnes Feb 4, 2025
a891978
Partial revert
flomnes Feb 4, 2025
c535981
Partial revert
flomnes Feb 4, 2025
473e1c1
Enable tests
flomnes Feb 4, 2025
da3297f
Fix
flomnes Feb 4, 2025
4409fbf
Review
flomnes Feb 4, 2025
f5283ff
Remove scaling of levels
flomnes Feb 4, 2025
01f9f8d
Remove useless
flomnes Feb 4, 2025
f7db09b
Remove std::vector containing a constant data
flomnes Feb 11, 2025
c162753
Merge remote-tracking branch 'github/develop' into fix/logs-accurate-…
flomnes Feb 11, 2025
d353b6c
Update migration guide & such
flomnes Feb 11, 2025
9ecbf61
use constexpr
flomnes Feb 11, 2025
397a606
Update existing tests
flomnes Feb 11, 2025
e2cf5ea
Review, minor improvements
flomnes Feb 18, 2025
cd2a5e0
changelog
flomnes Feb 18, 2025
926b264
Merge branch 'develop' into fix/logs-accurate-remix-hydro
JasonMarechal25 Feb 19, 2025
ab57685
Use std::span
flomnes Feb 20, 2025
8ccec91
Merge branch 'develop' into fix/logs-accurate-remix-hydro
JasonMarechal25 Feb 20, 2025
e5af225
Increase coverage on hydro common data (hydro.ini) [ANT-1825] (#2634)
flomnes Feb 21, 2025
c41320e
H. LEV in %
flomnes Feb 21, 2025
9382c3b
Level - Capacity
flomnes Feb 21, 2025
752e62f
Conversion
flomnes Feb 21, 2025
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
Prev Previous commit
Next Next commit
Cout de remplissage
OMNES Florian committed Sep 12, 2024
commit 792b1f6a80e36527dabd45b2eb09e3381b4d97a3
Original file line number Diff line number Diff line change
@@ -225,6 +225,7 @@ class PartHydro
std::vector<std::optional<double>> deltaBetweenFinalAndInitialLevels;

double overflowCost = 0.;
double levelCost = 0.;

private:
static bool checkReservoirLevels(const Study& study);
8 changes: 7 additions & 1 deletion src/libs/antares/study/parts/hydro/container.cpp
Original file line number Diff line number Diff line change
@@ -509,6 +509,7 @@ bool PartHydro::SaveToFolder(const AreaList& areas, const AnyString& folder)
IniFile::Section* sLeewayUp;
IniFile::Section* spumpingEfficiency;
IniFile::Section* sOverflowCost;
IniFile::Section* sLevelCost;

AllSections(IniFile& ini):
s(ini.addSection("inter-daily-breakdown")),
@@ -526,7 +527,8 @@ bool PartHydro::SaveToFolder(const AreaList& areas, const AnyString& folder)
sLeewayLow(ini.addSection("leeway low")),
sLeewayUp(ini.addSection("leeway up")),
spumpingEfficiency(ini.addSection("pumping efficiency")),
sOverflowCost(ini.addSection("overflow cost"))
sOverflowCost(ini.addSection("overflow cost")),
sLevelCost(ini.addSection("level cost"))
{
}
};
@@ -586,6 +588,10 @@ bool PartHydro::SaveToFolder(const AreaList& areas, const AnyString& folder)
{
allSections.sOverflowCost->add(area.id, area.hydro.overflowCost);
}
if (area.hydro.levelCost)
{
allSections.sLevelCost->add(area.id, area.hydro.overflowCost);
}

// max hours gen
buffer.clear() << folder << SEP << "common" << SEP << "capacity" << SEP
Original file line number Diff line number Diff line change
@@ -429,6 +429,7 @@ struct PROBLEME_HEBDO
std::vector<double> CoutDeDefaillanceEnReserve;

std::vector<double> CoutDeDebordement;
std::vector<double> CoutDeRemplissage;

std::vector<PALIERS_THERMIQUES> PaliersThermiquesDuPays;
std::vector<ENERGIES_ET_PUISSANCES_HYDRAULIQUES> CaracteristiquesHydrauliques;
1 change: 1 addition & 0 deletions src/solver/simulation/sim_alloc_probleme_hebdo.cpp
Original file line number Diff line number Diff line change
@@ -87,6 +87,7 @@ void SIM_AllocationProblemeDonneesGenerales(PROBLEME_HEBDO& problem,
problem.CoutDeDefaillanceEnReserve.assign(nbPays, 0);

problem.CoutDeDebordement.assign(nbPays, 0);
problem.CoutDeRemplissage.assign(nbPays, 0);

problem.NumeroDeContrainteEnergieHydraulique.assign(nbPays, 0);
problem.NumeroDeContrainteMinEnergieHydraulique.assign(nbPays, 0);
1 change: 1 addition & 0 deletions src/solver/simulation/sim_calcul_economique.cpp
Original file line number Diff line number Diff line change
@@ -153,6 +153,7 @@ void SIM_InitialisationProblemeHebdo(Data::Study& study,
problem.CoutDeDefaillanceNegative[i] = area.thermal.spilledEnergyCost;

problem.CoutDeDebordement[i] = area.hydro.overflowCost;
problem.CoutDeRemplissage[i] = area.hydro.levelCost;

problem.CoutDeDefaillanceEnReserve[i] = area.thermal.unsuppliedEnergyCost;