diff --git a/components.yaml b/components.yaml index 68640052..c7b2f08a 100644 --- a/components.yaml +++ b/components.yaml @@ -86,7 +86,7 @@ FMS: GEOSana_GridComp: local: ./src/Components/@GEOSana_GridComp remote: ../GEOSana_GridComp.git - tag: v5.42.9 + tag: v5.45.1 develop: develop mksi: @@ -117,7 +117,7 @@ g5pert: GEOSagcmPert_GridComp: local: ./src/Components/@GEOSagcmPert_GridComp remote: ../GEOSagcmPert_GridComp.git - tag: v5.41.2 + tag: v5.43.0 develop: main FVdycoreCubed_GridComp: @@ -251,7 +251,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: v2.3.8.8 + tag: v2.3.8.9 develop: develop Ocean-LETKF: diff --git a/src/Applications/GEOSdas_App/monthly_setup.pl b/src/Applications/GEOSdas_App/monthly_setup.pl index e98bb073..08641cc6 100755 --- a/src/Applications/GEOSdas_App/monthly_setup.pl +++ b/src/Applications/GEOSdas_App/monthly_setup.pl @@ -178,8 +178,8 @@ sub write_plotfiles { $outfil = "$run_mp_dir/plot/gcm_plot.tmpl"; %values = (); - $values{"\@PLOT_T"} = "12:00:00"; - $values{"\@PLOT_P"} = "SBATCH --nodes=4"; + $values{"\@PLOT_T"} = "18:00:00"; + $values{"\@PLOT_P"} = "SBATCH --nodes=2"; $values{"\@PLOT_Q"} = "SBATCH --constraint=$thisnode"; $values{"\@BATCH_GROUP"} = "SBATCH --account=$GID"; $values{"\@SITE"} = uc($siteID); diff --git a/src/Applications/GEOSdas_App/testsuites/C48f.input b/src/Applications/GEOSdas_App/testsuites/C48f.input index f51d7f1b..bcc4451d 100644 --- a/src/Applications/GEOSdas_App/testsuites/C48f.input +++ b/src/Applications/GEOSdas_App/testsuites/C48f.input @@ -36,6 +36,9 @@ EXPDSC? [C48f__GEOSadas-5_30_0__agrid_C48__ogrid_f34] Land Boundary Conditions? [Icarus_Updated] > +Catchment Model choice? [1] +> + FVHOME? [/discover/nobackup/jstassi/C48f] > @@ -43,7 +46,7 @@ The directory /discover/nobackup/jstassi/C48f does not exist. Create it now? [y] > Processing nodes (1:Haswell, 2:Skylake, 3:Cascase, 4:Milan)? [2] -> +> 4 Which case of variational analysis? [1] > diff --git a/src/Applications/GEOSdas_App/testsuites/C90C.input b/src/Applications/GEOSdas_App/testsuites/C90C.input index 3f780c95..435eb6a3 100644 --- a/src/Applications/GEOSdas_App/testsuites/C90C.input +++ b/src/Applications/GEOSdas_App/testsuites/C90C.input @@ -35,6 +35,9 @@ EXPDSC? [C90C__GEOSadas-5_30_0__agrid_C90__ogrid_CS] Land Boundary Conditions? [Icarus_Updated] > Icarus-NLv3 +Catchment Model choice? [1] +> + FVHOME? [/discover/nobackup/jstassi/C90C] > @@ -42,7 +45,8 @@ The directory /discover/nobackup/jstassi/C90C does not exist. Create it now? [y] > Processing nodes (1:Haswell, 2:Skylake, 3:Cascase, 4:Milan)? [2] -> +> 4 + Which case of variational analysis? [1] > diff --git a/src/Applications/GEOSdas_App/testsuites/x0053RPY.input b/src/Applications/GEOSdas_App/testsuites/x0053RPY.input new file mode 100644 index 00000000..690a4f1e --- /dev/null +++ b/src/Applications/GEOSdas_App/testsuites/x0053RPY.input @@ -0,0 +1,246 @@ +#------------ +# x0053RPY.input +#------------ + +codeID: 523f29e +description: x0053RPY__GEOSadas-5_43_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? [x0053RPY__GEOSadas-5_43_0__agrid_C360__ogrid_C] +> + +Land Boundary Conditions? [Icarus_Updated] +> Icarus-NLv3 + +Catchment Model choice? [1] +> + +FVHOME? [/discover/nobackup/rtodling/x0053RPY] +> /discover/nobackup/projects/gmao/dadev/rtodling/543/$expid + +The directory /discover/nobackup/projects/gmao/dadev/rtodling/543/x0053RPY 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_42/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: [x0053RPY] +> + +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] +> x53 + +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 + +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] +> diff --git a/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/HISTAENS.rc.tmpl b/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/HISTAENS.rc.tmpl index c7b918c4..3f48359c 100644 --- a/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/HISTAENS.rc.tmpl +++ b/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/HISTAENS.rc.tmpl @@ -335,9 +335,9 @@ COLLECTIONS: 'bkg.eta' 'RH2' , 'MOIST' , 'RH' , 'AIRDENS' , 'CHEMENV' , # Dust - 'DU' , 'DU' , + 'DU' , 'DU' , 'DU001;DU002;DU003;DU004;DU005' , # Sea-salt - 'SS' , 'SS' , + 'SS' , 'SS' , 'SS001;SS002;SS003;SS004;SS005' , # Sulfates 'DMS' , 'SU' , 'SO2' , 'SU' , diff --git a/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/obs1gsi_mean.rc b/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/obs1gsi_mean.rc index 6c586045..5805af32 100644 --- a/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/obs1gsi_mean.rc +++ b/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/obs1gsi_mean.rc @@ -59,7 +59,7 @@ / &OBSQC dfact=0.75,dfact1=3.0,noiqc=.false.,oberrflg=.true.,c_varqc=0.02,blacklst=.true., - use_poq7=.true.,qc_noirjaco3=.false.,qc_satwnds=.false.,cld_det_dec2bin=.true., + use_poq7=.true.,qc_noirjaco3=.false.,qc_satwnds=.true.,cld_det_dec2bin=.true., half_goesr_err=.false., ! tcp_ermin=0.75,tcp_ermax=0.75, >>>AIRCFT_BIAS<<< diff --git a/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/obs1gsi_member.rc b/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/obs1gsi_member.rc index 0212f781..5eff8e52 100644 --- a/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/obs1gsi_member.rc +++ b/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/obs1gsi_member.rc @@ -59,7 +59,7 @@ / &OBSQC dfact=0.75,dfact1=3.0,noiqc=.false.,oberrflg=.true.,c_varqc=0.02,blacklst=.true., - use_poq7=.true.,qc_noirjaco3=.false.,qc_satwnds=.false.,cld_det_dec2bin=.true., + use_poq7=.true.,qc_noirjaco3=.false.,qc_satwnds=.true.,cld_det_dec2bin=.true., half_goesr_err=.false., ! tcp_ermin=0.75,tcp_ermax=0.75, >>>AIRCFT_BIAS<<<