From 06b2394aaa5a06e88bc6c96c82050341542f5a1b Mon Sep 17 00:00:00 2001 From: Jimmy Tung Date: Wed, 5 Feb 2025 09:48:12 +1100 Subject: [PATCH 1/2] update work_package and eas_client to incorporate default load profile for hosting capacity studies. Signed-off-by: Jimmy Tung --- changelog.md | 6 +++++- src/zepben/eas/client/eas_client.py | 4 ++++ src/zepben/eas/client/work_package.py | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 70cb86e..c3fa4cd 100644 --- a/changelog.md +++ b/changelog.md @@ -4,7 +4,11 @@ * None. ### New Features -* None. +* Update `ModelConfig` to contain four optional list of values which makes up the default load profile for hosting capacity model generation. + * `default_load_watts` Note: expects same size list of values as `default_load_var` + * `default_gen_watts` Note: expects same size list of values as `default_gen_var` + * `default_load_var` + * `default_gen_var` ### Enhancements * None. diff --git a/src/zepben/eas/client/eas_client.py b/src/zepben/eas/client/eas_client.py index 003b0e7..d0bbabf 100644 --- a/src/zepben/eas/client/eas_client.py +++ b/src/zepben/eas/client/eas_client.py @@ -258,6 +258,10 @@ async def async_run_hosting_capacity_work_package(self, work_package: WorkPackag "energyConsumerMeterGroup": work_package.generator_config.model.meter_placement_config.energy_consumer_meter_group } if work_package.generator_config.model.meter_placement_config is not None else None, "seed": work_package.generator_config.model.seed, + "defaultLoadWatts" : work_package.generator_config.model.default_load_watts, + "defaultGenWatts" : work_package.generator_config.model.default_gen_watts, + "defaultLoadVar" : work_package.generator_config.model.default_load_var, + "defaultGenVar" : work_package.generator_config.model.default_gen_var } if work_package.generator_config.model is not None else None, "solve": { "normVMinPu": work_package.generator_config.solve.norm_vmin_pu, diff --git a/src/zepben/eas/client/work_package.py b/src/zepben/eas/client/work_package.py index 10a04c1..2d3e221 100644 --- a/src/zepben/eas/client/work_package.py +++ b/src/zepben/eas/client/work_package.py @@ -135,6 +135,10 @@ class ModelConfig: load_interval_length_hours: Optional[float] = None meter_placement_config: Optional[MeterPlacementConfig] = None seed: Optional[int] = None + default_load_watts: Optional[float] = None + default_gen_watts: Optional[float] = None + default_load_var: Optional[float] = None + default_gen_var: Optional[float] = None class SolveMode(Enum): From 2d740d87bb82bf6870605bfd56349721c6439e21 Mon Sep 17 00:00:00 2001 From: Jimmy Tung Date: Fri, 7 Feb 2025 09:38:39 +1100 Subject: [PATCH 2/2] Fix typing error. Signed-off-by: Jimmy Tung --- src/zepben/eas/client/work_package.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/zepben/eas/client/work_package.py b/src/zepben/eas/client/work_package.py index 2d3e221..a6970d8 100644 --- a/src/zepben/eas/client/work_package.py +++ b/src/zepben/eas/client/work_package.py @@ -135,10 +135,10 @@ class ModelConfig: load_interval_length_hours: Optional[float] = None meter_placement_config: Optional[MeterPlacementConfig] = None seed: Optional[int] = None - default_load_watts: Optional[float] = None - default_gen_watts: Optional[float] = None - default_load_var: Optional[float] = None - default_gen_var: Optional[float] = None + default_load_watts: Optional[List[float]] = None + default_gen_watts: Optional[List[float]] = None + default_load_var: Optional[List[float]] = None + default_gen_var: Optional[List[float]] = None class SolveMode(Enum):