Skip to content

Commit

Permalink
GEOS-Chem update: Merge PRs 1796, 1987, 1990, 201{1,3}, 2039, 204{0,2,3}
Browse files Browse the repository at this point in the history
This commit informs the GCHP superproject about the following
commits that were pushed to the geoschem/geos-chem repository:

78c1b7dc3 Merge PR #2042 (Fix HEMCO_Config.rc for CH4 and carbon simulations)
54e8cdafc Merge PR #2043 (Fix typos written to GCHP int test log files)
382f11dca Merge PR #2040 (Lower GCHP timestep threshold if > C180)
ed1a20ec6 Merge PR #2039 (Improve missing CH4 emissions error message)
1b47584ba Merge PR #1990 (Add --no-bootstrap option to integration tests )
48a244826 Merge PR #2013 (Fix incorrect comment on static H2O option)
533128246 Merge PR #1796 (Use integer flags to denote species units)
3388e7fed Merge PR #1987 (Prevent POAEMISS from being assigned if not allocated)
1b05bfdf8 Bug fix: Remove duplicate species flags in fullchem_mod.F90
b2e7f7056 Merge branch 'release/14.1.2' into dev/no-diff-to-benchmark
f5f84fba9 Merge PR #2011 (Fix titles for 14.2.0 and 14.2.2 in CHANGELOG.md)

Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
  • Loading branch information
yantosca committed Nov 27, 2023
1 parent acbd110 commit 6012e51
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/GCHP_GridComp/GEOSChem_GridComp/geos-chem
Submodule geos-chem updated 61 files
+27 −2 CHANGELOG.md
+5 −4 GeosCore/aero_drydep.F90
+27 −13 GeosCore/aerosol_mod.F90
+20 −6 GeosCore/airs_ch4_mod.F90
+5 −3 GeosCore/calc_met_mod.F90
+24 −9 GeosCore/carbon_mod.F90
+22 −20 GeosCore/chemistry_mod.F90
+11 −6 GeosCore/diagnostics_mod.F90
+3 −2 GeosCore/dust_mod.F90
+106 −15 GeosCore/fullchem_mod.F90
+20 −7 GeosCore/gosat_ch4_mod.F90
+18 −8 GeosCore/hco_interface_gc_mod.F90
+19 −7 GeosCore/hco_utilities_gc_mod.F90
+1 −1 GeosCore/input_mod.F90
+20 −9 GeosCore/linear_chem_mod.F90
+47 −25 GeosCore/mercury_mod.F90
+26 −8 GeosCore/mixing_mod.F90
+22 −12 GeosCore/pbl_mix_mod.F90
+19 −7 GeosCore/rrtmg_rad_transfer_mod.F90
+19 −11 GeosCore/set_boundary_conditions_mod.F90
+22 −10 GeosCore/set_global_ch4_mod.F90
+70 −25 GeosCore/sulfate_mod.F90
+70 −49 GeosCore/tomas_mod.F90
+19 −8 GeosCore/tracer_mod.F90
+3 −3 GeosCore/ucx_mod.F90
+19 −9 GeosCore/vdiff_mod.F90
+31 −17 GeosCore/wetscav_mod.F90
+425 −367 GeosUtil/unitconv_mod.F90
+11 −5 Headers/input_opt_mod.F90
+2 −2 Headers/state_chm_mod.F90
+8 −11 Headers/state_diag_mod.F90
+3 −3 History/history_mod.F90
+34 −23 Interfaces/GCHP/gchp_chunk_mod.F90
+35 −14 Interfaces/GEOS/geos_CarbonInterface.F90
+23 −11 ObsPack/obspack_mod.F90
+10 −7 run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.CH4
+0 −1 run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.CO2
+0 −1 run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.Hg
+0 −1 run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.POPs
+0 −1 run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.TransportTracers
+8 −5 run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.aerosol
+19 −11 run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.carbon
+9 −5 run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.fullchem
+0 −1 run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.metals
+272 −104 run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.tagCH4
+4 −3 run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.tagCO
+0 −1 run/GCClassic/HEMCO_Config.rc.templates/HEMCO_Config.rc.tagO3
+0 −96 run/GCHP/HEMCO_Config.rc.templates/HEMCO_Config.rc.CO2
+0 −1 run/GCHP/HEMCO_Config.rc.templates/HEMCO_Config.rc.TransportTracers
+19 −11 run/GCHP/HEMCO_Config.rc.templates/HEMCO_Config.rc.carbon
+9 −5 run/GCHP/HEMCO_Config.rc.templates/HEMCO_Config.rc.fullchem
+0 −1 run/GCHP/HEMCO_Config.rc.templates/HEMCO_Config.rc.tagO3
+1 −1 run/GCHP/setCommonRunSettings.sh.template
+7 −0 test/integration/GCClassic/README.md
+38 −14 test/integration/GCClassic/integrationTest.sh
+0 −5 test/integration/GCClassic/integrationTestExecute.sh
+6 −0 test/integration/GCHP/README.md
+47 −27 test/integration/GCHP/integrationTest.sh
+1 −1 test/integration/GCHP/integrationTestCompile.sh
+1 −1 test/integration/GCHP/integrationTestExecute.sh
+240 −102 test/shared/commonFunctionsForTests.sh

0 comments on commit 6012e51

Please sign in to comment.