NREL · DavidGoldwasser · Nov 15, 2024 · Nov 7, 2024 · Nov 8, 2024 · Nov 8, 2024
diff --git a/.github/workflows/test-osw.yml b/.github/workflows/test-osw.yml
@@ -4,7 +4,7 @@ on: push
 jobs:
   test-osw:
     runs-on: ubuntu-latest
-    container:  nrel/openstudio:3.4.0
+    container:  nrel/openstudio:dev-3.9.0-rc3
     steps:
     - name: check out repository
       uses: actions/checkout@v2

diff --git a/integration_testing/workflow/workflow_resources/case_en_600.idf b/integration_testing/workflow/workflow_resources/case_en_600.idf
@@ -1063,7 +1063,7 @@ Output:Variable,
 
 Output:Variable,
   ,                                       !- Key Value
-  Zone Windows Total Transmitted Solar Radiation Rate, !- Variable Name
+  Enclosure Windows Total Transmitted Solar Radiation Rate, !- Variable Name
   hourly;                                 !- Reporting Frequency
 
 Output:Table:Monthly,

diff --git a/measures/bestest_building_thermal_envelope_and_fabric_load_reporting/measure.rb b/measures/bestest_building_thermal_envelope_and_fabric_load_reporting/measure.rb
@@ -93,7 +93,7 @@ def energyPlusOutputRequests(runner, user_arguments)
 
       # get zone windows variables for subset of cases
       if hourly_win_cases.include?(name_test)
-        hourly_variables << 'Zone Windows Total Transmitted Solar Radiation Rate'
+        hourly_variables << 'Enclosure Windows Total Transmitted Solar Radiation Rate'
       end
 
     end

diff --git a/measures/bestest_he_reporting/resources/os_lib_reporting_bestest.rb b/measures/bestest_he_reporting/resources/os_lib_reporting_bestest.rb
@@ -723,7 +723,7 @@ def self.case_9xx_only_section(model, sqlFile, runner, name_only = false)
 
     # zone_total_transmitted_beam_solar_radiation
     key_value =  "ZONE ONE SPACE"
-    variable_name = "Zone Windows Total Transmitted Solar Radiation Rate"
+    variable_name = "Enclosure Windows Total Transmitted Solar Radiation Rate"
     timeseries_hash = process_output_timeseries(sqlFile, runner, ann_env_pd, 'Hourly', variable_name, key_value)
     value_kwh = OpenStudio.convert(timeseries_hash[:sum],'Wh','kWh').get # using Wh since timestep is hourly
     value_kwh_m2 = value_kwh / 12.0 # all zones with windows have 12m^2

diff --git a/measures/replace_idf/tests/case_en_600.idf b/measures/replace_idf/tests/case_en_600.idf
@@ -976,7 +976,7 @@ Output:Variable,
 
 Output:Variable,
   ,                                       !- Key Value
-  Zone Windows Total Transmitted Solar Radiation Rate, !- Variable Name
+  Enclosure Windows Total Transmitted Solar Radiation Rate, !- Variable Name
   Hourly;                                 !- Reporting Frequency
 
 Output:Variable,

diff --git a/results/RESULTS5-2A.xlsx b/results/RESULTS5-2A.xlsx
diff --git a/results/RESULTS5-2a_OS.xlsx b/results/RESULTS5-2a_OS.xlsx
diff --git a/results/RESULTS5-3A.xlsx b/results/RESULTS5-3A.xlsx
diff --git a/results/RESULTS5-3A_OS.xlsx b/results/RESULTS5-3A_OS.xlsx
diff --git a/results/RESULTS5-3B.xlsx b/results/RESULTS5-3B.xlsx
diff --git a/results/RESULTS5-3B_OS.xlsx b/results/RESULTS5-3B_OS.xlsx
diff --git a/results/RESULTS5-4.xlsx b/results/RESULTS5-4.xlsx
diff --git a/results/RESULTS5-4_OS.xlsx b/results/RESULTS5-4_OS.xlsx
diff --git a/results/bestest_populate_report.rb b/results/bestest_populate_report.rb
@@ -589,4 +589,6 @@ def self.return_date_time_from_8760_index(index)
   [*historical_gen_info,*historical_rows].each do |row|
     csv << row
   end
-end
+end
+
+# todo - add check with assert looking for blank values being passed in
diff --git a/results/bestest_populate_report_CE.rb b/results/bestest_populate_report_CE.rb
@@ -513,4 +513,6 @@
   [*historical_gen_info,*historical_rows].each do |row|
     csv << row
   end
-end
+end
+
+# todo - add check with assert looking for blank values being passed in
diff --git a/results/bestest_populate_report_HE.rb b/results/bestest_populate_report_HE.rb
@@ -160,4 +160,6 @@
   [*historical_gen_info,*historical_rows].each do |row|
     csv << row
   end
-end
+end
+
+# todo - add check with assert looking for blank values being passed in
diff --git a/results/historical/OpenStudio_3_9_0.csv b/results/historical/OpenStudio_3_9_0.csv