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.

Sign up for GitHub

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

Remove references to gcpy_test and gchp_is_pre_13_1 from benchmarking routines and config files #222

Merged
merged 6 commits into from
May 31, 2023
Merged

Remove references to gcpy_test and gchp_is_pre_13_1 from benchmarking routines and config files #222

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b7398b8
Remove references to gcpy_test and GCHP is_pre_13.1
yantosca May 23, 2023
522f124
Remove if block that sets gcpy_test paths for benchmark results
yantosca May 23, 2023
998f4f0
Remove gcpy/.readthedocs.yaml (you only need it in the root folder)
yantosca May 23, 2023
f89fed6
Merge branch 'dev' into feature/remove-gcpy-test
yantosca May 31, 2023
18e68ad
Remove is_pre_13.1 tags from cloud template*benchmark.yml files
yantosca May 31, 2023
683b5d0
Bug fix: add missing comma at line 911 of run_benchmark.py
yantosca May 31, 2023
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Now specify package `requests-2.31.0` in `environment.py` (fixes a security issue)
- Updated badge links in `README.md`

### Removed
- Removed `gchp_is_pre_13_1` arguments & code from benchmarking routines
- Removed `is_pre_13_1` tags from `*_benchmark.yml` config files

### Fixed
- Generalized test for GCHP or GCClassic restart file in `regrid_restart_file.py`

Expand Down
6 changes: 2 additions & 4 deletions benchmark/1mo_benchmark.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
# species_database.yml in one of the Dev rundirs.
#
paths:
main_dir: /n/holyscratch01/external_repos/GEOS-CHEM/gcgrid/geos-chem/validation/gcpy_test_data/1mon
results_dir: /path/to/BenchmarkResults
main_dir: /path/to/benchmark/main/dir # EDIT AS NEEDED
results_dir: /path/to/BenchmarkResults # EDIT AS NEEDED
weights_dir: /n/holyscratch01/external_repos/GEOS-CHEM/gcgrid/gcdata/ExtData/GCHP/RegriddingWeights
spcdb_dir: default
#
Expand Down Expand Up @@ -52,7 +52,6 @@ data:
restarts_subdir: Restarts
bmk_start: "2019-07-01T00:00:00"
bmk_end: "2019-08-01T00:00:00"
is_pre_13.1: False
is_pre_14.0: False
resolution: c24
dev:
Expand All @@ -70,7 +69,6 @@ data:
restarts_subdir: Restarts
bmk_start: "2019-07-01T00:00:00"
bmk_end: "2019-08-01T00:00:00"
is_pre_13.1: False
is_pre_14.0: False
resolution: c24
#
Expand Down
6 changes: 2 additions & 4 deletions benchmark/1yr_ch4_benchmark.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
# species_database.yml in one of the Dev rundirs.
#
paths:
main_dir: /n/holyscratch01/external_repos/GEOS-CHEM/gcgrid/geos-chem/validation/gcpy_test_data/1yr_fullchem
results_dir: /path/to/BenchmarkResults
main_dir: /path/to/benchmark/main/dir # EDIT AS NEEDED
results_dir: /path/to/BenchmarkResults # EDIT AS NEEDED
weights_dir: /n/holyscratch01/external_repos/GEOS-CHEM/gcgrid/data/ExtData/GCHP/RegriddingWeights
spcdb_dir: default
#
Expand Down Expand Up @@ -52,7 +52,6 @@ data:
restarts_subdir: Restarts
bmk_start: "2019-01-01T00:00:00"
bmk_end: "2020-01-01T00:00:00"
is_pre_13.1: False # for gcpy_test_data, edit if needed
is_pre_14.0: False # for gcpy_test_data, edit if needed
resolution: c24 # for gcpy_test_data, edit if needed
dev:
Expand All @@ -70,7 +69,6 @@ data:
restarts_subdir: Restarts
bmk_start: "2019-01-01T00:00:00"
bmk_end: "2020-01-01T00:00:00"
is_pre_13.1: False # for gcpy_test_data, edit if needed
is_pre_14.0: False # for gcpy_test_data, edit if needed
resolution: c24 # for gcpy_test_data, edit if needed
#
Expand Down
6 changes: 2 additions & 4 deletions benchmark/1yr_fullchem_benchmark.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
# species_database.yml in one of the Dev rundirs.
#
paths:
main_dir: /n/holyscratch01/external_repos/GEOS-CHEM/gcgrid/geos-chem/validation/gcpy_test_data/1yr_fullchem
results_dir: /path/to/BenchmarkResults
main_dir: /path/to/benchmark/main/dir # EDIT AS NEEDED
results_dir: /path/to/BenchmarkResults # EDIT AS NEEDED
weights_dir: /n/holyscratch01/external_repos/GEOS-CHEM/gcgrid/data/ExtData/GCHP/RegriddingWeights
spcdb_dir: default
#
Expand Down Expand Up @@ -52,7 +52,6 @@ data:
restarts_subdir: Restarts
bmk_start: "2019-01-01T00:00:00"
bmk_end: "2020-01-01T00:00:00"
is_pre_13.1: False # for gcpy_test_data, edit if needed
is_pre_14.0: True # for gcpy_test_data, edit if needed
resolution: c48 # for gcpy_test_data, edit if needed
dev:
Expand All @@ -70,7 +69,6 @@ data:
restarts_subdir: Restarts
bmk_start: "2019-01-01T00:00:00"
bmk_end: "2020-01-01T00:00:00"
is_pre_13.1: False # for gcpy_test_data, edit if needed
is_pre_14.0: False # for gcpy_test_data, edit if needed
resolution: c24 # for gcpy_test_data, edit if needed
#
Expand Down
6 changes: 2 additions & 4 deletions benchmark/1yr_tt_benchmark.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
# species_database.yml in one of the Dev rundirs.
#
paths:
main_dir: /n/holyscratch01/external_repos/GEOS-CHEM/gcgrid/geos-chem/validation/gcpy_test_data/1yr_transporttracer
results_dir: /path/to/BenchmarkResults
main_dir: /path/to/benchmark/main/dir # EDIT AS NEEDED
results_dir: /path/to/BenchmarkResults # EDIT AS NEEDED
weights_dir: /n/holyscratch01/external_repos/GEOS-CHEM/gcgrid/data/ExtData/GCHP/RegriddingWeights
spcdb_dir: default
#
Expand Down Expand Up @@ -52,7 +52,6 @@ data:
restarts_subdir: Restarts
bmk_start: "2019-01-01T00:00:00"
bmk_end: "2020-01-01T00:00:00"
is_pre_13.1: True # for gcpy_test_data, edit if needed
is_pre_14.0: True # for gcpy_test_data, edit if needed
resolution: c48 # for gcpy_test_data, edit if needed
dev:
Expand All @@ -70,7 +69,6 @@ data:
restarts_subdir: Restarts
bmk_start: "2019-01-01T00:00:00"
bmk_end: "2020-01-01T00:00:00"
is_pre_13.1: True # for gcpy_test_data, edit if needed
is_pre_14.0: True # for gcpy_test_data, edit if needed
resolution: c48 # for gcpy_test_data, edit if needed
#
Expand Down
2 changes: 0 additions & 2 deletions benchmark/cloud/template.1hr_benchmark.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ data:
restarts_subdir: Restarts
bmk_start: "2019-07-01T00:00:00"
bmk_end: "2019-07-01T01:00:00"
is_pre_13.1: False
is_pre_14.0: False
resolution: c24
dev:
Expand All @@ -70,7 +69,6 @@ data:
restarts_subdir: Restarts
bmk_start: "2019-07-01T00:00:00"
bmk_end: "2019-07-01T01:00:00"
is_pre_13.1: False
is_pre_14.0: False
resolution: c24
#
Expand Down
2 changes: 0 additions & 2 deletions benchmark/cloud/template.1mo_benchmark.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ data:
restarts_subdir: Restarts
bmk_start: "2019-07-01T00:00:00"
bmk_end: "2019-08-01T00:00:00"
is_pre_13.1: False
is_pre_14.0: False
resolution: c24
dev:
Expand All @@ -70,7 +69,6 @@ data:
restarts_subdir: Restarts
bmk_start: "2019-07-01T00:00:00"
bmk_end: "2019-08-01T00:00:00"
is_pre_13.1: False
is_pre_14.0: False
resolution: c24
#
Expand Down
Loading