Merge pull request #1183 from NREL/3_2_0

Prep v3.2.0 release
NREL · Dec 19, 2023 · 9e1e850 · 9e1e850
2 parents 8068f59 + a6f6363
commit 9e1e850
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
-## ResStock v3.2.0 (pending)
+## ResStock v3.2.0
+###### December 19, 2023 - [Diff](https://github.com/NREL/resstock/compare/v3.1.1...v3.2.0)
 
 Features
 - Add 2022 Cambium emissions data ([#1038](https://github.com/NREL/resstock/pull/1038))

diff --git a/resources/buildstock.rb b/resources/buildstock.rb
@@ -461,9 +461,10 @@ def self.run(in_osw, parent_dir, run_output, upgrade, measures, reporting_measur
       next if line.include? 'Cannot find current Workflow Step'
       next if line.include? 'Data will be treated as typical (TMY)'
       next if line.include? 'WorkflowStepResult value called with undefined stepResult'
+      next if line.include?("Object of type 'Schedule:Constant' and named 'Always") && line.include?('points to an object named') && line.include?('but that object cannot be located')
+      next if line.include? 'Appears there are no design condition fields in the EPW file'
       next if line.include? 'No valid weather file defined in either the osm or osw.'
       next if line.include? 'EPW file not found'
-      next if line.include?("Object of type 'Schedule:Constant' and named 'Always") && line.include?('points to an object named') && line.include?('but that object cannot be located')
       next if line.include? "'UseWeatherFile' is selected in YearDescription, but there are no weather file set for the model."
       next if line.include? 'not within the expected limits' # Ignore EpwFile warnings
       next if line.include? 'Unable to find sql file at'
@@ -568,7 +569,7 @@ def self._rm_path(path)
 end
 
 class Version
-  ResStock_Version = '3.1.1' # Version of ResStock
+  ResStock_Version = '3.2.0' # Version of ResStock
   BuildStockBatch_Version = '2023.10.0' # Minimum required version of BuildStockBatch
 
   def self.check_buildstockbatch_version

diff --git a/tasks.rb b/tasks.rb
@@ -3,14 +3,16 @@
 def download_epws
   require_relative 'resources/hpxml-measures/HPXMLtoOpenStudio/resources/util'
 
+  weather_dir = File.join(File.dirname(__FILE__), 'weather')
+  FileUtils.mkdir(weather_dir) if !File.exist?(weather_dir)
+
   require 'tempfile'
   tmpfile = Tempfile.new('epw')
 
-  UrlResolver.fetch('https://data.nrel.gov/system/files/156/BuildStock_TMY3_FIPS.zip', tmpfile)
+  UrlResolver.fetch('https://data.nrel.gov/system/files/156/Buildstock_TMY3_FIPS-1678817889.zip', tmpfile)
 
   puts 'Extracting weather files...'
   require 'zip'
-  weather_dir = File.join(File.dirname(__FILE__), 'weather')
   Zip.on_exists_proc = true
   Zip::File.open(tmpfile.path.to_s) do |zip_file|
     zip_file.each do |f|