add control_c384gdas_wav and control_atmwav tests

tests/default_vars.sh

@@ -190,7 +190,7 @@ elif [[ $MACHINE_ID = jet.* ]]; then
 
   TASKS_dflt=150 ; TPN_dflt=24 ; INPES_dflt=3 ; JNPES_dflt=8
   TASKS_thrd=78  ; TPN_thrd=12 ; INPES_thrd=3 ; JNPES_thrd=4
-  TASKS_c384=480 ; TPN_c384=24 ; INPES_c384=12 ; JNPES_c384=6
+  TASKS_c384=480 ; TPN_c384=12 ; INPES_c384=12 ; JNPES_c384=6
   TASKS_stretch=48 ; TPN_stretch=12 ; INPES_stretch=2 ; JNPES_stretch=4
   TASKS_strnest=96 ; TPN_strnest=12 ; INPES_strnest=2 ; JNPES_strnest=4
 
@@ -242,7 +242,7 @@ elif [[ $MACHINE_ID = gaea.* ]]; then
 
   TASKS_dflt=150 ; TPN_dflt=36 ; INPES_dflt=3 ; JNPES_dflt=8
   TASKS_thrd=78  ; TPN_thrd=18 ; INPES_thrd=3 ; JNPES_thrd=4
-  TASKS_c384=480 ; TPN_c384=36 ; INPES_c384=12 ; JNPES_c384=6
+  TASKS_c384=480 ; TPN_c384=18 ; INPES_c384=12 ; JNPES_c384=6
   TASKS_stretch=48 ; TPN_stretch=18 ; INPES_stretch=2 ; JNPES_stretch=4
   TASKS_strnest=96 ; TPN_strnest=18 ; INPES_strnest=2 ; JNPES_strnest=4
 
@@ -603,15 +603,15 @@ export IAU_DRYMASSFIXER=.false.
 #waves
 export WW3RSTDTHR='12'
 export WW3OUTDTHR='1'
-export WW3OUTPUTTYPE=' '
+export WW3OUTPUTTYPE='1'
 export OUTPARS_WAV="WND HS FP DP PHS PTP PDIR"
 export CPLILINE='$'
 export ICELINE='$'
 export WINDLINE='$'
 export CURRLINE='$'
 export NFGRIDS=0
 export NMGRIDS=1
-export ww3gline="'glo_30m'  'no' 'no' 'CPL:native' 'no' 'no' 'no' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export ww3gline="'glo_1deg'  'no' 'no' 'CPL:native' 'no' 'no' 'no' 'no' 'no' 'no'   1  1  0.00 1.00  F"
 
 # Regional
 export WRITE_RESTART_WITH_BCS=.false.

tests/fv3_conf/fv3_slurm.IN_gaea

@@ -5,7 +5,8 @@
 #SBATCH --account=@[ACCNR]
 #SBATCH --qos=@[QUEUE]
 #SBATCH --clusters=@[PARTITION]
-#SBATCH --ntasks=@[TASKS]
+#SBATCH --nodes=@[NODES]
+#SBATCH --ntasks-per-node=@[TPN]
 #SBATCH --time=@[WLCLK]
 
 set -eux
@@ -28,7 +29,7 @@ export NC_BLKSZ=1M
 # Avoid job errors because of filesystem synchronization delays
 sync && sleep 1
 
-srun ./fv3.exe
+srun --label -n @[TASKS] ./fv3.exe
 
 echo "Model ended:    " `date`
 echo -n " $( date +%s )," >> job_timestamp.txt

tests/parm/control_gdas.nml.IN

@@ -191,7 +191,7 @@ deflate_level=1
   prautco      = 0.00015,0.00015
   lgfdlmprad   = .true.
   effr_in      = .true.
-  cplwav       = .false.
+  cplwav       = @[CPLWAV]
   ldiag_ugwp   = .false.
   do_ugwp      = .false.
   do_tofd      = .true.

tests/parm/nems.configure.leapfrog_atm_wav.IN

@@ -0,0 +1,35 @@
+#############################################
+####  NEMS Run-Time Configuration File  #####
+#############################################
+
+# EARTH #
+EARTH_component_list: ATM WAV
+EARTH_attributes::
+  Verbosity = 0
+::
+
+# ATM #
+ATM_model:                      @[atm_model]
+ATM_petlist_bounds:             @[atm_petlist_bounds]
+ATM_attributes::
+  Verbosity = 0
+  DumpFields = false
+::
+
+# WAV #
+WAV_model:                      @[wav_model]
+WAV_petlist_bounds:             @[wav_petlist_bounds]
+WAV_attributes::
+  Verbosity = 0
+::
+
+
+
+# Run Sequence #
+runSeq::
+  @@[coupling_interval_sec]
+    ATM
+    ATM -> WAV 
+    WAV
+  @
+::

tests/rt.conf

@@ -45,7 +45,7 @@ RUN     | control_CubedSphereGrid
 RUN     | control_wrtGauss_netcdf_parallel                                                                                        |                                         | fv3 |
 RUN     | control_c192                                                                                                            |                                         | fv3 |
 RUN     | control_c384                                                                                                            | - gaea.intel wcoss_cray                 | fv3 |
-RUN     | control_c384gdas                                                                                                        | - gaea.intel wcoss_cray                 | fv3 |
+RUN     | control_c384gdas                                                                                                        | - wcoss_cray                            | fv3 |
 RUN     | control_stochy                                                                                                          |                                         | fv3 |
 RUN     | control_stochy_restart                                                                                                  |                                         |     | control_stochy
 RUN     | control_ca                                                                                                              |                                         | fv3 |
@@ -188,12 +188,14 @@ RUN     | datm_cdeps_debug_cfsr
 # ATM-WAV tests                                                                                                                                                                   #
 ###################################################################################################################################################################################
 
-COMPILE | -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v16                                                                                    | - wcoss_cray                            | fv3 |
-RUN     | control_atmwav                                                                                                          | - wcoss_cray                            | fv3 |
+COMPILE | -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON                                                                          | - wcoss_cray                              | fv3 |
+RUN     | control_atmwav                                                                                                        | - wcoss_cray                              | fv3 |
+RUN     | control_c384gdas_wav                                                                                                  | - wcoss_cray -jet.intel                   | fv3 |
 
 ###################################################################################################################################################################################
 # ATM-GOCART tests                                                                                                                                                                #
 ###################################################################################################################################################################################
 
 COMPILE | -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v16                                                                               | + hera.intel                              | fv3 |
 RUN     | control_atm_aerosols                                                                                                  | + hera.intel                              | fv3 |
+

tests/rt.sh

@@ -239,7 +239,7 @@ elif [[ $MACHINE_ID = hera.* ]]; then
   module load ecflow
   ECFLOW_START=ecflow_start.sh
 
-  QUEUE=debug
+  QUEUE=batch 
   COMPILE_QUEUE=batch
 
   #ACCNR=fv3-cpu
@@ -415,15 +415,15 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20210727
+BL_DATE=20210729
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}}
 fi
 
 INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20210717}
-INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20210503
+INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20210621
 INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC:-$DISKNM/NEMSfv3gfs/BM_IC-20210717}
 
 shift $((OPTIND-1))

tests/tests/control_atmwav

@@ -47,7 +47,8 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/sfc_data.tile3.nc \
                    RESTART/sfc_data.tile4.nc \
                    RESTART/sfc_data.tile5.nc \
-                   RESTART/sfc_data.tile6.nc"
+                   RESTART/sfc_data.tile6.nc \
+                   20210322.180000.restart.glo_1deg"
 
 export_fv3
 export NPZ=127
@@ -65,6 +66,8 @@ export IAER=5111
 export TASKS=232
 export WLCLK=30
 export FHMAX=12
+#wave
+export WW3RSTDTHR=3
 
 export CPL=.true.
 export CPLWAV=.T.

tests/tests/control_c384gdas_wav

@@ -0,0 +1,132 @@
+###############################################################################
+#
+#  Global control test: GFSv16 gdas ensemble forecast case
+#
+###############################################################################
+
+export TEST_DESCR="Compare global c384gdas_wave results with previous trunk version"
+
+export CNTL_DIR=control_c384gdas_wav
+
+export LIST_FILES="sfcf000.nc \
+                   sfcf003.nc \
+                   atmf000.nc \
+                   atmf003.nc \
+                   GFSFLX.GrbF00 \
+                   GFSFLX.GrbF03 \
+                   GFSPRS.GrbF00 \
+                   GFSPRS.GrbF03 \
+                   RESTART/coupler.res \
+                   RESTART/fv_core.res.nc \
+                   RESTART/fv_core.res.tile1.nc \
+                   RESTART/fv_core.res.tile2.nc \
+                   RESTART/fv_core.res.tile3.nc \
+                   RESTART/fv_core.res.tile4.nc \
+                   RESTART/fv_core.res.tile5.nc \
+                   RESTART/fv_core.res.tile6.nc \
+                   RESTART/fv_srf_wnd.res.tile1.nc \
+                   RESTART/fv_srf_wnd.res.tile2.nc \
+                   RESTART/fv_srf_wnd.res.tile3.nc \
+                   RESTART/fv_srf_wnd.res.tile4.nc \
+                   RESTART/fv_srf_wnd.res.tile5.nc \
+                   RESTART/fv_srf_wnd.res.tile6.nc \
+                   RESTART/fv_tracer.res.tile1.nc \
+                   RESTART/fv_tracer.res.tile2.nc \
+                   RESTART/fv_tracer.res.tile3.nc \
+                   RESTART/fv_tracer.res.tile4.nc \
+                   RESTART/fv_tracer.res.tile5.nc \
+                   RESTART/fv_tracer.res.tile6.nc \
+                   RESTART/phy_data.tile1.nc \
+                   RESTART/phy_data.tile2.nc \
+                   RESTART/phy_data.tile3.nc \
+                   RESTART/phy_data.tile4.nc \
+                   RESTART/phy_data.tile5.nc \
+                   RESTART/phy_data.tile6.nc \
+                   RESTART/sfc_data.tile1.nc \
+                   RESTART/sfc_data.tile2.nc \
+                   RESTART/sfc_data.tile3.nc \
+                   RESTART/sfc_data.tile4.nc \
+                   RESTART/sfc_data.tile5.nc \
+                   RESTART/sfc_data.tile6.nc \
+                   20210322.030000.restart.aoc_9km \
+                   20210322.030000.restart.gnh_10m \
+                   20210322.030000.restart.gsh_15m"
+
+export_fv3
+
+export TASKS=552
+if [[ $MACHINE_ID = cheyenne.* ]]; then
+  export TPN=12
+elif [[ $MACHINE_ID = hera.* ]]; then
+  export TPN=20
+  export THRD=2
+elif [[ $MACHINE_ID = wcoss_cray ]]; then
+  export TPN=6
+else
+  export TPN=12
+fi
+
+
+export INPES=6
+export JNPES=8
+export WRITE_GROUP=1
+export WRTTASK_PER_GROUP=24
+export FHMAX=9
+export NPZ=127
+export NPZP=128
+export NPX=385
+export NPY=385
+export DT_ATMOS=225
+
+export SYEAR=2021
+export SMONTH=03
+export SDAY=21
+export SHOUR=18
+export FHROT=3
+export FDIAG=3
+export NFHMAX_HF=0
+export IAU_OFFSET=6
+export CDMBWD=${CDMBWD_c384}
+export OUTPUT_GRID='gaussian_grid'
+export WRITE_DOPOST=.true.
+export IMO=1536
+export JMO=768
+
+export WARM_START=.true.
+export NGGPS_IC=.false.
+export EXTERNAL_IC=.false.
+export MAKE_NH=.false.
+export MOUNTAIN=.true.
+export NA_INIT=0
+export IAU_INC_FILES="'fv_increment3.nc','fv_increment6.nc','fv_increment9.nc'"
+export MODEL_INITIALIZATION=true
+export WLCLK=30
+
+export FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
+export FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
+export FNSOTC="'global_soiltype.statsgo.t766.1536.768.rg.grb',"
+export FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"
+
+export CPL=.true.
+export CPLWAV=.true.
+export CPLWAV=.T.
+export NEMS_CONFIGURE="nems.configure.leapfrog_atm_wav.IN"
+export atm_model='fv3'
+export atm_petlist_bounds="0 311"
+export wav_model='ww3'
+export wav_petlist_bounds="312 551"
+export WW3OUTPUTTYPE=' 1'
+export coupling_interval_sec=1800.0  #coupling time step, want it to be multiple of 1800 and FV3 time step
+#wave
+export WW3RSTDTHR=9
+export NFGRIDS=1
+export NMGRIDS=3
+export CPLILINE="'glo_15mxt'  F F T F F F F F F"
+export ww3gline="'gnh_10m' 'no' 'no' 'CPL:glo_15mxt' 'no'  'no' 'no' 'no' 'no' 'no' 1 10  0.00 1.00  F\n"
+export ww3gline="${ww3gline}'gsh_15m' 'no' 'no' 'CPL:glo_15mxt' 'no'  'no' 'no' 'no' 'no' 'no' 2 20  0.00 1.00  F\n"
+export ww3gline="${ww3gline}'aoc_9km' 'no' 'no' 'CPL:glo_15mxt' 'no'  'no' 'no' 'no' 'no' 'no' 3 30  0.00 1.00  F"
+
+export MODEL_INITIALIZATION=true
+export FV3_RUN=control_run.IN
+export CCPP_SUITE=FV3_GFS_v16
+export INPUT_NML=control_gdas.nml.IN