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 fixes for TOMAS simulations in GCHP #2136

Merged
merged 6 commits into from
Feb 6, 2024
Merged

Conversation

msulprizio
Copy link
Contributor

Name and Institution (Required)

Name: Melissa Sulprizio
Institution: Harvard / GCST

Describe the update

This pull request supersedes #2116, which included fixes for running TOMAS in GCHP. This pull request also includes:

  1. Removing hardcoded TOMAS species from GCHP's HISTORY.rc.fullchem and adding them only for TOMAS simulations (in script setupConfigFiles.sh)
  2. Updating the sample restart files for TOMAS simulations in GCHP

This should be merged alongside:

Expected changes

These updates produce zero differences with respect to the full-chemistry benchmark simulation. They now allow all GCHP integrations (including TOMAS15) to pass:

Execution tests:
------------------------------------------------------------------------------
gchp_fullchem_merra2................................Execute Simulation....PASS
gchp_fullchem_merra2_benchmark......................Execute Simulation....PASS
gchp_fullchem_merra2_RRTMG..........................Execute Simulation....PASS
gchp_fullchem_merra2_TOMAS15........................Execute Simulation....PASS
gchp_tagO3_merra2...................................Execute Simulation....PASS
gchp_TransportTracers_merra2........................Execute Simulation....PASS
 
Summary of test results:
------------------------------------------------------------------------------
Execution tests passed: 6
Execution tests failed: 0
Execution tests not yet completed: 0

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%  All execution tests passed!  %%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

Related Github Issue(s)

BettyCroft and others added 5 commits January 12, 2024 08:35
In the previous pull request merge, species for the TOMAS15 simulation were
added to run/GCHP/HISTORY.rc.templates/HISTORY.rc.fullchem. However, this
causes non-TOMAS simulations to crash because those species aren't defined.
To avoid this, those lines are removed from HISTORY.rc. Instead, the
setupConfigFiles.sh script has been updated to add those lines to HISTORY.rc
for TOMAS simulations using sed.

Signed-off-by: Melissa Sulprizio <mpayer@seas.harvard.edu>
…4.3.0

Signed-off-by: Melissa Sulprizio <mpayer@seas.harvard.edu>
A spun-up sample restart file has been provided for TOMAS simulations in
GCHP courtesy of Betty Croft. The GCHP/createRunDir.sh script has been
updated so that GCHP TOMAS simulations point to the updated file in
GEOSCHEM_RESTARTS/v2024-01.

Signed-off-by: Melissa Sulprizio <mpayer@seas.harvard.edu>
@msulprizio msulprizio added the category: Bug Fix Fixes a previously-reported bug label Jan 30, 2024
@msulprizio msulprizio added this to the 14.3.0 milestone Jan 30, 2024
@msulprizio msulprizio requested a review from yantosca January 30, 2024 19:23
@msulprizio msulprizio self-assigned this Jan 30, 2024
@yantosca yantosca added topic: GCHP Related to GCHP only topic: Benchmarking and Testing Related to CI, integration tests, or scientific benchmarking no-diff-to-benchmark This update will not change the results of fullchem benchmark simulations specialty simulations labels Jan 30, 2024
Copy link
Contributor

@yantosca yantosca left a comment

Choose a reason for hiding this comment

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

Hi @msulprizio, thanks for this PR. Mostly looks good but I did note a couple of minor points.

run/GCClassic/createRunDir.sh Show resolved Hide resolved
GeosCore/sulfate_mod.F90 Outdated Show resolved Hide resolved
GeosCore/tomas_mod.F90 Outdated Show resolved Hide resolved
GeosCore/tomas_mod.F90 Show resolved Hide resolved
GeosCore/tomas_mod.F90 Show resolved Hide resolved
GeosCore/sulfate_mod.F90 Show resolved Hide resolved
run/GCHP/createRunDir.sh Show resolved Hide resolved
@yantosca yantosca self-requested a review January 31, 2024 18:15
Copy link
Contributor

yantosca commented Feb 2, 2024

@BettyCroft: I'm OK with this.

@BettyCroft
Copy link
Contributor

Thank you @yantosca!

Signed-off-by: Melissa Sulprizio <mpayer@seas.harvard.edu>
Copy link
Contributor

@yantosca yantosca left a comment

Choose a reason for hiding this comment

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

Good to merge! Thanks @msulprizio

@msulprizio
Copy link
Contributor Author

This update passes all GCClassic and GCHP integration tests. I have also confirmed zero differences in fullchem benchmark simulations from these updates.

@msulprizio msulprizio merged commit 2e98655 into dev/14.3.0 Feb 6, 2024
@msulprizio msulprizio deleted the bugfix/tomas-gchp branch February 6, 2024 14:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category: Bug Fix Fixes a previously-reported bug no-diff-to-benchmark This update will not change the results of fullchem benchmark simulations topic: Benchmarking and Testing Related to CI, integration tests, or scientific benchmarking topic: GCHP Related to GCHP only
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants