Skip to content

Commit

Permalink
Merge PR #2674 (Harvard Cannon int test now use GNU12 compilers)
Browse files Browse the repository at this point in the history
This merge brings PR #2674 (Change default environment files for
integration tests on Harvard Cannon from gnu10 to gnu12 #2674,
by @yantosca) into the GEOS-Chem "no-diff-to-benchmark" development
stream.

This PR updates the default compiler for integrationt tests that
are run on the Harvard Cannon cluster.

Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
  • Loading branch information
yantosca committed Jan 9, 2025
2 parents ac0b765 + 533326f commit ab77f52
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Updated HEMCO subroutine calls for error and log handling changes in HEMCO 3.9.1
- Updated configuration files for using GEOS-Chem 14.5 in CESM
- Modified tagCO simulation to use GFED4 biomass burning emissions and GEOS-Chem v5 OH fields for consistency with carbon simulation
- Changed integration tests to use Harvard Cannon GNU 12 environment files by default

### Fixed
- Added a fix to skip the call to KPP when only CO2 is defined in the carbon simulation
Expand Down
4 changes: 2 additions & 2 deletions test/shared/commonFunctionsForTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ function get_default_gcc_env_file() {
#========================================================================
# Returns the default environment file for GEOS-Chem Classic
#========================================================================
envFile=$(realpath "../../../run/GCClassic/runScriptSamples/operational_examples/harvard_cannon/gcclassic.gcc10_cannon_rocky.env")
envFile=$(realpath "../../../run/GCClassic/runScriptSamples/operational_examples/harvard_cannon/gcclassic.gcc12_cannon_rocky.env")
echo "$envFile"
return 0
}
Expand All @@ -788,7 +788,7 @@ function get_default_gchp_env_file() {
#========================================================================
# Returns the default environment file for GCHP
#========================================================================
envFile=$(realpath "../../../run/GCHP/runScriptSamples/operational_examples/harvard_cannon/gchp.gcc10_openmpi4_cannon_rocky.env")
envFile=$(realpath "../../../run/GCHP/runScriptSamples/operational_examples/harvard_cannon/gchp.gcc12_openmpi4_cannon_rocky.env")
echo "$envFile"
return 0
}
Expand Down

0 comments on commit ab77f52

Please sign in to comment.