Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Standard Data Release YAML to GitHub Actions #1329

Merged
merged 32 commits into from
Jan 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
32f3e32
Initial commit of the srd yaml file
afontani Dec 6, 2024
17a07fc
Add SRD yaml into integration tests
afontani Dec 6, 2024
b7ca9f9
Add utility bills
afontani Dec 10, 2024
416ea9a
Latest results.
Dec 10, 2024
eb3be90
Update integration tests and results processing
afontani Dec 10, 2024
d043d64
Latest results.
Dec 4, 2024
b029136
Well pump merge changes
afontani Dec 31, 2024
4edd694
Latest results.
Dec 31, 2024
dbe9237
Update analysis tests and results processing
afontani Dec 31, 2024
4c9ed32
Update README.md.
joseph-robertson Jan 7, 2025
8628fd9
Fix path
afontani Jan 7, 2025
1234f76
New tsvs with updated well pump
afontani Jan 8, 2025
851e4bf
Update test analysis tools
lixiliu Dec 4, 2024
f22c262
Latest results.
afontani Jan 8, 2025
122df88
Latest results.
Jan 8, 2025
32f78ed
Merge remote-tracking branch 'origin/develop' into sdr_yaml_test
afontani Jan 9, 2025
fe36207
Update changelog date
afontani Jan 9, 2025
b859e80
Latest results.
Jan 9, 2025
3eec898
Update new results to the base_results
afontani Jan 9, 2025
5613ee5
remove files
afontani Jan 9, 2025
292ad19
Merge remote-tracking branch 'origin' into sdr_yml
afontani Jan 21, 2025
469ce5d
Make yml structure consistent
afontani Jan 21, 2025
91cdc87
Update TDG
afontani Jan 21, 2025
3ccb1cd
Correct heating_system_2_fraction_heat_load_served specification
afontani Jan 21, 2025
2cae49a
Update utility rates README
afontani Jan 22, 2025
a46810d
Remove unused variables
afontani Jan 22, 2025
082c1b5
Update testing_upgrades variable
afontani Jan 22, 2025
4384f89
testing_upgrade, try 2
afontani Jan 23, 2025
2bceb25
One more fix
afontani Jan 23, 2025
c8ce357
Latest results.
Jan 23, 2025
f341e1f
clean up
afontani Jan 23, 2025
4ad5864
Update changelog
afontani Jan 23, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 24 additions & 22 deletions .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ jobs:
- name: Upload formatted options_lookup
uses: actions/upload-artifact@v4
with:
path: resources/options_lookup.tsv
name: options_lookup
path: resources/options_lookup.tsv
if-no-files-found: error

unit-tests:
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -69,14 +70,16 @@ jobs:
- name: Upload feature samples
uses: actions/upload-artifact@v4
with:
path: resources/buildstock.csv
name: feature_samples
path: resources/buildstock.csv
if-no-files-found: error

- name: Store code coverage
uses: actions/upload-artifact@v4
with:
path: coverage
name: coverage
path: coverage
if-no-files-found: error

analysis-tests:
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -121,18 +124,19 @@ jobs:
- name: Upload precomputed buildstocks
uses: actions/upload-artifact@v4
with:
path: test/tests_yml_files/yml_precomputed*/buildstock*.csv
name: precomputed_buildstocks
path: test/tests_yml_files/yml_precomputed*/buildstock*.csv
if-no-files-found: error

- name: Upload run_analysis.rb results
uses: actions/upload-artifact@v4
with:
name: run_analysis_results_csvs
path: |
project_national/results-Baseline.csv
project_testing/results-Baseline.csv
project_national/results-PackageUpgrade.csv
project_testing/results-PackageUpgrade.csv
name: run_analysis_results_csvs
project_national/results-EnvelopeOnlyLightTouchEnvelope.csv
if-no-files-found: error

integration-tests:
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -166,23 +170,17 @@ jobs:

buildstock_local project_national/national_baseline.yml
buildstock_local project_testing/testing_baseline.yml

buildstock_local project_national/national_upgrades.yml
buildstock_local project_testing/testing_upgrades.yml
buildstock_local project_national/sdr_upgrades_tmy3.yml

- name: Unzip results
run: |
gunzip -v project_national/national_baseline/results_csvs/*.csv.gz
gunzip -v project_testing/testing_baseline/results_csvs/*.csv.gz

gunzip -v project_national/national_upgrades/results_csvs/*.csv.gz
gunzip -v project_testing/testing_upgrades/results_csvs/*.csv.gz
gunzip -v project_national/sdr_upgrades_tmy3/results_csvs/*.csv.gz

tar -xvf project_national/national_baseline/simulation_output/*.tar.gz -C project_national/national_baseline/simulation_output --wildcards '*results_timeseries.csv' --wildcards '*.xml' --wildcards '*data_point_out.json' --wildcards '*.osw'
tar -xvf project_testing/testing_baseline/simulation_output/*.tar.gz -C project_testing/testing_baseline/simulation_output --wildcards '*results_timeseries.csv' --wildcards '*.xml' --wildcards '*data_point_out.json' --wildcards '*.osw' --wildcards '*in.osm' --wildcards '*in.idf'

tar -xvf project_national/national_upgrades/simulation_output/*.tar.gz -C project_national/national_upgrades/simulation_output --wildcards '*results_timeseries.csv' --wildcards '*.xml' --wildcards '*data_point_out.json' --wildcards '*.osw'
tar -xvf project_testing/testing_upgrades/simulation_output/*.tar.gz -C project_testing/testing_upgrades/simulation_output --wildcards '*results_timeseries.csv' --wildcards '*.xml' --wildcards '*data_point_out.json' --wildcards '*.osw' --wildcards '*in.osm' --wildcards '*in.idf'
tar -xvf project_national/sdr_upgrades_tmy3/simulation_output/*.tar.gz -C project_national/sdr_upgrades_tmy3/simulation_output --wildcards '*results_timeseries.csv' --wildcards '*.xml' --wildcards '*data_point_out.json' --wildcards '*.osw'

- name: Process results
run: |
Expand All @@ -192,20 +190,21 @@ jobs:
- name: Upload integration results
uses: actions/upload-artifact@v4
with:
name: feature_results
path: |
baseline
upgrades
name: feature_results
if-no-files-found: error

- name: Upload buildstockbatch results
uses: actions/upload-artifact@v4
with:
name: buildstockbatch_results_csvs
path: |
project_national/national_baseline/results_csvs/results_up00.csv
project_testing/testing_baseline/results_csvs/results_up00.csv
project_national/national_upgrades/results_csvs/results_up17.csv
project_testing/testing_upgrades/results_csvs/results_up17.csv
name: buildstockbatch_results_csvs
project_national/sdr_upgrades_tmy3/results_csvs/results_up16.csv
afontani marked this conversation as resolved.
Show resolved Hide resolved
if-no-files-found: error

- name: Run tests
run: |
Expand Down Expand Up @@ -253,8 +252,9 @@ jobs:
- name: Upload base results
uses: actions/upload-artifact@v4
with:
path: test/base_results
name: base_results
path: test/base_results
if-no-files-found: error

- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -308,8 +308,9 @@ jobs:
- name: Upload comparisons
uses: actions/upload-artifact@v4
with:
path: test/base_results/comparisons
name: comparisons
path: test/base_results/comparisons
if-no-files-found: error

update-results:
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -371,6 +372,7 @@ jobs:
path: |
docs/technical_development_guide/_build/html/
docs/technical_reference_guide/ResStockTechnicalReferenceGuide.pdf
if-no-files-found: error

- name: Commit latest results
shell: bash
Expand Down
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@
/measures/UpgradeCosts/tests/in*
/measures/UpgradeCosts/tests/*.xml
/project_national/national_baseline
/project_national/national_upgrades
/project_national/sdr_upgrades_tmy3*
/project_testing/testing_baseline
/project_testing/testing_upgrades
/national_baseline
/testing_baseline
/sdr_upgrades_tmy3*
/resources/buildstock.csv
/project_*/**/*.csv
!/project_*/resources/source_report.csv
Expand All @@ -29,6 +31,7 @@
/weather
.vscode/
.DS_Store
buildstockbatch_crash_details.log
**/.ipynb_checkpoints/*
**/data/*
!/resources/data/dictionary/outputs.csv
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ To allow more options per upgrade, increase the value returned by the following
.. code::

def self.NumApplyUpgradeOptions
return 25
return 100
end

Then run ``openstudio tasks.rb update_measures``. See :doc:`running_tasks` for instructions on how to run tasks.
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,18 @@ Development Changelog
resstock-estimation: `pull request 436 <https://github.com/NREL/resstock-estimation/pull/436>`_

Assignees: Janet Reyna

.. change::
:tags: workflow, standard data release
:pullreq: 1329
:tickets: 1261

**Date**: 2024-1-23

Title:
Add Standard Data Release YAML to GitHub Actions

Description:
Add an initial Standard Data Release (SDR) YAML file. Add the SDR upgrade file into CI tests to continue progress towards end-to-end testing.

Assignees: Anthony Fontanini
Loading
Loading