From 53cb06aa838952eb7f61e96289f365228b263142 Mon Sep 17 00:00:00 2001 From: saraqzhang Date: Wed, 14 Feb 2024 22:40:37 -0500 Subject: [PATCH] Revert " update fvsetup for ladas setup and add x3dvar_ladas.input to testsuites/" This reverts commit a3f90103aade247b14f0cc1182afbc5077bc0627. reverting commit a3f9010 --- src/Applications/GEOSdas_App/fvsetup | 27 +- .../GEOSdas_App/testsuites/x3dvar_ladas.input | 237 ------------------ 2 files changed, 17 insertions(+), 247 deletions(-) delete mode 100644 src/Applications/GEOSdas_App/testsuites/x3dvar_ladas.input diff --git a/src/Applications/GEOSdas_App/fvsetup b/src/Applications/GEOSdas_App/fvsetup index 9cf99e08..640d212b 100755 --- a/src/Applications/GEOSdas_App/fvsetup +++ b/src/Applications/GEOSdas_App/fvsetup @@ -340,7 +340,6 @@ # 26May2017 Sienkiewicz Additions for new radiance bias correction # 25Jul2017 Holdaway Added resource files associated with NGGPS FV3 tlm/adjoint, sens and svec # 19Jul2018 Wargan Additions for OMPS -# 2022,2024 sqz Additions for LADAS #------------------------------------------------------------------------- use Cwd qw(abs_path cwd); use English; @@ -3518,8 +3517,8 @@ sub set_ldasANA { $ldasfdbk = 0; $ldas_flag = 0; $dflt = "n"; - $ldashome = "${fvhome}_LDAS" ; - $ldashome4ens = "${fvhome}_LDAS4ens" ; + $ldashome = "NULL" ; + $ldashome4ens = "NULL" ; print "\n-------------\n"; print "LDAS Analysis\n"; @@ -3536,11 +3535,11 @@ sub set_ldasANA { $ldas_flag = 1; } - $ans3 = query(" LDAS HOME? [DEFAULT: $ldashome]"); - $ldashome = $ans3 unless blank($ans3); + $ans3 = query("LDAS HOME = ${fvhome}_LDAS , full path? ", $ldashome); + $ldashome = $ans3 ; - $ans4 = query(" LDAS HOME for atmens? [DEFAULT: $ldashome4ens]"); - $ldashome4ens = $ans4 unless blank($ans4); + $ans4 = query("LDAS HOME for land ensemble = ${fvhome}_LDAS/run/atmens, full path? ", $ldashome4ens); + $ldashome4ens = $ans4 ; } return 0; @@ -4488,20 +4487,28 @@ sub get_history { $g5hist_rc = query(" Which template?", $g5hist_rc); } - # check that HISTORY.rc.tmpl has collections needed by LDAS + # verify that HISTORY.rc.tmpl has collections needed by LDAS #----------------------------------------------------------- if ( $ldas_ana == 1 ) { - @ldasinputs = qw / tavg1_2d_lfo_Nx+- inst1_2d_lfo_Nx+- /; + $verify = 0; + @ldasinputs = qw / tavg1_2d_lfo inst1_2d_lfo /; foreach $prod ( @ldasinputs ) { open HIST, "< $fvroot/etc/$g5hist_rc"; - @f= grep /$prod/, ; unless ( grep /$prod/, ) { print "\n Required Land DAS inputs: @ldasinputs\n" unless ($verify); print " >>> WARNING <<< $prod not defined in $g5hist_rc\n"; + $verify = 1; close HIST; } } + if ($verify) { + print "\n" + . " 1. Use $g5hist_rc anyway\n" + . " 2. Select again\n\n"; + $ans = query(" Choose option 1 or 2:", "2"); + return 1 unless $ans eq "1"; + } } print " Using HISTORY template: $g5hist_rc\n"; diff --git a/src/Applications/GEOSdas_App/testsuites/x3dvar_ladas.input b/src/Applications/GEOSdas_App/testsuites/x3dvar_ladas.input deleted file mode 100644 index cb7a52be..00000000 --- a/src/Applications/GEOSdas_App/testsuites/x3dvar_ladas.input +++ /dev/null @@ -1,237 +0,0 @@ -#--------------- -# x3dvar_ladas.input -#--------------- - -codeID: d8777e4 -description: x3dvar_ladas__agrid_C180__ogrid_C -fvsetupID: 66ad870448 - ----ENDHEADERS--- - -Remote account for Intranet plots? [qzhang@train] -> - -Is this a MERRA2 (1), GEOSIT (2), R21C (3) experiment? [0] -> - -AGCM Horizontal Resolution? [C48] -> C180 - -AGCM Vertical Resolution? [72] -> - -OGCM Resolution? [f] -> C - -EXPID? [u000_C180] -> $expid - -Check for previous use of expid (y/n)? [y] -> n - -EXPDSC? [x3dvar_ladas__agrid_C180__ogrid_C] -> - -Land Boundary Conditions? [Icarus_Updated] -> Icarus-NLv3 - -Catchment Model choice? [1] -> - -FVHOME? [/discover/nobackup/qzhang/x3dvar_ladas] -> /discover/nobackup/qzhang/x3dvar_ladas - -The directory /discover/nobackup/qzhang/x3dvar does not exist. Create it now? [y] -> - -Processing nodes (1:Westmere, 2:SandyBridge, 3:Ivy Bridge, 4:Haswell, 5:Skylake, 6:Cascase)? [4] -> 5 - -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] -> /home/dao_ops/d5294_geosit_jan18/run/.../archive/rs/Y2022/M04/d5294_geosit_jan18.rst.20220428_21z.tar - -Run model-adjoint-related applications (0=no,1=yes)? [0] -> - -Run analysis-sensitivity applications (0=no,1=yes)? [0] -> - -Ending year-month-day? [20220425] -> 20220429 - -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)? [8] -> - -Number of PEs in the meridional direction (NY)? [48] -> - -Job nickname? [g5das] -> - -Run in split executable mode (1=yes;0=no)? [1] -> - -Frequency of background fields (min)? [180] -> - -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] -> - -Number of procs in the zonal direction (NX)? [12] -> - -Number of procs in the meridional direction (NY)? [20] -> - -Which main class of ObsSys (1: NRT; 2: MERRA; 3: MERRA-2; 4: GEOS-IT; 5: R21C)? [1] -> - -OBSERVING SYSTEM CLASSES? -> disc_airs_bufr,disc_amsua_bufr,mls_nrt_nc,ncep_1bamua_bufr,ncep_1bhrs4_bufr,ncep_acftpfl_bufr,ncep_atms_bufr,ncep_aura_omi_bufr,ncep_avcsam_bufr,ncep_avcspm_bufr,ncep_crisfsr_bufr,ncep_gpsro_bufr,ncep_mhs_bufr,ncep_mtiasi_bufr,ncep_prep_bufr,ncep_satwnd_bufr,ncep_sevcsr_bufr,ncep_ssmis_bufr,ncep_tcvitals,npp_ompsnm_bufr - -CHECKING OBSYSTEM? [2] -> 2 - -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] -> y - -Enable LDAS feedback to model y/n ? [n] -> y - -LDAS HOME ? [default: /discover/nobackup/qzhang/x3dvar_ladas_LDAS] -> - -LDAS HOME for atmens ? [default: /discover/nobackup/qzhang/x3dvar_ladas_LDAS4ens] -> - -Frequency (in days) for writing restarts? [0] -> - -Frequency for PROGNOSTIC fields? [030000] -> - -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']? -> - -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: [g2538] -> - -Continue without missing resource files? [y] -> - -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] ->