Skip to content

Auto GitFlow - develop → MAPL-v3 - Toward 5.45 #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mathomp4 merged 6 commits into from
Feb 20, 2026
+78 −26
Merged

Auto GitFlow - develop → MAPL-v3 - Toward 5.45 #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9785ced
Toward 5.45
rtodling Feb 18, 2026
40a3804
Zero-diff merge with GCM v11.7.3
rtodling Feb 20, 2026
0c19fe5
merge w/ gcm v11.7.3
rtodling Feb 20, 2026
e0b94a7
upd for merge between DAS 5.43 and v11.7.3
rtodling Feb 20, 2026
c6f507a
Merge branch 'develop' into feature/rtodling/toward_5_45
rtodling Feb 20, 2026
4f8d88d
Merge pull request #420 from GEOS-ESM/feature/rtodling/toward_5_45
rtodling Feb 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 47 additions & 11 deletions components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ AeroML:
GEOS_Util:
local: ./src/Shared/@GMAO_Shared/@GEOS_Util
remote: ../GEOS_Util.git
tag: v5.42.1
tag: v2.1.10
develop: main

GMAO_perllib:
Expand Down Expand Up @@ -98,7 +98,7 @@ mksi:
GEOSgcm_GridComp:
local: ./src/Components/@GEOSgcm_GridComp
remote: ../GEOSgcm_GridComp.git
tag: v2.7.0.2
tag: v2.7.6.1
sparse: ./config/GEOSgcm_GridComp.sparse
develop: develop

Expand All @@ -123,7 +123,7 @@ GEOSagcmPert_GridComp:
FVdycoreCubed_GridComp:
local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp
remote: ../FVdycoreCubed_GridComp.git
tag: v2.13.1
tag: v2.14.1
develop: develop

fvdycore:
Expand All @@ -135,7 +135,7 @@ fvdycore:
GEOSchem_GridComp:
local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp
remote: ../GEOSchem_GridComp.git
tag: v1.15.0
tag: v1.16.0
develop: develop

HEMCO:
Expand All @@ -162,6 +162,12 @@ QuickChem:
tag: v1.0.0
develop: main

RRG:
local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@RRG
remote: ../RRG.git
tag: v1.1.0
develop: main

TR:
local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@TR
remote: ../TR.git
Expand All @@ -180,11 +186,41 @@ StratChem:
tag: v1.0.0
develop: develop

MAM:
local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@MAM
remote: ../MAM.git
tag: v1.0.0
develop: main

MATRIX:
local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@MATRIX
remote: ../MATRIX.git
tag: v1.0.0
develop: main

CARMA:
local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@CARMA
remote: ../CARMA.git
tag: v1.1.0
develop: develop

GAAS:
local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GAAS
remote: ../GAAS.git
tag: v1.0.0
develop: develop

ACHEM:
local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@ACHEM
remote: ../ACHEM.git
tag: v1.0.0
develop: develop

GEOS_OceanGridComp:
local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp
remote: ../GEOS_OceanGridComp.git
tag: v2.3.0
develop: develop
tag: v2.7.0
develop: release/v2

mom:
local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MOM_GEOS5PlugMod/@mom
Expand All @@ -195,8 +231,8 @@ mom:
mom6:
local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MOM6_GEOSPlug/@mom6
remote: ../MOM6.git
tag: geos/v3.3
develop: main
tag: geos/v3.7
develop: geos/main
recurse_submodules: true

mit:
Expand Down Expand Up @@ -226,7 +262,7 @@ sis2:
GEOSradiation_GridComp:
local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp
remote: ../GEOSradiation_GridComp.git
tag: v1.10.0
tag: v1.12.0
develop: develop

RRTMGP:
Expand All @@ -239,7 +275,7 @@ RRTMGP:
ww3:
local: ./src/Components/@GEOSgcm_GridComp/GEOSwgcm_GridComp/GEOSwavewatch_GridComp/@ww3
remote: ../WW3.git
tag: v6.07.1-geos-r2
tag: v7.14-geos-r1
develop: geos/develop

umwm:
Expand All @@ -251,7 +287,7 @@ umwm:
GEOSgcm_App:
local: ./src/Applications/@GEOSgcm_App
remote: ../GEOSgcm_App.git
tag: v2.3.8.9
tag: v2.3.8.10
develop: develop

Ocean-LETKF:
Expand Down
31 changes: 19 additions & 12 deletions src/Applications/GEOSdas_App/fvsetup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,10 +1003,10 @@ sub defaults {
DU2G_GridComp_ExtData.rc
DU2G_instance_DU.rc
DU2G_StateSpecs.rc
GEOSachem_ExtData.rc
GEOS_AChemGridComp.rc
GEOS_AChem_History___.rc
GEOSachem_Registry.rc
ACHEM_GridComp.rc
ACHEM_ExtData.rc
ACHEM_History___.rc
ACHEM_Registry.rc
GEOSCHEMCHEM_History___.rc
GEOSCHEMchem_Registry.rc
GEOS_IgniGridComp.rc
Expand All @@ -1029,13 +1029,13 @@ sub defaults {
HEMCO_GridComp.rc
HEMCO_Registry.rc
MAM7_ExtData.rc
MAMchem_GridComp.rc
MAMchem_History___.rc
MAMchem_Registry.rc
mam_optics_calculator.rc
MATRIXchem_GridComp.rc
MATRIXchem_History___.rc
MATRIXchem_Registry.rc
MAM_GridComp.rc
MAM_History___.rc
MAM_Registry.rc
MATRIX_GridComp.rc
MATRIX_History___.rc
MATRIX_Registry.rc
NI2G_GridComp_ExtData.rc
NI2G_instance_NI.rc
NI2G_StateSpecs.rc
Expand All @@ -1055,6 +1055,9 @@ sub defaults {
Rn_GridComp---SoAm.rc
Rn_History___.rc
Rn_Registry.rc
RRG_GridComp_ExtData.rc
RRG_GridComp_ExtData.yaml
RRG_GridComp.rc
SC_GridComp.rc
SC_Mech_Registry.rc
SC_Registry.rc
Expand Down Expand Up @@ -1125,7 +1128,7 @@ sub defaults {
DNA_ExtData.yaml
DU2G_GridComp_ExtData.yaml
GAAS_GridComp_ExtData.yaml
GEOSachem_ExtData.yaml
ACHEM_ExtData.yaml
GMI_ExtData.yaml
HEMCOgmi_ExtData.yaml
HEMCOgocart2g_ExtData.yaml
Expand All @@ -1143,7 +1146,7 @@ sub defaults {
# AMIP/CO2_GridComp_ExtData.yaml
# AMIP/CFC_GridComp_ExtData.yaml
# AMIP/Rn_GridComp_ExtData.yaml
# AMIP/GEOSachem_ExtData.yaml
# AMIP/ACHEM_ExtData.yaml
# AMIP/CH4_GridComp_ExtData.yaml
# AMIP/NI2G_GridComp_ExtData.yaml
# AMIP/SS2G_GridComp_ExtData.yaml
Expand Down Expand Up @@ -10115,6 +10118,8 @@ sub init_agcm_rc {
#------------------
$rats = "PCHEM";
$oanp = "PCHEM";
$ch4p = "none";
$co2p = "none";
if ( $gocart_tracers ) { $aero = "GOCART2G";}
else { $aero = "GOCART.data"; }
if ( $cubed ) {
Expand Down Expand Up @@ -10197,6 +10202,8 @@ sub init_agcm_rc {
AGCM_label_subst("\@RATS_PROVIDER", $rats);
AGCM_label_subst("\@AERO_PROVIDER", $aero);
AGCM_label_subst("\@OANA_PROVIDER", $oanp);
AGCM_label_subst("\@CH4_PROVIDER", $ch4p);
AGCM_label_subst("\@CO2_PROVIDER", $co2p);

AGCM_label_subst("\@PCHEM_CLIM_YEARS", 1);

Expand Down
12 changes: 11 additions & 1 deletion src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/AGCM.rc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ CLOSURE_CONGESTUS: 3
@HIST_GOCARTCA.oc::CA.ocphilic default
@HIST_GOCARTNI::NO3an1 "NI::NO3an2,NI::NO3an3"
@HIST_GOCARTPCHEM::OX default
@HIST_GOCARTNI::NH3 default
@HIST_GOCARTNI::NH4a default
@HIST_GOCART::
@HIST_GOCART###########################################################

Expand Down Expand Up @@ -729,6 +731,10 @@ HEMCO_IMPORT_CHECKPOINT_FILE: hemco_import_checkpoint
#OH_IMPORT_RESTART_FILE: oh_import_rst
#OH_IMPORT_CHECKPOINT_FILE: oh_import_checkpoint

#RRG_INTERNAL_RESTART_FILE: rrg_internal_rst
#RRG_INTERNAL_CHECKPOINT_FILE: rrg_internal_checkpoint
#RRG_INTERNAL_CHECKPOINT_TYPE: @CHECKPOINT_TYPE

# OCEAN Model Restart Files
# -------------------------
SALTWATER_IMPORT_RESTART_FILE: saltwater_import_rst
Expand Down Expand Up @@ -829,6 +835,8 @@ DIURNAL_BIOMASS_BURNING: yes
RATS_PROVIDER: PCHEM # options: PCHEM, GMICHEM, STRATCHEM (Radiatively active tracers)
AERO_PROVIDER: GOCART2G # options: GOCART2G, MAM, none (Radiatively active aerosols)
ANALYSIS_OX_PROVIDER: PCHEM # options: PCHEM, GMICHEM, STRATCHEM, GOCART
CH4_PROVIDER: none # options: GOCART, RRG, none
CO2_PROVIDER: none # options: GOCART, RRG, none


# Flag for real-time forecasts (persisted SST) OGCM_IS_FCST: 1 (AMIP-Style Default: 0)
Expand Down Expand Up @@ -856,7 +864,9 @@ USE_SKIN_LAYER: 1
# Model Tuning Parameters (For CMIP5 recommended SOLAR_CONSTANT and CO2 values, use -1)
# -------------------------------------------------------------------------------------
SOLAR_CONSTANT: -1
CO2: -1
CO2: -1 # CO2 conc to use in RRTMG. -2 will use 3D CO2 imported from CO2_PROVIDER set above. -1 will read from a table. >=0 sets ppmv
RATS_DIAGNOSTICS: # Set one or more LW diagnostic analysis for specific RATS in RRTMG (options: O3 CO2 CH4 N2O CFC11 CFC12 CFC22 CCl4)



# Flags for SATSIM Output
Expand Down
3 changes: 1 addition & 2 deletions src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/CAP.rc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

MAPLROOT_COMPNAME: GCM
ROOT_NAME: GCM
ROOT_NAME: GCM
ROOT_CF: AGCM.rc
HIST_CF: HISTORY.rc

Expand Down