From 66e2deb298a5f4cbde0787af0511aa1d85d0a981 Mon Sep 17 00:00:00 2001 From: guilpier-code <62292552+guilpier-code@users.noreply.github.com> Date: Thu, 13 Jun 2024 13:15:10 +0200 Subject: [PATCH] fix existing studies : correction and update to v9.1.0 (#23) --- .../Desktop.ini | 2 +- .../bindingconstraints/bc-on-prod-1_eq.txt | 2 +- .../bindingconstraints/bc-on-prod-2_eq.txt | 2 +- .../bindingconstraints/bc-on-prod_lt.txt | 2 +- .../bindingconstraints/bindingconstraints.ini | 18 +- .../capacity/maxDailyGenEnergy_load-only.txt | 365 ++++++++++++++++++ .../capacity/maxDailyGenEnergy_th-prod-1.txt | 365 ++++++++++++++++++ .../capacity/maxDailyGenEnergy_th-prod-2.txt | 365 ++++++++++++++++++ .../capacity/maxDailyGenEnergy_th-prod.txt | 365 ++++++++++++++++++ .../capacity/maxDailyPumpEnergy_load-only.txt | 365 ++++++++++++++++++ .../capacity/maxDailyPumpEnergy_th-prod-1.txt | 365 ++++++++++++++++++ .../capacity/maxDailyPumpEnergy_th-prod-2.txt | 365 ++++++++++++++++++ .../capacity/maxDailyPumpEnergy_th-prod.txt | 365 ++++++++++++++++++ .../series/load-only/maxHourlyGenPower.txt | 0 .../series/load-only/maxHourlyPumpPower.txt | 0 .../series/th-prod-1/maxHourlyGenPower.txt | 0 .../series/th-prod-1/maxHourlyPumpPower.txt | 0 .../series/th-prod-2/maxHourlyGenPower.txt | 0 .../series/th-prod-2/maxHourlyPumpPower.txt | 0 .../series/th-prod/maxHourlyGenPower.txt | 0 .../series/th-prod/maxHourlyPumpPower.txt | 0 .../series/th-prod-1/cluster-1/CO2Cost.txt | 0 .../series/th-prod-1/cluster-1/fuelCost.txt | 0 .../series/th-prod-2/cluster-2/CO2Cost.txt | 0 .../series/th-prod-2/cluster-2/fuelCost.txt | 0 .../series/th-prod/cluster/CO2Cost.txt | 0 .../series/th-prod/cluster/fuelCost.txt | 0 .../settings/generaldata.ini | 4 +- .../settings/scenariobuilder.dat | 9 +- .../study.antares | 4 +- .../BC-rhs-scenario--simple-BCs/Desktop.ini | 2 +- .../bindingconstraints/bindingconstraints.ini | 24 +- .../capacity/maxDailyGenEnergy_area.txt | 365 ++++++++++++++++++ .../maxDailyGenEnergy_thermprod 3.txt | 365 ++++++++++++++++++ .../maxDailyGenEnergy_thermprod 4.txt | 365 ++++++++++++++++++ .../capacity/maxDailyPumpEnergy_area.txt | 365 ++++++++++++++++++ .../maxDailyPumpEnergy_thermprod 3.txt | 365 ++++++++++++++++++ .../maxDailyPumpEnergy_thermprod 4.txt | 365 ++++++++++++++++++ .../hydro/series/area/maxHourlyGenPower.txt | 0 .../hydro/series/area/maxHourlyPumpPower.txt | 0 .../series/thermprod 3/maxHourlyGenPower.txt | 0 .../series/thermprod 3/maxHourlyPumpPower.txt | 0 .../series/thermprod 4/maxHourlyGenPower.txt | 0 .../series/thermprod 4/maxHourlyPumpPower.txt | 0 .../thermal/series/area/cluster 1/CO2Cost.txt | 0 .../series/area/cluster 1/fuelCost.txt | 0 .../thermal/series/area/cluster 2/CO2Cost.txt | 0 .../series/area/cluster 2/fuelCost.txt | 0 .../series/thermprod 3/cluster 3/CO2Cost.txt | 0 .../series/thermprod 3/cluster 3/fuelCost.txt | 0 .../series/thermprod 4/cluster 4/CO2Cost.txt | 0 .../series/thermprod 4/cluster 4/fuelCost.txt | 0 .../settings/generaldata.ini | 4 +- .../settings/scenariobuilder.dat | 9 +- .../BC-rhs-scenario--simple-BCs/study.antares | 4 +- 55 files changed, 5154 insertions(+), 42 deletions(-) create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyGenEnergy_load-only.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyGenEnergy_th-prod-1.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyGenEnergy_th-prod-2.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyGenEnergy_th-prod.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_load-only.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_th-prod-1.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_th-prod-2.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_th-prod.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/load-only/maxHourlyGenPower.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/load-only/maxHourlyPumpPower.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/th-prod-1/maxHourlyGenPower.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/th-prod-1/maxHourlyPumpPower.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/th-prod-2/maxHourlyGenPower.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/th-prod-2/maxHourlyPumpPower.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/th-prod/maxHourlyGenPower.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/th-prod/maxHourlyPumpPower.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/thermal/series/th-prod-1/cluster-1/CO2Cost.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/thermal/series/th-prod-1/cluster-1/fuelCost.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/thermal/series/th-prod-2/cluster-2/CO2Cost.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/thermal/series/th-prod-2/cluster-2/fuelCost.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/thermal/series/th-prod/cluster/CO2Cost.txt create mode 100644 valid-v870/BC-rhs-scenario--more-complex-BCs/input/thermal/series/th-prod/cluster/fuelCost.txt create mode 100644 valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyGenEnergy_area.txt create mode 100644 valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyGenEnergy_thermprod 3.txt create mode 100644 valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyGenEnergy_thermprod 4.txt create mode 100644 valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_area.txt create mode 100644 valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_thermprod 3.txt create mode 100644 valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_thermprod 4.txt create mode 100644 valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/series/area/maxHourlyGenPower.txt create mode 100644 valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/series/area/maxHourlyPumpPower.txt create mode 100644 valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/series/thermprod 3/maxHourlyGenPower.txt create mode 100644 valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/series/thermprod 3/maxHourlyPumpPower.txt create mode 100644 valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/series/thermprod 4/maxHourlyGenPower.txt create mode 100644 valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/series/thermprod 4/maxHourlyPumpPower.txt create mode 100644 valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/area/cluster 1/CO2Cost.txt create mode 100644 valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/area/cluster 1/fuelCost.txt create mode 100644 valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/area/cluster 2/CO2Cost.txt create mode 100644 valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/area/cluster 2/fuelCost.txt create mode 100644 valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/thermprod 3/cluster 3/CO2Cost.txt create mode 100644 valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/thermprod 3/cluster 3/fuelCost.txt create mode 100644 valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/thermprod 4/cluster 4/CO2Cost.txt create mode 100644 valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/thermprod 4/cluster 4/fuelCost.txt diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/Desktop.ini b/valid-v870/BC-rhs-scenario--more-complex-BCs/Desktop.ini index 81b5076a..bc8b63e3 100644 --- a/valid-v870/BC-rhs-scenario--more-complex-BCs/Desktop.ini +++ b/valid-v870/BC-rhs-scenario--more-complex-BCs/Desktop.ini @@ -1,4 +1,4 @@ [.shellclassinfo] iconfile = settings/resources/study.ico iconindex = 0 -infotip = Antares Study8.7: BC-rhs-scenario--more-complex-BCs +infotip = Antares Study9.1: BC-rhs-scenario--more-complex-BCs diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/bindingconstraints/bc-on-prod-1_eq.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/bindingconstraints/bc-on-prod-1_eq.txt index 4e863896..9766ba4a 100644 --- a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/bindingconstraints/bc-on-prod-1_eq.txt +++ b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/bindingconstraints/bc-on-prod-1_eq.txt @@ -8781,4 +8781,4 @@ 0 0 0 0 0 0 -0 0 \ No newline at end of file +0 0 diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/bindingconstraints/bc-on-prod-2_eq.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/bindingconstraints/bc-on-prod-2_eq.txt index ad324560..85c6dc33 100644 --- a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/bindingconstraints/bc-on-prod-2_eq.txt +++ b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/bindingconstraints/bc-on-prod-2_eq.txt @@ -8781,4 +8781,4 @@ 0 0 0 0 0 0 -0 0 \ No newline at end of file +0 0 diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/bindingconstraints/bc-on-prod_lt.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/bindingconstraints/bc-on-prod_lt.txt index 61ec60b3..b8a675d7 100644 --- a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/bindingconstraints/bc-on-prod_lt.txt +++ b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/bindingconstraints/bc-on-prod_lt.txt @@ -8781,4 +8781,4 @@ 0 0 0 0 0 0 -0 0 \ No newline at end of file +0 0 diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/bindingconstraints/bindingconstraints.ini b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/bindingconstraints/bindingconstraints.ini index 96122363..e4ee689d 100644 --- a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/bindingconstraints/bindingconstraints.ini +++ b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/bindingconstraints/bindingconstraints.ini @@ -4,10 +4,10 @@ id = bc-on-prod enabled = true type = hourly operator = less -filter-year-by-year = -filter-synthesis = -th-prod.cluster = 1.000000 +filter-year-by-year = hourly, daily, weekly, monthly, annual +filter-synthesis = hourly, daily, weekly, monthly, annual group = limit-prod +th-prod.cluster = 1.000000 [1] name = BC-on-prod-1 @@ -15,11 +15,11 @@ id = bc-on-prod-1 enabled = true type = hourly operator = equal -filter-year-by-year = -filter-synthesis = +filter-year-by-year = hourly, daily, weekly, monthly, annual +filter-synthesis = hourly, daily, weekly, monthly, annual +group = mix-prod-and-flow load-only%th-prod-1 = 1.000000 th-prod-1.cluster-1 = 1.000000 -group = mix-prod-and-flow [2] name = BC-on-prod-2 @@ -27,9 +27,9 @@ id = bc-on-prod-2 enabled = true type = hourly operator = equal -filter-year-by-year = -filter-synthesis = +filter-year-by-year = hourly, daily, weekly, monthly, annual +filter-synthesis = hourly, daily, weekly, monthly, annual +group = mix-prod-and-flow load-only%th-prod-2 = 1.000000 th-prod-2.cluster-2 = 1.000000 -group = mix-prod-and-flow diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyGenEnergy_load-only.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyGenEnergy_load-only.txt new file mode 100644 index 00000000..3178d1da --- /dev/null +++ b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyGenEnergy_load-only.txt @@ -0,0 +1,365 @@ +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyGenEnergy_th-prod-1.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyGenEnergy_th-prod-1.txt new file mode 100644 index 00000000..3178d1da --- /dev/null +++ b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyGenEnergy_th-prod-1.txt @@ -0,0 +1,365 @@ +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyGenEnergy_th-prod-2.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyGenEnergy_th-prod-2.txt new file mode 100644 index 00000000..3178d1da --- /dev/null +++ b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyGenEnergy_th-prod-2.txt @@ -0,0 +1,365 @@ +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyGenEnergy_th-prod.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyGenEnergy_th-prod.txt new file mode 100644 index 00000000..3178d1da --- /dev/null +++ b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyGenEnergy_th-prod.txt @@ -0,0 +1,365 @@ +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_load-only.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_load-only.txt new file mode 100644 index 00000000..3178d1da --- /dev/null +++ b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_load-only.txt @@ -0,0 +1,365 @@ +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_th-prod-1.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_th-prod-1.txt new file mode 100644 index 00000000..3178d1da --- /dev/null +++ b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_th-prod-1.txt @@ -0,0 +1,365 @@ +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_th-prod-2.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_th-prod-2.txt new file mode 100644 index 00000000..3178d1da --- /dev/null +++ b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_th-prod-2.txt @@ -0,0 +1,365 @@ +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_th-prod.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_th-prod.txt new file mode 100644 index 00000000..3178d1da --- /dev/null +++ b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_th-prod.txt @@ -0,0 +1,365 @@ +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/load-only/maxHourlyGenPower.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/load-only/maxHourlyGenPower.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/load-only/maxHourlyPumpPower.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/load-only/maxHourlyPumpPower.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/th-prod-1/maxHourlyGenPower.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/th-prod-1/maxHourlyGenPower.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/th-prod-1/maxHourlyPumpPower.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/th-prod-1/maxHourlyPumpPower.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/th-prod-2/maxHourlyGenPower.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/th-prod-2/maxHourlyGenPower.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/th-prod-2/maxHourlyPumpPower.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/th-prod-2/maxHourlyPumpPower.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/th-prod/maxHourlyGenPower.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/th-prod/maxHourlyGenPower.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/th-prod/maxHourlyPumpPower.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/hydro/series/th-prod/maxHourlyPumpPower.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/thermal/series/th-prod-1/cluster-1/CO2Cost.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/thermal/series/th-prod-1/cluster-1/CO2Cost.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/thermal/series/th-prod-1/cluster-1/fuelCost.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/thermal/series/th-prod-1/cluster-1/fuelCost.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/thermal/series/th-prod-2/cluster-2/CO2Cost.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/thermal/series/th-prod-2/cluster-2/CO2Cost.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/thermal/series/th-prod-2/cluster-2/fuelCost.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/thermal/series/th-prod-2/cluster-2/fuelCost.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/thermal/series/th-prod/cluster/CO2Cost.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/thermal/series/th-prod/cluster/CO2Cost.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/input/thermal/series/th-prod/cluster/fuelCost.txt b/valid-v870/BC-rhs-scenario--more-complex-BCs/input/thermal/series/th-prod/cluster/fuelCost.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/settings/generaldata.ini b/valid-v870/BC-rhs-scenario--more-complex-BCs/settings/generaldata.ini index 10455f7c..c9a11544 100644 --- a/valid-v870/BC-rhs-scenario--more-complex-BCs/settings/generaldata.ini +++ b/valid-v870/BC-rhs-scenario--more-complex-BCs/settings/generaldata.ini @@ -35,7 +35,7 @@ readonly = false import = [output] -synthesis = false +synthesis = true storenewset = false archives = result-format = txt-files @@ -54,6 +54,7 @@ include-primaryreserve = true include-exportmps = none include-exportstructure = false include-unfeasible-problem-behavior = error-verbose +solver-logs = false [adequacy patch] include-adq-patch = false @@ -82,6 +83,7 @@ accuracy-on-correlation = [variables selection] selected_vars_reset = false select_var + = BALANCE +select_var + = BC. MARG. COST select_var + = COAL select_var + = DTG BY PLANT select_var + = FLOW LIN. diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/settings/scenariobuilder.dat b/valid-v870/BC-rhs-scenario--more-complex-BCs/settings/scenariobuilder.dat index b6371b4d..a59cc542 100644 --- a/valid-v870/BC-rhs-scenario--more-complex-BCs/settings/scenariobuilder.dat +++ b/valid-v870/BC-rhs-scenario--more-complex-BCs/settings/scenariobuilder.dat @@ -1,7 +1,6 @@ [Default Ruleset] -bc,limit-prod,0 = 1 -bc,limit-prod,1 = 2 -bc,mix-prod-and-flow,0 = 1 -bc,mix-prod-and-flow,1 = 2 - +bc,limit-prod,0=1 +bc,limit-prod,1=2 +bc,mix-prod-and-flow,0=1 +bc,mix-prod-and-flow,1=2 diff --git a/valid-v870/BC-rhs-scenario--more-complex-BCs/study.antares b/valid-v870/BC-rhs-scenario--more-complex-BCs/study.antares index 21adf3fb..eeae9a32 100644 --- a/valid-v870/BC-rhs-scenario--more-complex-BCs/study.antares +++ b/valid-v870/BC-rhs-scenario--more-complex-BCs/study.antares @@ -1,7 +1,7 @@ [antares] -version = 870 +version = 9.1 caption = BC-rhs-scenario--more-complex-BCs created = 1689238081 -lastsave = 1689240393 +lastsave = 1716904537 author = Unknown diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/Desktop.ini b/valid-v870/BC-rhs-scenario--simple-BCs/Desktop.ini index d9d47b7a..fcea2b1f 100644 --- a/valid-v870/BC-rhs-scenario--simple-BCs/Desktop.ini +++ b/valid-v870/BC-rhs-scenario--simple-BCs/Desktop.ini @@ -1,4 +1,4 @@ [.shellclassinfo] iconfile = settings/resources/study.ico iconindex = 0 -infotip = Antares Study8.7: BC-rhs-scenario--simple-BCs +infotip = Antares Study9.1: BC-rhs-scenario--simple-BCs diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/bindingconstraints/bindingconstraints.ini b/valid-v870/BC-rhs-scenario--simple-BCs/input/bindingconstraints/bindingconstraints.ini index 6fe55094..bba19400 100644 --- a/valid-v870/BC-rhs-scenario--simple-BCs/input/bindingconstraints/bindingconstraints.ini +++ b/valid-v870/BC-rhs-scenario--simple-BCs/input/bindingconstraints/bindingconstraints.ini @@ -4,10 +4,10 @@ id = limit-ntc-1 enabled = true type = hourly operator = less -filter-year-by-year = -filter-synthesis = -area%thermprod 3 = -1.000000 +filter-year-by-year = hourly, daily, weekly, monthly, annual +filter-synthesis = hourly, daily, weekly, monthly, annual group = limit-ntc +area%thermprod 3 = -1.000000 [1] name = limit-ntc-2 @@ -15,10 +15,10 @@ id = limit-ntc-2 enabled = true type = hourly operator = less -filter-year-by-year = -filter-synthesis = -area%thermprod 4 = -1.000000 +filter-year-by-year = hourly, daily, weekly, monthly, annual +filter-synthesis = hourly, daily, weekly, monthly, annual group = limit-ntc +area%thermprod 4 = -1.000000 [2] name = limit-thermal-1 @@ -26,10 +26,10 @@ id = limit-thermal-1 enabled = true type = hourly operator = less -filter-year-by-year = -filter-synthesis = -area.cluster 1 = 1.000000 +filter-year-by-year = hourly, daily, weekly, monthly, annual +filter-synthesis = hourly, daily, weekly, monthly, annual group = limit-prod +area.cluster 1 = 1.000000 [3] name = limit-thermal-2 @@ -37,8 +37,8 @@ id = limit-thermal-2 enabled = true type = hourly operator = less -filter-year-by-year = -filter-synthesis = -area.cluster 2 = 1.000000 +filter-year-by-year = hourly, daily, weekly, monthly, annual +filter-synthesis = hourly, daily, weekly, monthly, annual group = limit-prod +area.cluster 2 = 1.000000 diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyGenEnergy_area.txt b/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyGenEnergy_area.txt new file mode 100644 index 00000000..3178d1da --- /dev/null +++ b/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyGenEnergy_area.txt @@ -0,0 +1,365 @@ +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyGenEnergy_thermprod 3.txt b/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyGenEnergy_thermprod 3.txt new file mode 100644 index 00000000..3178d1da --- /dev/null +++ b/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyGenEnergy_thermprod 3.txt @@ -0,0 +1,365 @@ +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyGenEnergy_thermprod 4.txt b/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyGenEnergy_thermprod 4.txt new file mode 100644 index 00000000..3178d1da --- /dev/null +++ b/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyGenEnergy_thermprod 4.txt @@ -0,0 +1,365 @@ +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_area.txt b/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_area.txt new file mode 100644 index 00000000..3178d1da --- /dev/null +++ b/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_area.txt @@ -0,0 +1,365 @@ +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_thermprod 3.txt b/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_thermprod 3.txt new file mode 100644 index 00000000..3178d1da --- /dev/null +++ b/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_thermprod 3.txt @@ -0,0 +1,365 @@ +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_thermprod 4.txt b/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_thermprod 4.txt new file mode 100644 index 00000000..3178d1da --- /dev/null +++ b/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/common/capacity/maxDailyPumpEnergy_thermprod 4.txt @@ -0,0 +1,365 @@ +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 +24 diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/series/area/maxHourlyGenPower.txt b/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/series/area/maxHourlyGenPower.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/series/area/maxHourlyPumpPower.txt b/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/series/area/maxHourlyPumpPower.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/series/thermprod 3/maxHourlyGenPower.txt b/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/series/thermprod 3/maxHourlyGenPower.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/series/thermprod 3/maxHourlyPumpPower.txt b/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/series/thermprod 3/maxHourlyPumpPower.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/series/thermprod 4/maxHourlyGenPower.txt b/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/series/thermprod 4/maxHourlyGenPower.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/series/thermprod 4/maxHourlyPumpPower.txt b/valid-v870/BC-rhs-scenario--simple-BCs/input/hydro/series/thermprod 4/maxHourlyPumpPower.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/area/cluster 1/CO2Cost.txt b/valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/area/cluster 1/CO2Cost.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/area/cluster 1/fuelCost.txt b/valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/area/cluster 1/fuelCost.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/area/cluster 2/CO2Cost.txt b/valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/area/cluster 2/CO2Cost.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/area/cluster 2/fuelCost.txt b/valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/area/cluster 2/fuelCost.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/thermprod 3/cluster 3/CO2Cost.txt b/valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/thermprod 3/cluster 3/CO2Cost.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/thermprod 3/cluster 3/fuelCost.txt b/valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/thermprod 3/cluster 3/fuelCost.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/thermprod 4/cluster 4/CO2Cost.txt b/valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/thermprod 4/cluster 4/CO2Cost.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/thermprod 4/cluster 4/fuelCost.txt b/valid-v870/BC-rhs-scenario--simple-BCs/input/thermal/series/thermprod 4/cluster 4/fuelCost.txt new file mode 100644 index 00000000..e69de29b diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/settings/generaldata.ini b/valid-v870/BC-rhs-scenario--simple-BCs/settings/generaldata.ini index 10455f7c..c9a11544 100644 --- a/valid-v870/BC-rhs-scenario--simple-BCs/settings/generaldata.ini +++ b/valid-v870/BC-rhs-scenario--simple-BCs/settings/generaldata.ini @@ -35,7 +35,7 @@ readonly = false import = [output] -synthesis = false +synthesis = true storenewset = false archives = result-format = txt-files @@ -54,6 +54,7 @@ include-primaryreserve = true include-exportmps = none include-exportstructure = false include-unfeasible-problem-behavior = error-verbose +solver-logs = false [adequacy patch] include-adq-patch = false @@ -82,6 +83,7 @@ accuracy-on-correlation = [variables selection] selected_vars_reset = false select_var + = BALANCE +select_var + = BC. MARG. COST select_var + = COAL select_var + = DTG BY PLANT select_var + = FLOW LIN. diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/settings/scenariobuilder.dat b/valid-v870/BC-rhs-scenario--simple-BCs/settings/scenariobuilder.dat index 85188ceb..23e9574a 100644 --- a/valid-v870/BC-rhs-scenario--simple-BCs/settings/scenariobuilder.dat +++ b/valid-v870/BC-rhs-scenario--simple-BCs/settings/scenariobuilder.dat @@ -1,7 +1,6 @@ [Default Ruleset] -bc,limit-prod,0 = 1 -bc,limit-prod,1 = 2 -bc,limit-ntc,0 = 1 -bc,limit-ntc,1 = 2 - +bc,limit-ntc,0=1 +bc,limit-ntc,1=2 +bc,limit-prod,0=1 +bc,limit-prod,1=2 diff --git a/valid-v870/BC-rhs-scenario--simple-BCs/study.antares b/valid-v870/BC-rhs-scenario--simple-BCs/study.antares index 83320d30..1b424cef 100644 --- a/valid-v870/BC-rhs-scenario--simple-BCs/study.antares +++ b/valid-v870/BC-rhs-scenario--simple-BCs/study.antares @@ -1,7 +1,7 @@ [antares] -version = 870 +version = 9.1 caption = BC-rhs-scenario--simple-BCs created = 1689077457 -lastsave = 1689092202 +lastsave = 1716902701 author = Unknown