From 380ceb7e81e49968e67d1e1aa4a1d4b53c8b1023 Mon Sep 17 00:00:00 2001 From: Amal El Akkraoui Date: Tue, 26 Mar 2024 16:50:45 -0400 Subject: [PATCH 1/5] GMI fix and bundled updates to support MERRA-21C production --- src/Applications/GEOSdas_App/AGCMrc.pm | 3 +- src/Applications/GEOSdas_App/fvsetup | 3 +- .../GEOSdas_App/write_FVDAS_Run_Config.pl | 4 ++- .../NCEP_enkf/scripts/gmao/etc/AGCM.rc.tmpl | 2 +- .../scripts/gmao/etc/R21C/AtmEnsConfig.csh | 2 +- .../scripts/gmao/etc/R21C/HISTAENS.rc.tmpl | 31 +++++++++---------- 6 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/Applications/GEOSdas_App/AGCMrc.pm b/src/Applications/GEOSdas_App/AGCMrc.pm index 71b82504..c5f9a65e 100644 --- a/src/Applications/GEOSdas_App/AGCMrc.pm +++ b/src/Applications/GEOSdas_App/AGCMrc.pm @@ -83,7 +83,8 @@ my %list = (rs5_core => \@rs5_core, tr_import_rst turb_internal_rst turb_import_rst - gwd_import_rst ); + gwd_import_rst + igni_internal_rst); # warn but do not abort if these restarts are not present @rs5_others = qw ( ana_satbang_rst diff --git a/src/Applications/GEOSdas_App/fvsetup b/src/Applications/GEOSdas_App/fvsetup index 8120181d..5c3dc4f9 100755 --- a/src/Applications/GEOSdas_App/fvsetup +++ b/src/Applications/GEOSdas_App/fvsetup @@ -8959,7 +8959,8 @@ sub write_FVDAS_Run_Config { $ENV{"MKSICN_SIDB"} = "\$FVHOME/run/gmao_convinfo.db" } if ($r21c){ - $ENV{"BUFR_MAXOUT"} = "18000" + $ENV{"BUFR_MAXOUT"} = "18000"; + $ENV{"CRTM_COEFFS"} = "\$FVHOME/fvInput/gsi/etc/r21c_ncep20221018/Little_Endian"; } unless ( $ENV{"ARCHIVE"} ) { diff --git a/src/Applications/GEOSdas_App/write_FVDAS_Run_Config.pl b/src/Applications/GEOSdas_App/write_FVDAS_Run_Config.pl index ebe78850..58be1a4b 100755 --- a/src/Applications/GEOSdas_App/write_FVDAS_Run_Config.pl +++ b/src/Applications/GEOSdas_App/write_FVDAS_Run_Config.pl @@ -26,7 +26,7 @@ $FCHOME, $FCSTAGE, $FERR, $FVDOLMS, $FVGROUP, $FVPLOTS, $FVSCRA, $FVSILO, $FVSPOOL, $FVSTAGE, $FVWORK, $GRADS_CONFIG, $LIBSZ, $MONTHLY_X); my ($ACFTBIAS, $NEWRADBC); -my ($BUFR_MAXOUT); +my ($BUFR_MAXOUT, $CRTM_COEFFS); my (%vv); # main program @@ -100,6 +100,7 @@ sub init { $MKSICN_SIDB = $ENV{"MKSICN_SIDB"}; $NEWRADBC = $ENV{"NEWRADBC"}; $BUFR_MAXOUT = $ENV{"BUFR_MAXOUT"}; + $CRTM_COEFFS = $ENV{"CRTM_COEFFS"}; $MP_SET_NUMTHREADS = $ENV{"MP_SET_NUMTHREADS"}; $NCEPINPUT = $ENV{"NCEPINPUT"}; $OBSCLASS = $ENV{"OBSCLASS"}; @@ -333,6 +334,7 @@ sub writefile { print RUNCONF "setenv MKSIOZ_SIDB $MKSIOZ_SIDB\n" if $MKSIOZ_SIDB; print RUNCONF "setenv MKSICN_SIDB $MKSICN_SIDB\n" if $MKSICN_SIDB; print RUNCONF "setenv BUFR_MAXOUT $BUFR_MAXOUT\n" if $BUFR_MAXOUT; + print RUNCONF "setenv CRTM_COEFFS $CRTM_COEFFS\n" if $CRTM_COEFFS; print RUNCONF "setenv MP_SET_NUMTHREADS $MP_SET_NUMTHREADS\n" if $MP_SET_NUMTHREADS; print RUNCONF "setenv OMP_NUM_THREADS $OMP_NUM_THREADS\n" if $OMP_NUM_THREADS; print RUNCONF "setenv ARCH_QUEUE \"$ARCH_QUEUE\"\n" if $ARCH_QUEUE; 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 df636b8f..b0738a80 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 @@ -746,7 +746,7 @@ USE_RRTMG_IRRAD: 1.0 USE_RRTMG_SORAD: 1.0 ISOLVAR: 2 USE_NRLSSI2: .TRUE. -SOLAR_CYCLE_FILE_NAME: ExtData/g5gcm/solar/NRLSSI2.v2021.txt +SOLAR_CYCLE_FILE_NAME: ExtData/g5gcm/solar/NRLSSI2.v2023.txt NUM_BANDS: 30 diff --git a/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/R21C/AtmEnsConfig.csh b/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/R21C/AtmEnsConfig.csh index 4de9a096..7ca31843 100644 --- a/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/R21C/AtmEnsConfig.csh +++ b/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/R21C/AtmEnsConfig.csh @@ -157,6 +157,6 @@ setenv PEGCM_QNAME $ATMENS_QNAME # NOTES: -setenv OBSCLASS1 "r21c_loon_bufr,r21c_gmao_mlst_bufr,r21c_satwnd_bufr,r21c_ncep_tcvitals,r21c_gpsro_bufr,r21c_sevcsr_bufr,r21c_1bamua_bufr,r21c_1bhrs4_bufr,r21c_1bmhs_bufr,r21c_eosairs_bufr,r21c_eosamsua_bufr,r21c_mtiasi_bufr,r21c_atms_bufr,r21c_mls_nc,r21c_aura_omieff_nc,r21c_npp_ompsnmeff_nc,r21c_avcsam_bufr,r21c_avcspm_bufr,r21c_amsr2_bufr,r21c_crisfsr_bufr,r21c_gmi_bufr,r21c_prep_bufr,r21c_acftpfl_bufr" +setenv OBSCLASS1 "r21c_igra2_raob_pre-qc_bufr,r21c_cdas_conv_pre-qc_bufr,r21c_prof_pre-qc_bufr,r21c_avhrrwnd_pre-qc_bufr,r21c_nmodis_pre-qc_bufr,r21c_goes_pre-qc_prep_bufr,r21c_metsat_pre-qc_prep_bufr,r21c_jma_pre-qc_prep_bufr,r21c_ascat_pre-qc_bufr,r21c_repro_ers2_pre-qc_bufr,r21c_qscat_jpl_pre-qc_bufr,r21c_loon_bufr,r21c_gmao_mlst_bufr,r21c_prep_bufr,r21c_acftpfl_bufr,r21c_satwnd_bufr,r21c_avhrr_satwnd_bufr,r21c_ncep_tcvitals,r21c_tmi_bufr,r21c_gpsro_bufr,r21c_sevcsr_bufr,r21c_1bamua_bufr,r21c_1bamub_bufr,r21c_1bhrs2_bufr,r21c_1bhrs3_bufr,r21c_1bhrs4_bufr,r21c_1bmsu_bufr,r21c_1bmhs_bufr,r21c_1bssu_bufr,r21c_eosairs_bufr,r21c_eosamsua_bufr,r21c_mtiasi_bufr,r21c_atms_bufr,r21c_ssmit11_bufr,r21c_ssmit13_bufr,r21c_ssmit14_bufr,r21c_ssmit15_bufr,r21c_amsre_bufr,r21c_osbuv8_bufr,r21c_mls_nc,r21c_npp_ompslp_nc,r21c_aura_omieff_nc,r21c_npp_ompsnmeff_nc,r21c_avcsam_bufr,r21c_avcspm_bufr,r21c_amsr2_bufr,r21c_crisfsr_bufr,r21c_gmi_bufr,r21c_prep_bufr,r21c_acftpfl_bufr" setenv OBSCLASS "gmao_prep_bufr,gmao_acftpfl_bufr,$OBSCLASS1" diff --git a/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/R21C/HISTAENS.rc.tmpl b/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/R21C/HISTAENS.rc.tmpl index c2a85787..409a24f3 100644 --- a/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/R21C/HISTAENS.rc.tmpl +++ b/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/R21C/HISTAENS.rc.tmpl @@ -32,7 +32,7 @@ COLLECTIONS: 'asm_inst_6hr_glo_L288x181_p48' 'lnd_tavg_6hr_glo_L288x181_slv' 'lfo_tavg_6hr_glo_L288x181_slv' 'glc_tavg_6hr_glo_L288x181_slv' - 'aer_tavg_6hr_glo_L288x181_slv' + 'aer_inst_6hr_glo_L288x181_slv' 'int_inst_6hr_glo_L288x181_slv' 'pbl_inst_6hr_glo_L288x181_z17' 'bkg.eta' @@ -404,21 +404,20 @@ COLLECTIONS: 'asm_inst_6hr_glo_L288x181_p48' 'THV' , 'AGCM' , :: - aer_tavg_6hr_glo_L288x181_slv.format: 'CFIO' , - aer_tavg_6hr_glo_L288x181_slv.descr: '2d,6-Hourly,Time-Averaged,Single-Level,Analysis,Aerosol Diagnostics' , - aer_tavg_6hr_glo_L288x181_slv.nbits: 10 , - aer_tavg_6hr_glo_L288x181_slv.deflate: 2 , - aer_tavg_6hr_glo_L288x181_slv.regrid_method: 'CONSERVE_MONOTONIC' , - aer_tavg_6hr_glo_L288x181_slv.template: '%y4-%m2-%d2T%h2%n2Z.>>>NCSUFFIX<<<' , - aer_tavg_6hr_glo_L288x181_slv.mode: 'time-averaged' , - aer_tavg_6hr_glo_L288x181_slv.grid_label: PC288x181-DC , - aer_tavg_6hr_glo_L288x181_slv.frequency: 060000 , - aer_tavg_6hr_glo_L288x181_slv.duration: 060000 , - aer_tavg_6hr_glo_L288x181_slv.ref_time: 030000 , - aer_tavg_6hr_glo_L288x181_slv.end_date: >>>IOEDATE<<< , - aer_tavg_6hr_glo_L288x181_slv.end_time: >>>IOETIME<<< , - aer_tavg_6hr_glo_L288x181_slv.splitField: 1 , - aer_tavg_6hr_glo_L288x181_slv.fields: 'TOTEXTTAU' , 'GOCART2G' , + aer_inst_6hr_glo_L288x181_slv.format: 'CFIO' , + aer_inst_6hr_glo_L288x181_slv.descr: '2d,6-Hourly,Instantaneous,Single-Level,Analysis,Aerosol Diagnostics' , + aer_inst_6hr_glo_L288x181_slv.nbits: 10 , + aer_inst_6hr_glo_L288x181_slv.deflate: 2 , + aer_inst_6hr_glo_L288x181_slv.regrid_method: 'CONSERVE_MONOTONIC' , + aer_inst_6hr_glo_L288x181_slv.template: '%y4-%m2-%d2T%h2%n2Z.>>>NCSUFFIX<<<' , + aer_inst_6hr_glo_L288x181_slv.mode: 'instantaneous' , + aer_inst_6hr_glo_L288x181_slv.grid_label: PC288x181-DC , + aer_inst_6hr_glo_L288x181_slv.frequency: 060000 , + aer_inst_6hr_glo_L288x181_slv.duration: 060000 , + aer_inst_6hr_glo_L288x181_slv.end_date: >>>IOEDATE<<< , + aer_inst_6hr_glo_L288x181_slv.end_time: >>>IOETIME<<< , + aer_inst_6hr_glo_L288x181_slv.splitField: 1 , + aer_inst_6hr_glo_L288x181_slv.fields: 'TOTEXTTAU' , 'GOCART2G' , 'TOTSCATAU' , 'GOCART2G' , 'TOTANGSTR' , 'GOCART2G' , 'PM25' , 'GOCART2G' , From 0e204bdaedf1bbf315719de8effe6f6b4407fd7f Mon Sep 17 00:00:00 2001 From: elakkraoui <30639129+elakkraoui@users.noreply.github.com> Date: Wed, 27 Mar 2024 08:19:16 -0400 Subject: [PATCH 2/5] Update fvsetup to include GEOS_IgniGridComp.rc file --- src/Applications/GEOSdas_App/fvsetup | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Applications/GEOSdas_App/fvsetup b/src/Applications/GEOSdas_App/fvsetup index 5c3dc4f9..4e0f5d68 100755 --- a/src/Applications/GEOSdas_App/fvsetup +++ b/src/Applications/GEOSdas_App/fvsetup @@ -887,6 +887,7 @@ sub defaults { OBS_GridComp.rc.tmpl saverst.rc GEOS_SurfaceGridComp.rc + GEOS_IgniGridComp.rc logging.yaml ); @coupled_files = qw( data_table From 4e897b0f04bd5d9393765818928f42049d2bd1a5 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com> Date: Thu, 28 Mar 2024 11:28:08 -0400 Subject: [PATCH 3/5] Uptick MAPL tag allowing compressed CS coords --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index f1f987b7..81f12bec 100644 --- a/components.yaml +++ b/components.yaml @@ -40,7 +40,7 @@ GEOS_Util: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.35.3+R21C_v1.0.0 + tag: v2.35.3+R21C_v1.1.0 develop: R21C FMS: From fe5a2708df288fa05605241dcce2d2a243085274 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com> Date: Tue, 2 Apr 2024 13:59:03 -0400 Subject: [PATCH 4/5] Update components.yaml --- components.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components.yaml b/components.yaml index 81f12bec..4194cbc9 100644 --- a/components.yaml +++ b/components.yaml @@ -28,7 +28,7 @@ NCEP_Shared: GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git - tag: v1.7.2+R21C_v1.0.0 + tag: v1.7.2+R21C_v1.0.1 develop: R21C GEOS_Util: @@ -58,9 +58,9 @@ GEOSana_GridComp: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: v1.18.1 + tag: v1.18.1+R21C_v1.0.0 sparse: ./config/GEOSgcm_GridComp.sparse - develop: release/v1 + develop: R21C g5pert: local: ./src/Components/@g5pert @@ -107,7 +107,7 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: v2.1.2+R21C_v1.0.0 + tag: v2.1.2+R21C_v1.0.1 develop: R21C QuickChem: @@ -182,7 +182,7 @@ RRTMGP: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: v1.9.6+R21C_v1.0.0 + tag: v1.9.6+R21C_v1.0.1 develop: R21C Ocean-LETKF: From adea260f1a8441b4124cb0d533f3e39015fabc4c Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com> Date: Tue, 2 Apr 2024 14:07:13 -0400 Subject: [PATCH 5/5] Update GEOSana_GridComp to latest tag --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 4194cbc9..a1c08fcd 100644 --- a/components.yaml +++ b/components.yaml @@ -52,7 +52,7 @@ FMS: GEOSana_GridComp: local: ./src/Components/@GEOSana_GridComp remote: ../GEOSana_GridComp.git - tag: v1.5.5-R21C-1 + tag: v1.5.5-R21C-2 develop: R21C GEOSgcm_GridComp: