Skip to content

Commit

Permalink
Add ModelE2.1 (GCAP 2.0) simulation to GCClassic integration tests
Browse files Browse the repository at this point in the history
We now run a 2x2.5 ModelE2.1 (aka GCAP 2.0) full-chemistry simulation in
the GCClassic integration tests. Only one scenario (SSP2-4.5) is evaluated
here simply to ensure these future scenario simulations compile and run
for 1 hour successfully. I will defer to @ltmurray for guidance on whether
additional simulations are needed.

The GCAP 2.0 integration test is passing off of 14.4.1, confirming that the
fixes in #2342 should have resolved
the issues of GCAP 2.0 not working in 14.0.0 (as reported by Lee Murray at
IGC11).

Sample integration test output:

```
==============================================================================
GEOS-Chem Classic: Execution Test Results

GCClassic #c49fcec Submod updates: Merge GEOS-Chem PR #2353 and Cloud-J PR #19
GEOS-Chem #7e4001658 Merge PR #2369 (Fix several issues with satellite diagnostics)
HEMCO     #2192e0e HEMCO 3.9.1 release

Using 24 OpenMP threads
Number of execution tests: 29

Submitted as SLURM job: 40462513
==============================================================================

Execution tests:
------------------------------------------------------------------------------
gc_05x0625_NA_47L_merra2_CH4........................Execute Simulation....PASS
gc_05x0625_NA_47L_merra2_fullchem...................Execute Simulation....PASS
gc_2x25_ModelE2.1_fullchem..........................Execute Simulation....PASS
```

Signed-off-by: Melissa Sulprizio <[email protected]>
  • Loading branch information
msulprizio committed Jul 19, 2024
1 parent b9cf981 commit 2c89108
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Added
- Added number of levels with clouds for photolysis to geoschem_config.yml and Input_Opt to pass to Cloud-J
- Added `State_Grid%CPU_Subdomain_ID` and `State_Grid%CPU_Subdomain_FirstID` as "identifier numbers" for multiple instances of GEOS-Chem on one core in WRF and CESM
- Added ModelEe.2 (GCAP 2.0) simulation to integration tests for GCClassic

### Changed
- Now reset `State_Diag%SatDiagnCount` to zero in routine`History_Write` (instead of in `History_Netcdf_Write`)
Expand Down
7 changes: 7 additions & 0 deletions test/integration/GCClassic/integrationTestCreate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,13 @@ if [[ "X${testsToRun}" == "XALL" ]]; then
# 4x5 merra2 fullchem_47L
create_rundir "1\n1\n1\n1\n2\n${rundirsDir}\n\nn\n" "${log}"

#=========================================================================
# GCAP 2.0 simulations
#=========================================================================

# 2x2.5 ModelE2.1 fullchem (scenario SSP2-4.5, option 6)
create_rundir "1\n1\n4\n6\n2\n1\n${rundirsDir}\n\nn\n" "${log}"

#=========================================================================
# Nested-grid simulations
#=========================================================================
Expand Down
2 changes: 2 additions & 0 deletions test/shared/commonFunctionsForTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ SED_CONFIG_3='s/end_date: \[20160201, 000000\]/end_date: \[20190101, 010000\]/'
SED_CONFIG_4='s/end_date: \[20160101, 000000\]/end_date: \[20190101, 010000\]/'
SED_CONFIG_5='s/end_date: \[20190201, 000000\]/end_date: \[20190101, 010000\]/'
SED_CONFIG_6='s/end_date: \[20190801, 000000\]/end_date: \[20190701, 010000\]/'
SED_CONFIG_7='s/end_date: \[20900801, 000000\]/end_date: \[20900701, 010000\]/'
SED_CONFIG_N1='s/end_date: \[20190201, 000000\]/end_date: \[20190101, 002000\]/'
SED_CONFIG_N2='s/end_date: \[20190801, 000000\]/end_date: \[20190701, 002000\]/'
SED_HEMCO_CONF_1='s/GEOS_0.25x0.3125/GEOS_0.25x0.3125_NA/'
Expand Down Expand Up @@ -229,6 +230,7 @@ function update_config_files() {
sed_ie "${SED_CONFIG_4}" "${runPath}/geoschem_config.yml"
sed_ie "${SED_CONFIG_5}" "${runPath}/geoschem_config.yml"
sed_ie "${SED_CONFIG_6}" "${runPath}/geoschem_config.yml"
sed_ie "${SED_CONFIG_7}" "${runPath}/geoschem_config.yml"

#------------------------------------------------------------------------
# Replace text in HEMCO_Config.rc
Expand Down

1 comment on commit 2c89108

@ltmurray
Copy link
Contributor

@ltmurray ltmurray commented on 2c89108 Jul 19, 2024

Choose a reason for hiding this comment

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

Thanks, @msulprizio ! This should catch any issues that would affect any GCAP2.0 simulations using GCClassic, so no need for extra tests.

Please sign in to comment.