From 88f501fd077022a49c3bd256105b6071cac7112b Mon Sep 17 00:00:00 2001 From: "Ming.Hu" Date: Tue, 1 Mar 2022 20:02:00 +0000 Subject: [PATCH] Update system for running on WCOSS P3. --- scripts/exregional_run_analysis.sh | 8 ++++---- ush/config.sh.RRFS_CONUS_3km | 14 +++++++++++--- ush/config.sh.RRFS_NA_3km | 6 ------ ush/set_rrfs_config.sh | 3 +++ ush/templates/FV3LAM_wflow.xml | 5 +++-- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/scripts/exregional_run_analysis.sh b/scripts/exregional_run_analysis.sh index 960f49762..6c0436bdb 100755 --- a/scripts/exregional_run_analysis.sh +++ b/scripts/exregional_run_analysis.sh @@ -82,7 +82,7 @@ case $MACHINE in module list ulimit -s unlimited ulimit -a - APRUN="mpirun -l -np ${PE_MEMBER01}" + APRUN="mpirun -l" ;; # "WCOSS_DELL_P3") @@ -91,7 +91,7 @@ case $MACHINE in module list ulimit -s unlimited ulimit -a - APRUN="mpirun -l -np ${PE_MEMBER01}" + APRUN="mpirun -l" ;; # "THEIA") @@ -99,7 +99,7 @@ case $MACHINE in ulimit -s unlimited ulimit -a np=${SLURM_NTASKS} - APRUN="mpirun -np ${np}" + APRUN="mpirun" ;; # "HERA") @@ -132,7 +132,7 @@ case $MACHINE in ulimit -s unlimited ulimit -a - APRUN="srun -n ${PE_MEMBER01}" + APRUN="srun" ;; # esac diff --git a/ush/config.sh.RRFS_CONUS_3km b/ush/config.sh.RRFS_CONUS_3km index 3923b3992..6d39a1ec4 100644 --- a/ush/config.sh.RRFS_CONUS_3km +++ b/ush/config.sh.RRFS_CONUS_3km @@ -19,11 +19,19 @@ if [[ $MACHINE == "hera" ]] ; then PARTITION_FCST="" QUEUE_ANALYSIS="batch" fi + if [[ $MACHINE == "orion" ]] ; then ACCOUNT=ztrr QUEUE_ANALYSIS="batch" fi +if [[ $MACHINE == "wcoss_dell_p3" ]] ; then + ACCOUNT=HRRR-T2O + QUEUE_ANALYSIS="dev" + QUEUE_HPSS="dev" + QUEUE_WGRIB2="dev" +fi + VERBOSE="TRUE" RUN_ENVIR="nco" @@ -35,11 +43,11 @@ TILE_LABELS="CONUS REGIONS" TILE_SETS="full NE,NC,NW,SE,SC,SW" DO_DACYCLE="TRUE" -#DO_SURFACE_CYCLE="TRUE" +DO_SURFACE_CYCLE="TRUE" DO_SPINUP="TRUE" DO_RETRO="TRUE" -DO_NONVAR_CLDANAL="TRUE" -DO_REFL2TTEN="TRUE" +DO_NONVAR_CLDANAL="FALSE" +DO_REFL2TTEN="FALSE" RADARREFL_TIMELEVEL=(0 15 30 45) FH_DFI_RADAR="0.0,0.25,0.5" diff --git a/ush/config.sh.RRFS_NA_3km b/ush/config.sh.RRFS_NA_3km index e79d55171..003ff70f3 100644 --- a/ush/config.sh.RRFS_NA_3km +++ b/ush/config.sh.RRFS_NA_3km @@ -166,9 +166,3 @@ COMINgfs="" STMP="/lfs4/BMC/nrtrr/NCO_dirs/stmp" # Path to directory STMP that mostly contains input files. PTMP="/lfs4/BMC/nrtrr/NCO_dirs/ptmp" # Path to directory STMP that mostly contains input files. NWGES="/lfs4/BMC/nrtrr/NCO_dirs/nwges" # Path to directory NWGES that save boundary, cold initial, restart files - -if [[ $MACHINE == "WCOSS_DELL_P3" ]] ; then -STMP="/gpfs/dell1/ptmp/Shun.Liu/stmp" # Path to directory STMP that mostly contains input file -PTMP="/gpfs/dell1/ptmp/Shun.Liu/ptmp" # Path to directory STMP that mostly contains input files. -NWGES="/gpfs/dell1/ptmp/Shun.Liu/nwges" # Path to directory NWGES that save boundary, cold initial, restart files -fi diff --git a/ush/set_rrfs_config.sh b/ush/set_rrfs_config.sh index eed3708d4..4397f4b17 100644 --- a/ush/set_rrfs_config.sh +++ b/ush/set_rrfs_config.sh @@ -22,8 +22,11 @@ if [[ $MACHINE == "hera" ]] ; then fi if [[ $MACHINE == "wcoss_dell_p3" ]] ; then + EXTRN_MDL_SOURCE_BASEDIR_ICS=/gpfs/dell1/nco/ops/com/gfs/prod + EXTRN_MDL_SOURCE_BASEDIR_LBCS=/gpfs/dell1/nco/ops/com/gfs/prod OBSPATH=/gpfs/hps/nco/ops/com/rap/prod OBSPATH_NSSLMOSIAC=/gpfs/dell1/nco/ops/dcom/prod/ldmdata/obs/upperair/mrms/conus + ENKF_FCST=/gpfs/dell1/nco/ops/com/gfs/prod SST_ROOT=/gpfs/dell1/nco/ops/com/gfs/prod fi diff --git a/ush/templates/FV3LAM_wflow.xml b/ush/templates/FV3LAM_wflow.xml index faaf32477..1ef9c90f0 100644 --- a/ush/templates/FV3LAM_wflow.xml +++ b/ush/templates/FV3LAM_wflow.xml @@ -421,9 +421,9 @@ MODULES_RUN_TASK_FP script. {%- for h in range(extrn_mdl_lbcs_offset_hrs, boundary_len_hrs+extrn_mdl_lbcs_offset_hrs+1, bc_update_interval) %} {%- if machine in ["WCOSS_DELL_P3", "WCOSS_CRAY"] %} - {{ extrn_mdl_sysbasedir_ics }}/gfs.@Y@m@d/@H/atmos/gfs.t@Hz.pgrb2.0p25.f{{ "%03d" % h }} + {{ extrn_mdl_sysbasedir_ics }}/gfs.@Y@m@d/@H/atmos/gfs.t@Hz.pgrb2.0p25.f{{ "%03d" % h }} {%- elif machine in ["ORION"] %} - {{ extrn_mdl_sysbasedir_ics }}/gdas.@Y@m@d/@H/atmos/gdas.t@Hz.atmf{{ "%03d" % h }}.nc + {{ extrn_mdl_sysbasedir_ics }}/gdas.@Y@m@d/@H/atmos/gdas.t@Hz.atmf{{ "%03d" % h }}.nc {%- else %} {%- if extrn_mdl_name_lbcs in ["GEFS"] %} {{ extrn_mdl_sysbasedir_lbcs }}/#subdirGE#/@y@j@H000{{ "%03d" % h }} @@ -1277,6 +1277,7 @@ MODULES_RUN_TASK_FP script. LOGDIR&LOGDIR; CDATE@Y@m@d@H NWGES_BASEDIR&NWGES_BASEDIR; + SLASH_ENSMEM_SUBDIR