From 16eeb327758c858c76bb2d6ccce234ca86d3e355 Mon Sep 17 00:00:00 2001 From: MartinBelthle <102529366+MartinBelthle@users.noreply.github.com> Date: Wed, 30 Aug 2023 15:54:58 +0200 Subject: [PATCH] fix(model): wrong frequency for `hydro energy credits` matrices (#1708) --- .../root/input/hydro/common/capacity/capacity.py | 2 +- .../root/input/hydro/common/capacity/test_capacity.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/common/capacity/capacity.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/common/capacity/capacity.py index b671c20d38..5d14550a39 100644 --- a/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/common/capacity/capacity.py +++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/common/capacity/capacity.py @@ -22,7 +22,7 @@ class MatrixInfo(TypedDict, total=False): MATRICES_INFO: List[MatrixInfo] = [ { "name": "maxpower", - "freq": MatrixFrequency.HOURLY, + "freq": MatrixFrequency.DAILY, "start_version": 0, }, { diff --git a/tests/storage/repository/filesystem/root/input/hydro/common/capacity/test_capacity.py b/tests/storage/repository/filesystem/root/input/hydro/common/capacity/test_capacity.py index 03599c4628..4a32f76897 100644 --- a/tests/storage/repository/filesystem/root/input/hydro/common/capacity/test_capacity.py +++ b/tests/storage/repository/filesystem/root/input/hydro/common/capacity/test_capacity.py @@ -25,8 +25,8 @@ # noinspection SpellCheckingInspection BEFORE_650 = { # fmt: off - "maxpower_en": {"default_empty": [[]], "freq": MatrixFrequency.HOURLY, "nb_columns": None}, - "maxpower_fr": {"default_empty": [[]], "freq": MatrixFrequency.HOURLY, "nb_columns": None}, + "maxpower_en": {"default_empty": [[]], "freq": MatrixFrequency.DAILY, "nb_columns": None}, + "maxpower_fr": {"default_empty": [[]], "freq": MatrixFrequency.DAILY, "nb_columns": None}, "reservoir_en": {"default_empty": [[]], "freq": MatrixFrequency.DAILY, "nb_columns": None}, "reservoir_fr": {"default_empty": [[]], "freq": MatrixFrequency.DAILY, "nb_columns": None}, # fmt: on @@ -39,8 +39,8 @@ "creditmodulations_fr": {"default_empty": [[]], "freq": MatrixFrequency.HOURLY, "nb_columns": None}, "inflowPattern_en": {"default_empty": [[]], "freq": MatrixFrequency.HOURLY, "nb_columns": None}, "inflowPattern_fr": {"default_empty": [[]], "freq": MatrixFrequency.HOURLY, "nb_columns": None}, - "maxpower_en": {"default_empty": [[]], "freq": MatrixFrequency.HOURLY, "nb_columns": None}, - "maxpower_fr": {"default_empty": [[]], "freq": MatrixFrequency.HOURLY, "nb_columns": None}, + "maxpower_en": {"default_empty": [[]], "freq": MatrixFrequency.DAILY, "nb_columns": None}, + "maxpower_fr": {"default_empty": [[]], "freq": MatrixFrequency.DAILY, "nb_columns": None}, "reservoir_en": {"default_empty": [[]], "freq": MatrixFrequency.DAILY, "nb_columns": None}, "reservoir_fr": {"default_empty": [[]], "freq": MatrixFrequency.DAILY, "nb_columns": None}, "waterValues_en": {"default_empty": [[]], "freq": MatrixFrequency.DAILY, "nb_columns": None},