Merge pull request #24 from NREL/ep_24_1

EnergyPlus 24.1 and OpenStudio 3.8 results
NREL · Nov 7, 2024 · e791797 · e791797
2 parents 69b2443 + 41dde24
commit e791797
Show file tree

Hide file tree

Showing 14 changed files with 637 additions and 637 deletions.
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
@@ -101,30 +101,30 @@ def energyPlusOutputRequests(runner, user_arguments)
       result << OpenStudio::IdfObject.load("Output:Variable,,#{variable},hourly;").get
     end
 
-    # add in monthly variables (needed for OpenStudio 3.7 but not 3.8 and later)
-    category_strs = []
-    OpenStudio::EndUseCategoryType.getValues.each do |category_type|
-      category_str = OpenStudio::EndUseCategoryType.new(category_type).valueDescription
-      category_strs << category_str.gsub(" ","")
-    end
-    monthly_array = ['Output:Table:Monthly']
-    monthly_array << "Building Energy Performance - District Heating Water"
-    monthly_array << '2'
-    category_strs.each do |category_string|
-      monthly_array << "#{category_string}:DistrictHeatingWater"
-      monthly_array << 'SumOrAverage'
-    end
-    result << OpenStudio::IdfObject.load("#{monthly_array.join(',')};").get
-    monthly_array = ['Output:Table:Monthly']
-    monthly_array << "Building Energy Performance - District Heating Water Peak Demand"
-    monthly_array << '2'
-    monthly_array << "DistrictHeatingWater:Facility"
-    monthly_array << "Maximum"
-    category_strs.each do |category_string|
-      monthly_array << "#{category_string}:DistrictHeatingWater"
-      monthly_array << 'ValueWhenMaximumOrMinimum'
-    end
-    result << OpenStudio::IdfObject.load("#{monthly_array.join(',')};").get
+    # # add in monthly variables (needed for OpenStudio 3.7 but not 3.8 and later)
+    # category_strs = []
+    # OpenStudio::EndUseCategoryType.getValues.each do |category_type|
+    #   category_str = OpenStudio::EndUseCategoryType.new(category_type).valueDescription
+    #   category_strs << category_str.gsub(" ","")
+    # end
+    # monthly_array = ['Output:Table:Monthly']
+    # monthly_array << "Building Energy Performance - District Heating Water"
+    # monthly_array << '2'
+    # category_strs.each do |category_string|
+    #   monthly_array << "#{category_string}:DistrictHeatingWater"
+    #   monthly_array << 'SumOrAverage'
+    # end
+    # result << OpenStudio::IdfObject.load("#{monthly_array.join(',')};").get
+    # monthly_array = ['Output:Table:Monthly']
+    # monthly_array << "Building Energy Performance - District Heating Water Peak Demand"
+    # monthly_array << '2'
+    # monthly_array << "DistrictHeatingWater:Facility"
+    # monthly_array << "Maximum"
+    # category_strs.each do |category_string|
+    #   monthly_array << "#{category_string}:DistrictHeatingWater"
+    #   monthly_array << 'ValueWhenMaximumOrMinimum'
+    # end
+    # result << OpenStudio::IdfObject.load("#{monthly_array.join(',')};").get
 
     result
   end

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/historical/OpenStudio_3_7_0.csv b/results/historical/OpenStudio_3_7_0.csv