From a941ae772846a78e896a2c81292150c9c510228d Mon Sep 17 00:00:00 2001 From: Joe Robertson Date: Fri, 19 Jul 2024 10:38:33 -0700 Subject: [PATCH] Remove unused eagle block from test yml files. --- .../yml_bad_value/testing_baseline.yml | 9 -- .../yml_downsampler/testing_baseline.yml | 9 -- .../yml_missing_key/testing_baseline.yml | 9 -- .../yml_precomputed/testing_baseline.yml | 9 -- .../testing_baseline_extra.yml | 10 --- .../testing_baseline_missing.yml | 10 --- .../testing_baseline.yml | 10 --- .../testing_baseline.yml | 10 --- .../yml_resample/testing_baseline.yml | 10 --- .../yml_valid/testing_baseline.yml | 10 --- .../yml_valid/testing_upgrades.yml | 87 +++++++++++++++++++ .../yml_weather_files/testing_baseline.yml | 10 --- 12 files changed, 87 insertions(+), 106 deletions(-) create mode 100644 test/tests_yml_files/yml_valid/testing_upgrades.yml diff --git a/test/tests_yml_files/yml_bad_value/testing_baseline.yml b/test/tests_yml_files/yml_bad_value/testing_baseline.yml index 440d994173..12f4d735c7 100644 --- a/test/tests_yml_files/yml_bad_value/testing_baseline.yml +++ b/test/tests_yml_files/yml_bad_value/testing_baseline.yml @@ -37,12 +37,3 @@ workflow_generator: baseline: n_buildings_represented: 110000000 -eagle: - n_jobs: 2 - minutes_per_sim: 1 - account: - sampling: - time: 10 - postprocessing: - time: 10 - n_workers: 1 diff --git a/test/tests_yml_files/yml_downsampler/testing_baseline.yml b/test/tests_yml_files/yml_downsampler/testing_baseline.yml index 6d102286a5..263b206ecd 100644 --- a/test/tests_yml_files/yml_downsampler/testing_baseline.yml +++ b/test/tests_yml_files/yml_downsampler/testing_baseline.yml @@ -38,12 +38,3 @@ workflow_generator: baseline: n_buildings_represented: 110000000 -eagle: - n_jobs: 2 - minutes_per_sim: 1 - account: - sampling: - time: 10 - postprocessing: - time: 10 - n_workers: 1 diff --git a/test/tests_yml_files/yml_missing_key/testing_baseline.yml b/test/tests_yml_files/yml_missing_key/testing_baseline.yml index 76d5ccc26d..84a888d7bc 100644 --- a/test/tests_yml_files/yml_missing_key/testing_baseline.yml +++ b/test/tests_yml_files/yml_missing_key/testing_baseline.yml @@ -30,12 +30,3 @@ workflow_generator: baseline: n_buildings_represented: 110000000 -eagle: - n_jobs: 2 - minutes_per_sim: 1 - account: - sampling: - time: 10 - postprocessing: - time: 10 - n_workers: 1 diff --git a/test/tests_yml_files/yml_precomputed/testing_baseline.yml b/test/tests_yml_files/yml_precomputed/testing_baseline.yml index 40d8b7231a..f9ceebf49b 100644 --- a/test/tests_yml_files/yml_precomputed/testing_baseline.yml +++ b/test/tests_yml_files/yml_precomputed/testing_baseline.yml @@ -37,12 +37,3 @@ workflow_generator: baseline: n_buildings_represented: 110000000 -eagle: - n_jobs: 2 - minutes_per_sim: 1 - account: - sampling: - time: 10 - postprocessing: - time: 10 - n_workers: 1 diff --git a/test/tests_yml_files/yml_precomputed_outdated/testing_baseline_extra.yml b/test/tests_yml_files/yml_precomputed_outdated/testing_baseline_extra.yml index 222c9583cc..24186d0416 100644 --- a/test/tests_yml_files/yml_precomputed_outdated/testing_baseline_extra.yml +++ b/test/tests_yml_files/yml_precomputed_outdated/testing_baseline_extra.yml @@ -36,13 +36,3 @@ workflow_generator: baseline: n_buildings_represented: 110000000 - -eagle: - n_jobs: 2 - minutes_per_sim: 1 - account: - sampling: - time: 10 - postprocessing: - time: 10 - n_workers: 1 diff --git a/test/tests_yml_files/yml_precomputed_outdated/testing_baseline_missing.yml b/test/tests_yml_files/yml_precomputed_outdated/testing_baseline_missing.yml index 92bd924b7c..8aa7163d33 100644 --- a/test/tests_yml_files/yml_precomputed_outdated/testing_baseline_missing.yml +++ b/test/tests_yml_files/yml_precomputed_outdated/testing_baseline_missing.yml @@ -36,13 +36,3 @@ workflow_generator: baseline: n_buildings_represented: 110000000 - -eagle: - n_jobs: 2 - minutes_per_sim: 1 - account: - sampling: - time: 10 - postprocessing: - time: 10 - n_workers: 1 diff --git a/test/tests_yml_files/yml_precomputed_weight/testing_baseline.yml b/test/tests_yml_files/yml_precomputed_weight/testing_baseline.yml index 40d8b7231a..51dae2e0f8 100644 --- a/test/tests_yml_files/yml_precomputed_weight/testing_baseline.yml +++ b/test/tests_yml_files/yml_precomputed_weight/testing_baseline.yml @@ -36,13 +36,3 @@ workflow_generator: baseline: n_buildings_represented: 110000000 - -eagle: - n_jobs: 2 - minutes_per_sim: 1 - account: - sampling: - time: 10 - postprocessing: - time: 10 - n_workers: 1 diff --git a/test/tests_yml_files/yml_relative_weather_path/testing_baseline.yml b/test/tests_yml_files/yml_relative_weather_path/testing_baseline.yml index 366449b77a..05c2bafb8a 100644 --- a/test/tests_yml_files/yml_relative_weather_path/testing_baseline.yml +++ b/test/tests_yml_files/yml_relative_weather_path/testing_baseline.yml @@ -36,13 +36,3 @@ workflow_generator: baseline: n_buildings_represented: 110000000 - -eagle: - n_jobs: 2 - minutes_per_sim: 1 - account: - sampling: - time: 10 - postprocessing: - time: 10 - n_workers: 1 diff --git a/test/tests_yml_files/yml_resample/testing_baseline.yml b/test/tests_yml_files/yml_resample/testing_baseline.yml index 4fe576c193..6c3d636fc3 100644 --- a/test/tests_yml_files/yml_resample/testing_baseline.yml +++ b/test/tests_yml_files/yml_resample/testing_baseline.yml @@ -37,13 +37,3 @@ workflow_generator: baseline: n_buildings_represented: 110000000 - -eagle: - n_jobs: 2 - minutes_per_sim: 1 - account: - sampling: - time: 10 - postprocessing: - time: 10 - n_workers: 1 diff --git a/test/tests_yml_files/yml_valid/testing_baseline.yml b/test/tests_yml_files/yml_valid/testing_baseline.yml index 1096f8d7ff..b30012bdc1 100644 --- a/test/tests_yml_files/yml_valid/testing_baseline.yml +++ b/test/tests_yml_files/yml_valid/testing_baseline.yml @@ -36,13 +36,3 @@ workflow_generator: baseline: n_buildings_represented: 110000000 - -eagle: - n_jobs: 2 - minutes_per_sim: 1 - account: - sampling: - time: 10 - postprocessing: - time: 10 - n_workers: 1 diff --git a/test/tests_yml_files/yml_valid/testing_upgrades.yml b/test/tests_yml_files/yml_valid/testing_upgrades.yml new file mode 100644 index 0000000000..343419d386 --- /dev/null +++ b/test/tests_yml_files/yml_valid/testing_upgrades.yml @@ -0,0 +1,87 @@ +schema_version: '0.3' +buildstock_directory: ../../../ # Relative to this file or absolute +project_directory: project_testing # Relative to buildstock_directory +output_directory: testing_upgrades +weather_files_url: https://data.nrel.gov/system/files/156/Buildstock_TMY3_FIPS-1678817889.zip +# weather_files_path: c:/OpenStudio/BuildStock_TMY3_FIPS.zip + +sampler: + type: residential_quota + args: + n_datapoints: 2 + +workflow_generator: + type: residential_hpxml + args: + build_existing_model: + simulation_control_timestep: 60 + simulation_control_run_period_begin_month: 1 + simulation_control_run_period_begin_day_of_month: 1 + simulation_control_run_period_end_month: 12 + simulation_control_run_period_end_day_of_month: 31 + simulation_control_run_period_calendar_year: 2007 + + simulation_output_report: + timeseries_frequency: hourly + include_timeseries_fuel_consumptions: true + include_timeseries_end_use_consumptions: true + include_timeseries_emissions: true + include_timeseries_total_loads: true + + reporting_measures: + - measure_dir_name: QOIReport + + server_directory_cleanup: + debug: true + +baseline: + n_buildings_represented: 110000000 + +upgrades: + - upgrade_name: Windows + options: + - &windows_triple_low_e_non_metal_l_gain + option: Windows|Triple, Low-E, Non-metal, Air, L-Gain + costs: + - value: 45.77 + multiplier: Window Area (ft^2) + lifetime: 30 + + - upgrade_name: Walls + options: + - &insulation_wall_wood_stud_r_13 + option: Insulation Wall|Wood Stud, R-13 + costs: + - value: 2.21 + multiplier: Wall Area, Above-Grade, Conditioned (ft^2) + lifetime: 999 + + - upgrade_name: Sheathing + options: + - &insulation_sheathing_r_5 + option: Insulation Sheathing|R-5 + costs: + - value: 2.01 + multiplier: Wall Area, Above-Grade, Conditioned (ft^2) + lifetime: 999 + + - upgrade_name: Foundation Type + package_apply_logic: + and: + - Geometry Foundation Type|Vented Crawlspace + - or: # Ensure that the dwelling unit being modeled is either (1) not in a multifamily building, or (2) on the bottom floor of a multifamily building and therefore above the crawlspace. + - Geometry Building Level MF|None + - Geometry Building Level MF|Bottom + options: + - &geometry_foundation_type_unvented_crawlspace + option: Geometry Foundation Type|Unvented Crawlspace + costs: + - value: 0.84 + multiplier: Floor Area, Foundation (ft^2) + lifetime: 999 + - &insulation_foundation_wall_wall_r_10_exterior + option: Insulation Foundation Wall|Wall R-10, Exterior + costs: + - value: 1.05 + multiplier: Wall Area, Below-Grade (ft^2) + lifetime: 999 diff --git a/test/tests_yml_files/yml_weather_files/testing_baseline.yml b/test/tests_yml_files/yml_weather_files/testing_baseline.yml index 3bb39f3635..0691160a5f 100644 --- a/test/tests_yml_files/yml_weather_files/testing_baseline.yml +++ b/test/tests_yml_files/yml_weather_files/testing_baseline.yml @@ -36,13 +36,3 @@ workflow_generator: baseline: n_buildings_represented: 110000000 - -eagle: - n_jobs: 2 - minutes_per_sim: 1 - account: - sampling: - time: 10 - postprocessing: - time: 10 - n_workers: 1