diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e2446547..1692b2571 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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`) diff --git a/test/integration/GCClassic/integrationTestCreate.sh b/test/integration/GCClassic/integrationTestCreate.sh index 48ccd518a..3c4e21a2e 100755 --- a/test/integration/GCClassic/integrationTestCreate.sh +++ b/test/integration/GCClassic/integrationTestCreate.sh @@ -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 #========================================================================= diff --git a/test/shared/commonFunctionsForTests.sh b/test/shared/commonFunctionsForTests.sh index 6e28a9c41..bae5681ee 100755 --- a/test/shared/commonFunctionsForTests.sh +++ b/test/shared/commonFunctionsForTests.sh @@ -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/' @@ -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