[WIP] EUSS/SDR: roof/window measure updates and combining with HP-RTU measure

resources/measures/upgrade_env_roof_insul_aedg/measure.rb

@@ -75,9 +75,6 @@ def run(model, runner, user_arguments)
     # set limit for minimum insulation in IP units -- this is used to limit input and for inferring insulation layer in construction
     min_exp_r_val_ip = 1.0
 
-    # build standard to use OS standards methods
-    template = 'ComStock 90.1-2019'
-    std = Standard.build(template)
     # get climate zone to set target_r_val_ip
     climate_zone = OpenstudioStandards::Weather.model_get_climate_zone(model)
 

resources/measures/upgrade_env_roof_insul_aedg/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>env_roof_insul_aedg</name>
   <uid>8afedac6-d5b8-4ee6-80d9-107c5cd77b0e</uid>
-  <version_id>370fdf61-e62c-43a8-8487-0fd098f03fda</version_id>
-  <version_modified>2024-06-20T18:58:42Z</version_modified>
+  <version_id>e61c3b69-deb1-4490-9be0-7239edee2788</version_id>
+  <version_modified>2024-09-09T21:44:40Z</version_modified>
   <xml_checksum>A465C8A5</xml_checksum>
   <class_name>EnvRoofInsulAedg</class_name>
   <display_name>Roof Insulation AEDG</display_name>
@@ -81,13 +81,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>E6813C8D</checksum>
+      <checksum>5B95CB09</checksum>
     </file>
     <file>
-      <filename>env_roof_insul_aedg_test.rb</filename>
+      <filename>upgrade_env_roof_insul_aedg_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>E22EA670</checksum>
+      <checksum>2C804AFF</checksum>
     </file>
   </files>
 </measure>

resources/measures/upgrade_env_roof_insul_aedg/tests/env_roof_insul_aedg_test.rb → resources/measures/upgrade_env_roof_insul_aedg/tests/upgrade_env_roof_insul_aedg_test.rb

@@ -116,9 +116,6 @@ def apply_measure_and_run(test_name, measure, argument_map, osm_path, epw_path,
     end
     assert(File.exist?(run_dir(test_name)))
 
-    # change into run directory for tests
-    start_dir = Dir.pwd
-    Dir.chdir run_dir(test_name)
 
     # remove prior runs if they exist
     if File.exist?(model_output_path(test_name))
@@ -128,19 +125,14 @@ def apply_measure_and_run(test_name, measure, argument_map, osm_path, epw_path,
       FileUtils.rm(report_path(test_name))
     end
 
-    # copy the osm and epw to the test directory
-    new_osm_path = "#{run_dir(test_name)}/#{File.basename(osm_path)}"
-    FileUtils.cp(osm_path, new_osm_path)
-    new_epw_path = "#{run_dir(test_name)}/#{File.basename(epw_path)}"
-    FileUtils.cp(epw_path, new_epw_path)
     # create an instance of a runner
     runner = OpenStudio::Measure::OSRunner.new(OpenStudio::WorkflowJSON.new)
 
     # load the test model
-    model = load_model(new_osm_path)
+    model = load_model(osm_path)
 
     # set model weather file
-    epw_file = OpenStudio::EpwFile.new(OpenStudio::Path.new(new_epw_path))
+    epw_file = OpenStudio::EpwFile.new(OpenStudio::Path.new(epw_path))
     OpenStudio::Model::WeatherFile.setWeatherFile(model, epw_file)
     assert(model.weatherFile.is_initialized)
 
@@ -166,9 +158,6 @@ def apply_measure_and_run(test_name, measure, argument_map, osm_path, epw_path,
       assert(File.exist?(sql_path(test_name)))
     end
 
-    # change back directory
-    Dir.chdir(start_dir)
-
     return result
   end
 

resources/measures/upgrade_hvac_add_heat_pump_rtu/README.md

@@ -124,6 +124,15 @@ Upgrade roof insulation per AEDG recommendations.
 **Model Dependent:** false
 
 
+### Upgrade Windows?
+Upgrade window per AEDG recommendations.
+**Name:** window,
+**Type:** Boolean,
+**Units:** ,
+**Required:** true,
+**Model Dependent:** false
+
+
 ### Do a sizing run for informing sizing instead of using hard-sized model parameters?
 
 **Name:** sizing_run,