Merge pull request #1182 from NREL/point_to_updated_weather_files

Update weather files from NREL Data Catalog
NREL · Dec 19, 2023 · 8068f59 · 8068f59
2 parents 436ee7e + e2686df
commit 8068f59
Show file tree

Hide file tree

Showing 12 changed files with 32,989 additions and 32,988 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,7 @@ Fixes
 - Minor changes to heating and cooling setpoint TSV due to refactoring of prune_rules handling in resstock-estimation ([#1132](https://github.com/NREL/resstock/pull/1132))
 - Minor changes to heating and cooling setpoint TSV after a bug fix ([#1136](https://github.com/NREL/resstock/pull/1136))
 - Update `run_analysis.rb` to handle illegal path characters in upgrade names ([#1138](https://github.com/NREL/resstock/pull/1138))
+- Update TMY3 weather URL from the NREL Data Catalog ([#1182](https://github.com/NREL/resstock/pull/1182))
 
 ## ResStock v3.1.1
 ###### November 28, 2023 - [Diff](https://github.com/NREL/resstock/compare/v3.1.0...v3.1.1)

diff --git a/project_national/national_baseline.yml b/project_national/national_baseline.yml
@@ -4,7 +4,7 @@ os_sha: d5269793f1
 buildstock_directory: ../ # Relative to this file or absolute
 project_directory: project_national # Relative to buildstock_directory
 output_directory: national_baseline
-weather_files_url: https://data.nrel.gov/system/files/156/BuildStock_TMY3_FIPS.zip
+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:

diff --git a/project_national/national_upgrades.yml b/project_national/national_upgrades.yml
@@ -4,7 +4,7 @@ os_sha: d5269793f1
 buildstock_directory: ../ # Relative to this file or absolute
 project_directory: project_national # Relative to buildstock_directory
 output_directory: national_upgrades
-weather_files_url: https://data.nrel.gov/system/files/156/BuildStock_TMY3_FIPS.zip
+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:

diff --git a/project_testing/testing_baseline.yml b/project_testing/testing_baseline.yml
@@ -4,7 +4,7 @@ os_sha: d5269793f1
 buildstock_directory: ../ # Relative to this file or absolute
 project_directory: project_testing # Relative to buildstock_directory
 output_directory: testing_baseline
-weather_files_url: https://data.nrel.gov/system/files/156/BuildStock_TMY3_FIPS.zip
+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:

diff --git a/project_testing/testing_upgrades.yml b/project_testing/testing_upgrades.yml
@@ -4,7 +4,7 @@ os_sha: d5269793f1
 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.zip
+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:

diff --git a/test/base_results/baseline/annual/results_characteristics.csv b/test/base_results/baseline/annual/results_characteristics.csv
diff --git a/test/base_results/baseline/annual/results_output.csv b/test/base_results/baseline/annual/results_output.csv
diff --git a/test/base_results/baseline/timeseries/buildstockbatch.csv b/test/base_results/baseline/timeseries/buildstockbatch.csv
diff --git a/test/base_results/baseline/timeseries/results_output.csv b/test/base_results/baseline/timeseries/results_output.csv
diff --git a/test/base_results/upgrades/annual/results_output.csv b/test/base_results/upgrades/annual/results_output.csv
diff --git a/test/base_results/upgrades/timeseries/buildstockbatch.csv b/test/base_results/upgrades/timeseries/buildstockbatch.csv
diff --git a/test/base_results/upgrades/timeseries/results_output.csv b/test/base_results/upgrades/timeseries/results_output.csv