diff --git a/components.yaml b/components.yaml index d59ef7cd..97d328c7 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: @@ -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 @@ -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: @@ -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: 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/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