From 9785ced2642edc2eeb533b46edb6200d9619c4b4 Mon Sep 17 00:00:00 2001 From: Ricardo Todling Date: Wed, 18 Feb 2026 10:35:52 -0500 Subject: [PATCH 1/4] Toward 5.45 --- components.yaml | 54 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/components.yaml b/components.yaml index c7b2f08a..e468ca3b 100644 --- a/components.yaml +++ b/components.yaml @@ -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: @@ -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: @@ -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: @@ -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 @@ -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 @@ -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: @@ -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: @@ -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: From 40a3804176f3ea2f7a9c5960d1e4e3feeb715f58 Mon Sep 17 00:00:00 2001 From: Ricardo Todling Date: Thu, 19 Feb 2026 19:08:13 -0500 Subject: [PATCH 2/4] Zero-diff merge with GCM v11.7.3 --- components.yaml | 6 +- src/Applications/GEOSdas_App/fvsetup | 31 ++- .../GEOSdas_App/testsuites/x0054RPY.input | 246 ++++++++++++++++++ 3 files changed, 268 insertions(+), 15 deletions(-) create mode 100644 src/Applications/GEOSdas_App/testsuites/x0054RPY.input diff --git a/components.yaml b/components.yaml index e468ca3b..ec73e2c2 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSadas: env: local: ./@env remote: ../ESMA_env.git - tag: v4.29.1 + tag: v4.29.1.1 develop: main cmake: @@ -92,13 +92,13 @@ GEOSana_GridComp: mksi: local: ./src/Components/@GEOSana_GridComp/GEOSaana_GridComp/GSI_GridComp/@mksi remote: ../GEOS_mksi.git - tag: v5.43.1 + tag: v5.43.2 develop: develop GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: v2.7.0.2 + tag: v2.7.6 sparse: ./config/GEOSgcm_GridComp.sparse develop: develop diff --git a/src/Applications/GEOSdas_App/fvsetup b/src/Applications/GEOSdas_App/fvsetup index 31b510cb..2405d035 100755 --- a/src/Applications/GEOSdas_App/fvsetup +++ b/src/Applications/GEOSdas_App/fvsetup @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 ) { @@ -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); diff --git a/src/Applications/GEOSdas_App/testsuites/x0054RPY.input b/src/Applications/GEOSdas_App/testsuites/x0054RPY.input new file mode 100644 index 00000000..ece270c2 --- /dev/null +++ b/src/Applications/GEOSdas_App/testsuites/x0054RPY.input @@ -0,0 +1,246 @@ +#------------ +# x0054RPY.input +#------------ + +codeID: 523f29e +description: x0054RPY__GEOSadas-5_44_0__agrid_C360__ogrid_C +fvsetupID: f7aaa973c7 + +---ENDHEADERS--- + +Remote account for Intranet plots? [rtodling@train] +> + +Is this a MERRA2 (1), GEOSIT (2), R21C (3) experiment? [0] +> + +AGCM Horizontal Resolution? [C48] +> C360 + +AGCM Vertical Resolution? [72] +> + +OGCM Resolution? [f] +> C + +EXPID? [u000_C360] +> $expid + +Check for previous use of expid (y/n)? [y] +> n + +EXPDSC? [x0054RPY__GEOSadas-5_44_0__agrid_C360__ogrid_C] +> + +Land Boundary Conditions? [Icarus_Updated] +> Icarus-NLv3 + +Catchment Model choice? [1] +> + +FVHOME? [/discover/nobackup/rtodling/x0054RPY] +> /discover/nobackup/projects/gmao/dadev/rtodling/544/$expid + +The directory /discover/nobackup/projects/gmao/dadev/rtodling/544/x0054RPY already exists. Clean it? [y] +> + +Processing nodes (1:Haswell, 2:Skylake, 3:Cascase, 4:Milan)? [2] +> 4 + +Which case of variational analysis? [1] +> + +Window of the variational analysis (min)? [360] +> + +FVINPUT? [/discover/nobackup/projects/gmao/share/gmao_ops/fvInput_4dvar] +> + +REAL TIME BCS? [/discover/nobackup/projects/gmao/share/gmao_ops/fvInput_4dvar/g5gcm/bcs/realtime/OSTIA_REYNOLDS] +> + +agcmpert? [/discover/nobackup/projects/gmao/share/gmao_ops/fvInput_4dvar/agcmpert] +> + +chemistry? [/discover/nobackup/projects/gmao/share/gmao_ops/fvInput_4dvar/chemistry] +> + +g5chem? [/discover/nobackup/projects/gmao/share/gmao_ops/fvInput_4dvar/g5chem] +> + +g5gcm? [/discover/nobackup/projects/gmao/share/gmao_ops/fvInput_4dvar/g5gcm] +> + +PIESA? [/discover/nobackup/projects/gmao/share/gmao_ops/fvInput_4dvar/PIESA] +> + +MERRA2? [/discover/nobackup/projects/gmao/share/gmao_ops/fvInput_4dvar/MERRA2] +> + +AeroCom? [/discover/nobackup/projects/gmao/share/gmao_ops/fvInput_4dvar/AeroCom] +> + +FVICS? [/archive/u/jstassi/restarts/GEOSadas-5_24_0] +> /discover/nobackup/projects/gmao/dadev/rtodling/archive/Restarts/5_44/c360/rs/Y2025/M11/c360.rst.20251128_21z.tar + +Run model-adjoint-related applications (0=no,1=yes)? [0] +> 1 + +Analysis/Forecast filename template for sensitivity? +> + +Stage the gradient vector files (y/n)? [y] +> + +Run singular vector experiments (0=n,1=yes)? [0] +> + +Run analysis-sensitivity applications (0=no,1=yes)? [0] +> 1 + +Verifying experiment id: [x0054RPY] +> + +Ending year-month-day? [20191121] +> 20260106 + +Length of FORECAST run segments (in hours)? [123] +> + +Number of one-day DAS segments per PBS job? [1] +> + +Number of PEs in the zonal direction (NX)? [10] +> 12 + +Number of PEs in the meridional direction (NY)? [36] +> 48 + +Job nickname? [g5das] +> x54 + +Run in split executable mode (1=yes;0=no)? [1] +> + +Frequency of background fields (min)? [180] +> 60 + +Triangular spectral truncation? [254] +> + +Analysis vertical levels (sig))? [72] +> + +GSI grid resolution? [NA] +> + +GEOS grid resolution instead? [d] +> + +Ensemble Hybrid (<0;3=3dHyb;4=Hyb4d)? [-1] +> 4 + +Number of procs in the zonal direction (NX)? [12] +> 16 + +Number of procs in the meridional direction (NY)? [20] +> 42 + +Which main class of ObsSys (1: NRT; 2: MERRA; 3: MERRA-2; 4: GEOS-IT; 5: R21C)? [1] +> + +OBSERVING SYSTEM CLASSES? +> disc_airs_bufr,gmao_amsr2_bufr,gmao_gmi_bufr,mls_nrt_nc,ncep_1bamua_bufr,ncep_acftpfl_bufr,ncep_atms_bufr,ncep_aura_omi_bufr,ncep_avcsam_bufr,ncep_avcspm_bufr,ncep_crisfsr_bufr,ncep_goesfv_bufr,ncep_gpsro_bufr,ncep_mhs_bufr,ncep_mtiasi_bufr,ncep_prep_bufr,ncep_satwnd_bufr,ncep_ssmis_bufr,ncep_tcvitals,npp_ompsnm_bufr,n21_ompslp_nc,gmao_mlst_bufr,aura_omieff_nc,npp_ompslp_nc,ncep_goescsr_bufr + +CHECKING OBSYSTEM? [2] +> 1 + +Which RADCOR option? [NONE] +> + +Use sat channel-correlated observation errors (y/n)? [y] +> + +Use aircraft bias correction (y/n)? [y] +> + +Use unified radiance bias correction (y/n)? [y] +> + +Land DAS Analysis (y/n)? [n] +> + +Frequency (in days) for writing restarts? [0] +> + +Frequency for PROGNOSTIC fields? [010000] +> + +Frequency for surface (2D) DIAGNOSTIC fields? [010000] +> + +Frequency for upper air (3D) DIAGNOSTIC fields? [030000] +> + +Dimension of output in zonal direction? [1152] +> + +Dimension of output in meridional direction? [721] +> + +Would you like 2D diagnostics? [y] +> + +Would you like 3D diagnostics? [y] +> + +Would you like to compress diagnostics output files? [n] +> + +Include GOCART tracers (CO,CO2,aerosols,etc) (y/n)? [y] +> + +Select GOCART Emission Files to use: [OPS] +> + +Do Aerosol Analysis (y/n)? [y] +> + +AOD OBSERVING CLASSES [or type 'none']? +> mod04_061_flk,myd04_061_flk,aeronet_obs_llk + +Enable GAAS feedback to model (y/n)? [y] +> + +Which template? [HISTORY.rc.tmpl] +> + +Which template? [GCMPROG.rc.tmpl] +> + +Output Restart TYPE (bin or nc4) [nc4] +> + +Select group: [s0818] +> g0613 + +Replayed Ensemble (from OPS)? [yes] +> + +Replay exp name? [x0046d] +> f5421_fpp + +Replay archive directory? [/discover/nobackup/projects/gmao/dadev/rtodling/archive/x0046d] +> /home/dao_ops/f5421_fpp/run/.../archive/ + +Edit COLLECTIONS list in run/HISTORY.rc.tmpl (y/n)? [n] +> + +Edit COLLECTIONS list in fcst/HISTORY.rc.tmpl (y/n)? [n] +> + +Edit files in run directory for CERES configuration (y/n)? [n] +> + +Which? [Q] +> From 0c19fe55fb3bc270524e8368a9c16c8fb708663b Mon Sep 17 00:00:00 2001 From: Ricardo Todling Date: Fri, 20 Feb 2026 10:27:06 -0500 Subject: [PATCH 3/4] merge w/ gcm v11.7.3 --- .../NCEP_Etc/NCEP_enkf/scripts/gmao/etc/AGCM.rc.tmpl | 12 +++++++++++- .../NCEP_Etc/NCEP_enkf/scripts/gmao/etc/CAP.rc.tmpl | 3 +-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/AGCM.rc.tmpl b/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/AGCM.rc.tmpl index 4c558df0..db7732af 100644 --- a/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/AGCM.rc.tmpl +++ b/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/AGCM.rc.tmpl @@ -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########################################################### @@ -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 @@ -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) @@ -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 diff --git a/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/CAP.rc.tmpl b/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/CAP.rc.tmpl index d5148ae3..a0e1483f 100644 --- a/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/CAP.rc.tmpl +++ b/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/CAP.rc.tmpl @@ -1,6 +1,5 @@ -MAPLROOT_COMPNAME: GCM - ROOT_NAME: GCM +ROOT_NAME: GCM ROOT_CF: AGCM.rc HIST_CF: HISTORY.rc From e0b94a71842b9ec3c69dc935ebe577ab213e698d Mon Sep 17 00:00:00 2001 From: Ricardo Todling Date: Fri, 20 Feb 2026 13:10:49 -0500 Subject: [PATCH 4/4] upd for merge between DAS 5.43 and v11.7.3 --- components.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index ec73e2c2..97d328c7 100644 --- a/components.yaml +++ b/components.yaml @@ -98,7 +98,7 @@ mksi: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: v2.7.6 + tag: v2.7.6.1 sparse: ./config/GEOSgcm_GridComp.sparse develop: develop @@ -287,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: