Merge PR #2379 (Disable FAST-JX except for Hg simulation)

This merge brings PR #2379 (Disable support for FAST-JX except for the Hg simulation, by @yantosca) into the GEOS-Chem "no-diff-to-benchmark" simulation. This PR adds a runtime error trap that will halt execution if FAST-JX is selected for any simulation other than Hg. Eventually Hg will use Cloud-J. Signed-off-by: Bob Yantosca <[email protected]>
geoschem · Jul 16, 2024 · 0147de6 · 0147de6
2 parents 03287a6 + 0118850
commit 0147de6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Changed
 - Now reset `State_Diag%SatDiagnCount` to zero in routine`History_Write` (instead of in `History_Netcdf_Write`)
 - Update rundir creation scripts to turn off the MEGAN extension for "standard" fullchem simulations
+- Disable support For FAST-JX for all simulations except Hg
 
 ### Fixed
 - Typo in `setCommonRunSettings.sh` that made GCHP always choose mass fluxes for meteorology

diff --git a/GeosCore/gc_environment_mod.F90 b/GeosCore/gc_environment_mod.F90
@@ -142,6 +142,13 @@ SUBROUTINE GC_Allocate_All( Input_Opt,                        &
        ' -> at GC_Allocate_All  (in module GeosCore/gc_environment_mod.F90)'
 
 #ifdef FASTJX
+    ! Throw an error if FAST-JX is used for simulations other than Hg
+    IF ( .not. Input_Opt%ITS_A_MERCURY_SIM ) THEN
+       ErrMsg = 'FAST-JX is only supported in the Hg simulation!'
+       CALL GC_Error( ErrMsg, RC, ThisLoc )
+       RETURN
+    ENDIF
+
     ! Initialize CMN_FJX_mod.F90
     CALL Init_CMN_FJX( Input_Opt,State_Grid, RC )