Skip to content

Commit

Permalink
Merge PR #2372 (Turn off MEGAN extension for non-benchmark sims)
Browse files Browse the repository at this point in the history
This merge brings PR #2372 (urn off the MEGAN extension for
fullchem "non-benchmark" simulations, by @yantosca) into the GEOS-Chem
"no-diff-to-benchmark" development stream.

This PR edits rundir scripts and HEMCO_Config.rc templates so that the
MEGAN emissions are only activated for the fullchem_benchmark simulation.
The other fullchem simulations use offline emissions (except when using
GCAP2 met, which uses online MEGAN).

Signed-off-by: Bob Yantosca <[email protected]>
  • Loading branch information
yantosca committed Jul 12, 2024
2 parents 7e40016 + 207c9c6 commit 03287a6
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,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

### Fixed
- Typo in `setCommonRunSettings.sh` that made GCHP always choose mass fluxes for meteorology
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ VerboseOnCores: root # Accepted values: root all
--> N per snowflake : 5.0
--> Model sea salt Br- : false
--> Br- mass ratio : 2.11e-3
108 MEGAN : off ISOP/ACET/PRPE/C2H4/ALD2/MOH/EOH/MTPA/MTPO/LIMO/SESQ/SOAP/SOAS
108 MEGAN : ${RUNDIR_MEGAN_EXT} ISOP/ACET/PRPE/C2H4/ALD2/MOH/EOH/MTPA/MTPO/LIMO/SESQ/SOAP/SOAS
--> Isoprene scaling : 1.0
--> CO2 inhibition : true
--> CO2 conc (ppmv) : 390.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ VerboseOnCores: root # Accepted values: root all
--> N per snowflake : 5.0
--> Model sea salt Br- : true
--> Br- mass ratio : 2.11e-3
108 MEGAN : on ISOP/ACET/PRPE/C2H4/ALD2/MOH/EOH/MTPA/MTPO/LIMO/SESQ/SOAP/SOAS
108 MEGAN : ${RUNDIR_MEGAN_EXT} ISOP/ACET/PRPE/C2H4/ALD2/MOH/EOH/MTPA/MTPO/LIMO/SESQ/SOAP/SOAS
--> Isoprene scaling : 1.0
--> CO2 inhibition : true
--> CO2 conc (ppmv) : 390.0
Expand Down
8 changes: 8 additions & 0 deletions run/GCClassic/createRunDir.sh
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,11 @@ else

fi

# Turn off MEGAN for the aerosol-only simulation
if [[ "x${sim_name}" == "xaerosol" ]]; then
RUNDIR_VARS+="RUNDIR_MEGAN_EXT='off'\n"
fi

#-----------------------------------------------------------------
# Ask user to select horizontal resolution
#-----------------------------------------------------------------
Expand Down Expand Up @@ -962,6 +967,7 @@ fi
# Assign appropriate file paths and settings in HEMCO_Config.rc
if [[ ${met} = "ModelE2.1" ]]; then
RUNDIR_VARS+="RUNDIR_DUSTDEAD_EXT='on '\n"
RUNDIR_VARS+="RUNDIR_MEGAN_EXT='on '\n"
RUNDIR_VARS+="RUNDIR_SEASALT_EXT='on '\n"
RUNDIR_VARS+="RUNDIR_SOILNOX_EXT='on '\n"
RUNDIR_VARS+="RUNDIR_OFFLINE_DUST='false'\n"
Expand All @@ -974,6 +980,7 @@ if [[ ${met} = "ModelE2.1" ]]; then
else
if [[ "${sim_extra_option}" == "benchmark" ]]; then
RUNDIR_VARS+="RUNDIR_DUSTDEAD_EXT='on '\n"
RUNDIR_VARS+="RUNDIR_MEGAN_EXT='on '\n"
RUNDIR_VARS+="RUNDIR_SEASALT_EXT='on '\n"
RUNDIR_VARS+="RUNDIR_SOILNOX_EXT='on '\n"
RUNDIR_VARS+="RUNDIR_OFFLINE_DUST='false'\n"
Expand Down Expand Up @@ -1005,6 +1012,7 @@ else
RUNDIR_VARS+="RUNDIR_OFFLINE_DUST='true '\n"
fi
RUNDIR_VARS+="RUNDIR_DUSTDEAD_EXT='off'\n"
RUNDIR_VARS+="RUNDIR_MEGAN_EXT='off'\n"
RUNDIR_VARS+="RUNDIR_SOILNOX_EXT='off'\n"
RUNDIR_VARS+="RUNDIR_OFFLINE_BIOVOC='true '\n"
RUNDIR_VARS+="RUNDIR_OFFLINE_SOILNOX='true '\n"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ VerboseOnCores: root # Accepted values: root all
--> N per snowflake : 5.0
--> Model sea salt Br- : true
--> Br- mass ratio : 2.11e-3
108 MEGAN : on ISOP/ACET/PRPE/C2H4/ALD2/MOH/EOH/MTPA/MTPO/LIMO/SESQ/SOAP/SOAS
108 MEGAN : ${RUNDIR_MEGAN_EXT} ISOP/ACET/PRPE/C2H4/ALD2/MOH/EOH/MTPA/MTPO/LIMO/SESQ/SOAP/SOAS
--> Isoprene scaling : 1.0
--> CO2 inhibition : true
--> CO2 conc (ppmv) : 390.0
Expand Down
2 changes: 2 additions & 0 deletions run/GCHP/createRunDir.sh
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,7 @@ fi
# Assign appropriate file paths and settings in HEMCO_Config.rc
if [[ "${sim_extra_option}" == "benchmark" ]]; then
RUNDIR_VARS+="RUNDIR_DUSTDEAD_EXT='on '\n"
RUNDIR_VARS+="RUNDIR_MEGAN_EXT='on '\n"
RUNDIR_VARS+="RUNDIR_SEASALT_EXT='on '\n"
RUNDIR_VARS+="RUNDIR_SOILNOX_EXT='on '\n"
RUNDIR_VARS+="RUNDIR_OFFLINE_DUST='false'\n"
Expand Down Expand Up @@ -751,6 +752,7 @@ else
RUNDIR_VARS+="RUNDIR_OFFLINE_DUST='true '\n"
fi
RUNDIR_VARS+="RUNDIR_DUSTDEAD_EXT='off'\n"
RUNDIR_VARS+="RUNDIR_MEGAN_EXT='off'\n"
RUNDIR_VARS+="RUNDIR_SOILNOX_EXT='off'\n"
RUNDIR_VARS+="RUNDIR_OFFLINE_BIOVOC='true '\n"
RUNDIR_VARS+="RUNDIR_OFFLINE_SOILNOX='true '\n"
Expand Down

0 comments on commit 03287a6

Please sign in to comment.