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

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

Conversation

yantosca
Copy link
Contributor

Overview

This is the the companion PR to issue #220. It does the following:

  1. Removed gcpy_test_data path from benchmark configuration files. This has now been replaced with placeholder text.
  2. Removed the if block that set the benchmark results paths when the gcpy_test data was used.
  3. Removed comments pertaining to gcpy_test from the benchmarking routines
  4. Removed is_pre_13_1 tags from benchmark configuration files.
  5. Removed the gchp_is_pre_13_1 arguments from the get_filename and get_filenames functions in gcpy/util.py

Expected results

No differences are expected.

yantosca added 2 commits May 23, 2023 16:34
benchmark/1mo_benchmark.yml
benchmark/1yr_ch4_benchmark.yml
benchmark/1yr_fullchem_benchmark.yml
benchmark/1yr_tt_benchmark.yml
- main_dir is now a placeholder path instead of path to gcpy_test_data
- Added comments telling the user to edit paths as needed
- Removed is_pre_13.1 tags from GCHP_ref and GCHP_dev entries

benchmark/modules/run_1yr_fullchem_benchmark.py
benchmark/modules/run_1yr/tt_benchmark.py
benchmark/run_benchmark.py
- Remove code resetting timestamps for GCHP versions prior to 13.1
- Remove gchp_is_pre_13_1 arguments from get_filepath and get_filepaths

gcpy/util.py
- Removed gchp_is_pre_13_1 arguments from get_filepath, get_filepaths

Signed-off-by: Bob Yantosca <[email protected]>
benchmark/run_benchmark.py
- Removed the if block that assigns the results directories based
  on whether gcpy_test was selected or not.
- Removed comments about gcpy_test in header
- Updated version to 1.4.0 in header comments

benchmark/modules/run_*_benchmark.py
- Removed comments about gcpy_test
- Updated version to 1.4.0 in header comments

Signed-off-by: Bob Yantosca <[email protected]>
@yantosca yantosca added category: Feature Request New feature or request topic: Benchmark Plots and Tables Issues pertaining to generating plots/tables from benchmark output labels May 23, 2023
@yantosca yantosca requested a review from msulprizio May 23, 2023 20:58
@yantosca yantosca self-assigned this May 23, 2023
@yantosca yantosca linked an issue May 23, 2023 that may be closed by this pull request
@yantosca yantosca changed the base branch from dev to docs/dev May 23, 2023 21:32
@yantosca yantosca changed the base branch from docs/dev to dev May 23, 2023 21:33
yantosca added 2 commits May 31, 2023 13:43
benchmark/cloud/template.1hr_benchmark
benchmark/cloud/template.1mo_benchmark
- Removed the is_pre_13.1 tags from ref & dev GCHP entries in these
  cloud benchmarking configuration files for consistency with the
  other configuration files.

Signed-off-by: Bob Yantosca <[email protected]>
@yantosca yantosca requested review from lizziel and removed request for msulprizio May 31, 2023 17:53
Copy link
Contributor

@lizziel lizziel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Just a few comments on things that might have come in by mistake.

benchmark/run_benchmark.py Outdated Show resolved Hide resolved
gcpy/.readthedocs.yaml Show resolved Hide resolved
benchmark/run_benchmark.py
- The "is_gchp=True" keyword argument needs to be followed by a comma
  (e.g. "is_gchp=True," as there are arguments that come after it.
  Now fixed.

Signed-off-by: Bob Yantosca <[email protected]>
@yantosca yantosca requested a review from lizziel May 31, 2023 18:32
@yantosca yantosca added this to the 1.4.0 milestone May 31, 2023
@lizziel lizziel merged commit 48fed1c into dev May 31, 2023
@yantosca yantosca deleted the feature/remove-gcpy-test branch June 1, 2023 13:42
yantosca added a commit that referenced this pull request Jun 1, 2023
benchmark/1mo_benchmark.yml
benchmark/1yr_ch4_benchmark.yml
benchmark/1yr_fullchem_benchmark.yml
benchmark/1yr_tt_benchmark.yml
benchmark/cloud/template.1hr_benchmark.yml
benchmark/cloud/template.1mo_benchmark.yml
- Removed "gcpy_test: False" from benchmark YAML config files.
  This should have been done in PR #222, but was somehow skipped.

Signed-off-by: Bob Yantosca <[email protected]>
hannahnesser pushed a commit to hannahnesser/gcpy that referenced this pull request Jan 22, 2024
benchmark/1mo_benchmark.yml
benchmark/1yr_ch4_benchmark.yml
benchmark/1yr_fullchem_benchmark.yml
benchmark/1yr_tt_benchmark.yml
benchmark/cloud/template.1hr_benchmark.yml
benchmark/cloud/template.1mo_benchmark.yml
- Removed "gcpy_test: False" from benchmark YAML config files.
  This should have been done in PR geoschem#222, but was somehow skipped.

Signed-off-by: Bob Yantosca <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category: Feature Request New feature or request topic: Benchmark Plots and Tables Issues pertaining to generating plots/tables from benchmark output
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[FEATURE REQUEST] Remove test data option from benchmarking code
2 participants