From 150caab9b5329eda9af47506d78081a3391f1ac2 Mon Sep 17 00:00:00 2001 From: David Paul Jansen Date: Mon, 6 Jan 2025 12:16:56 +0100 Subject: [PATCH 1/2] uniform sim_settings for space boundaries --- .../bim2sim_energyplus/sim_settings.py | 11 ---------- .../bim2sim_teaser/sim_settings.py | 2 +- bim2sim/sim_settings.py | 22 +++---------------- 3 files changed, 4 insertions(+), 31 deletions(-) diff --git a/bim2sim/plugins/PluginEnergyPlus/bim2sim_energyplus/sim_settings.py b/bim2sim/plugins/PluginEnergyPlus/bim2sim_energyplus/sim_settings.py index f92920d431..569be704b9 100644 --- a/bim2sim/plugins/PluginEnergyPlus/bim2sim_energyplus/sim_settings.py +++ b/bim2sim/plugins/PluginEnergyPlus/bim2sim_energyplus/sim_settings.py @@ -140,17 +140,6 @@ class EnergyPlusSimSettings(BuildingSimSettings): multiple_choice=True, for_frontend=True ) - correct_space_boundaries = BooleanSetting( - default=True, - description='Apply geometric correction to space boundaries.', - for_frontend=True - ) - close_space_boundary_gaps = BooleanSetting( - default=True, - description='Close gaps in the set of space boundaries by adding ' - 'additional 2b space boundaries.', - for_frontend=True - ) add_natural_ventilation = BooleanSetting( default=True, description='Add natural ventilation to the building. Natural ' diff --git a/bim2sim/plugins/PluginTEASER/bim2sim_teaser/sim_settings.py b/bim2sim/plugins/PluginTEASER/bim2sim_teaser/sim_settings.py index b2d18cc9b3..7e337de4cc 100644 --- a/bim2sim/plugins/PluginTEASER/bim2sim_teaser/sim_settings.py +++ b/bim2sim/plugins/PluginTEASER/bim2sim_teaser/sim_settings.py @@ -104,4 +104,4 @@ class TEASERSimSettings(BuildingSimSettings): 'prepare_regression_tests.py script.', for_frontend=False, mandatory=False - ) \ No newline at end of file + ) diff --git a/bim2sim/sim_settings.py b/bim2sim/sim_settings.py index c671e9dddc..96a5ae2179 100644 --- a/bim2sim/sim_settings.py +++ b/bim2sim/sim_settings.py @@ -520,23 +520,6 @@ def check_mandatory(self): for_frontend=True, mandatory=True ) - add_space_boundaries = BooleanSetting( - default=False, - description='Add space boundaries. Only required for building ' - 'performance simulation and co-simulations.', - for_frontend=True - ) - correct_space_boundaries = BooleanSetting( - default=False, - description='Apply geometric correction to space boundaries.', - for_frontend=True - ) - close_space_boundary_gaps = BooleanSetting( - default=False, - description='Close gaps in the set of space boundaries by adding ' - 'additional 2b space boundaries.', - for_frontend=True - ) class PlantSimSettings(BaseSimSettings): @@ -587,6 +570,7 @@ def __init__(self): default=True ) + class BuildingSimSettings(BaseSimSettings): def __init__(self): @@ -1008,7 +992,7 @@ def __init__(self): for_frontend=True ) correct_space_boundaries = BooleanSetting( - default=False, + default=True, description='Apply geometric correction to space boundaries.', for_frontend=True ) @@ -1030,7 +1014,7 @@ def __init__(self): for_frontend=True ) close_space_boundary_gaps = BooleanSetting( - default=False, + default=True, description='Close gaps in the set of space boundaries by adding ' 'additional 2b space boundaries.', for_frontend=True From 3cc5cb57d349010ff28bf671ddf993c4f7b0d6e3 Mon Sep 17 00:00:00 2001 From: David Paul Jansen Date: Thu, 15 May 2025 17:07:49 +0200 Subject: [PATCH 2/2] adjust teaser regression test to new default sim_settings As default values of sim_settings close_space_boundary_gaps and correct_space_boundaries changed to True, add explicit use of False for those settings for FZK Haus where SBs should be correct. --- bim2sim/plugins/PluginTEASER/test/regression/test_teaser.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bim2sim/plugins/PluginTEASER/test/regression/test_teaser.py b/bim2sim/plugins/PluginTEASER/test/regression/test_teaser.py index fa32283c7d..d27aab1bff 100644 --- a/bim2sim/plugins/PluginTEASER/test/regression/test_teaser.py +++ b/bim2sim/plugins/PluginTEASER/test/regression/test_teaser.py @@ -138,6 +138,8 @@ def test_run_kitfzkhaus(self): project.sim_settings.zoning_criteria = ( ZoningCriteria.combined_single_zone) project.sim_settings.ahu_tz_overwrite = False + project.sim_settings.close_space_boundary_gaps = False + project.sim_settings.correct_space_boundaries = False answers = () handler = DebugDecisionHandler(answers) for decision, answer in handler.decision_answer_mapping(project.run()):