DusanJovic-NOAA · DusanJovic-NOAA · Jan 15, 2020 · Dec 22, 2019 · Dec 22, 2019 · Dec 22, 2019
diff --git a/WW3 b/WW3
diff --git a/compsets/all.input b/compsets/all.input
@@ -22,7 +22,7 @@ run fv3_wrtGauss_netcdf_esmf    @ fv3, standard, baseline
 run fv3_wrtGauss_netcdf         @ fv3, standard, baseline
 run fv3_wrtGauss_nemsio         @ fv3, standard, baseline
 
-run fv3_wrtGauss_nemsio_c768    @ fv3,           baseline, ww3, plat==hera.intel, plat==wcoss.cray
+run fv3_wrtGauss_nemsio_c768    @ fv3,           baseline, ww3, plat==hera.intel, plat==wcoss_dell_p3, plat==wcoss.cray
 run fv3_wrtGauss_nemsio_c192    @ fv3, standard, baseline
 run fv3_stochy                  @ fv3, standard, baseline
 run fv3_iau                     @ fv3, standard, baseline

diff --git a/compsets/fv3.input b/compsets/fv3.input
@@ -1764,10 +1764,11 @@ test fv3_wrtGauss_nemsio_c768: fv3_ww3.exe {
     TEST_DESCR="Compare c768 FV3-WW3 Gaussian grid nemsio output results with previous trunk version"
     CNTL_NAME="fv3_wrtGauss_nemsio_c768"
 
-    TASKS='1752'
+    TASKS='1470'
     PPN="@[plat%C768_PPN]"
+    THRD="@[plat%C768_THRD]"
     INPES='16'
-    JNPES='16'
+    JNPES='12'
     NPX='769'
     NPY='769'
     NPZ='64'
@@ -1779,7 +1780,7 @@ test fv3_wrtGauss_nemsio_c768: fv3_ww3.exe {
     FHMAX='06'
     WLCLK='30'
     WRITE_GROUP='3'
-    WRTTASK_PER_GROUP='64'
+    WRTTASK_PER_GROUP='36'
     FDIAG='0,1,2,3,4,5,6,7,8,9,10,11,12'
     OUTPUT_GRID="'gaussian_grid'"
     OUTPUT_FILE="'nemsio'"
@@ -1805,9 +1806,9 @@ test fv3_wrtGauss_nemsio_c768: fv3_ww3.exe {
 
     nems_configure="blocked_atm_wav"
     atm_model='fv3'
-    atm_petlist_bounds="0 1727"
+    atm_petlist_bounds="0 1259"
     wav_model='ww3'
-    wav_petlist_bounds="1728 1751"
+    wav_petlist_bounds="1260 1469"
     coupling_interval_sec=1800.0  # 30min coupling, fv3 time step
 
     # The build variable is the fv3_ww3.exe, which
@@ -1834,6 +1835,7 @@ test fv3_wrtGauss_nemsio_c768: fv3_ww3.exe {
      'nems.configure' <=atparse=   "@[PARMnems]/nems.configure.@[nems_configure].IN"
           'mod_def.*' <=copyfrom=  "@[WW3_input_data]"
       'ww3_multi.inp' <=copyfrom=  "@[WW3_input_data]/@[SYEAR]@[SMONTH]@[SDAY]"
+      'rmp_src*' <=copyfrom=  "@[WW3_input_data]/@[SYEAR]@[SMONTH]@[SDAY]"
     }
 
     # Specify output files:
@@ -1879,7 +1881,9 @@ test fv3_wrtGauss_nemsio_c768: fv3_ww3.exe {
         'RESTART/sfc_data.tile4.nc'             .bitcmp. "@[CNTL]/RESTART/"
         'RESTART/sfc_data.tile5.nc'             .bitcmp. "@[CNTL]/RESTART/"
         'RESTART/sfc_data.tile6.nc'             .bitcmp. "@[CNTL]/RESTART/"
-        'out_grd.glo_30m'                       .bitcmp. "@[CNTL]"
+        'out_grd.glo_10m'                       .bitcmp. "@[CNTL]"
+        'out_grd.ant_9km'                       .bitcmp. "@[CNTL]"
+        'out_grd.aoc_9km'                       .bitcmp. "@[CNTL]"
       # Executable validation.  This makes an MD5 sum of the fv3.exe
       # for comparison against the MD5 sum made in the build job.
       # This is to ensure the executable did not change during the
@@ -1888,7 +1892,7 @@ test fv3_wrtGauss_nemsio_c768: fv3_ww3.exe {
     }
 
     spawn execute {
-        {"@[build%target]", ranks="@[TASKS]", ppn="@[PPN]" }
+        {"@[build%target]", ranks="@[TASKS]", threads="@[THRD]", ppn="@[PPN]" }
     }
 }
 

diff --git a/compsets/hera.input b/compsets/hera.input
@@ -16,7 +16,8 @@ platform hera.intel {
 
     cores_per_node=40 # Number of cores per node on compute nodes
     cpus_per_core=2
-    C768_PPN=30
+    C768_PPN=10
+    C768_THRD=4
 
  # hera testing: using longer run time
     DEFAULT_TEST_WALLTIME=3000
@@ -30,8 +31,8 @@ platform hera.intel {
     # INPUTS is the input directory, which should contain fix and parm
     # files, plus any restarts or other inputs.
 
-    BASELINE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20191230"
-    BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20191230"
+    BASELINE="/scratch2/NCEPDEV/ocean/Henrique.Alves/GFSv16/UFS/RT/NEMSfv3gfs/develop-20200111/"
+    BASELINE_TEMPLATE="/scratch2/NCEPDEV/ocean/Henrique.Alves/GFSv16/UFS/RT/NEMSfv3gfs/develop-20200111/"
     INPUTS="@[BASELINE]"
 
     default_resources={

diff --git a/compsets/platforms.input b/compsets/platforms.input
@@ -26,6 +26,7 @@ platform.defaults={
     walltime="@[DEFAULT_TEST_WALLTIME]"
 
     C768_PPN="@[cores_per_node]"
+    C768_THRD=1
     execution_time_modules=""
 }
 

diff --git a/compsets/wcoss.input b/compsets/wcoss.input
@@ -17,6 +17,8 @@ platform wcoss.phase2 {
     pex='1'
     cores_per_node=24
     cpus_per_core=2
+    C768_PPN=6
+    C768_THRD=4
 
     # WCOSS Phase 2 has been slow of late.
     DEFAULT_TEST_WALLTIME=3000
@@ -120,6 +122,9 @@ platform wcoss.phase1 {
     pex='1'
     cores_per_node=16
     cpus_per_core=2
+    C768_PPN=6
+    C768_THRD=4
+
     MACHINE_ID='wcoss.phase1'
     BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191230"
     BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191230"
@@ -197,25 +202,27 @@ platform wcoss_dell_p3 {
     pex='3'
     cores_per_node=28
     cpus_per_core=2
+    C768_PPN=7
+    C768_THRD=4
 
-    DEFAULT_TEST_WALLTIME=1800
+    DEFAULT_TEST_WALLTIME=3000
 
     MPI='LSF_IMPI'
     MACHINE_ID='wcoss_dell_p3'
     SHORT_TEST_QUEUE='&SHORTQ;'
     LONG_TEST_QUEUE='&LONGQ;'
     BUILD_QUEUE='&BUILDQ;'
 
-    BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191230"
-    BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191230"
+    BASELINE="/gpfs/dell2/emc/modeling/noscrub/Henrique.Alves/GFSv16/UFS/RT/NEMSfv3gfs/baseline-20200107"
+    BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/Henrique.Alves/GFSv16/UFS/RT/NEMSfv3gfs/baseline-20200107"
 
     default_resources={
         TASKS=156
         WRTTASK_PER_GROUP=12
-        TPN=8
+        TPN=6
         INPES=3
         JNPES=8
-        THRD=1
+        THRD=4
         atm_petlist_bounds="0 155"
         wav_petlist_bounds="156 263"
         CPLTASKS=264
@@ -295,6 +302,9 @@ platform wcoss.cray {
     pex='cray'
     cores_per_node=24
     cpus_per_core=2
+    C768_PPN=6
+    C768_THRD=4
+
     MPI='lsf_cray_intel'
     SHORT_TEST_QUEUE='&SHORTQ;'
     LONG_TEST_QUEUE='&LONGQ;'

diff --git a/coupledFV3_WW3.appBuilder.mk b/coupledFV3_WW3.appBuilder.mk
@@ -0,0 +1,4 @@
+# Do not edit this file.  It is generated from:
+#    /gpfs/dell2/emc/modeling/noscrub/Henrique.Alves/GFSv16/UFS/ufs-weather-model/coupledFV3_WW3.appBuilder
+# Edit that file instead.
+COMPONENTS ?= FMS FV3 WW3
+2 −2		manual/eqs/output.tex
+1 −1		model/aux/bash/ww3_multi_inp2nml.sh
+3 −3		model/bin/cmplr.env
+0 −216		model/bin/comp.wcoss_cray
+0 −220		model/bin/comp.wcoss_dell_p3
+0 −217		model/bin/link.wcoss_cray
+0 −222		model/bin/link.wcoss_dell_p3
+1 −1		model/bin/switch_NCEP_gwm
+18 −4		model/ftn/w3gdatmd.ftn
+74 −5		model/ftn/w3initmd.ftn
+82 −4		model/ftn/w3iogomd.ftn
+87 −2		model/ftn/w3iopomd.ftn
+32 −8		model/ftn/w3iorsmd.ftn
+17 −1		model/ftn/w3nmlmultimd.ftn
+11 −0		model/ftn/w3nmlshelmd.ftn
+12 −6		model/ftn/w3odatmd.ftn
+76 −6		model/ftn/w3wavemd.ftn
+9 −6		model/ftn/w3wdatmd.ftn
+12 −4		model/ftn/wmesmfmd.ftn
+247 −30		model/ftn/wminitmd.ftn
+45 −2		model/ftn/wmwavemd.ftn
+95 −7		model/ftn/ww3_grib.ftn
+132 −13		model/ftn/ww3_shel.ftn
+7 −0		model/inp/ww3_grib.inp
+5 −6		regtests/bin/matrix_datarmor
+6 −6		regtests/mww3_test_03/input/ww3_multi_grdset_d2.nml
+13 −2		regtests/mww3_test_06/info
+4 −0		regtests/mww3_test_06/input/grdset_d_h
+4 −0		regtests/mww3_test_06/input/grdset_d_r
+29 −0		regtests/mww3_test_06/input/ww3_grid_points.inp
+226 −0		regtests/mww3_test_06/input/ww3_grid_points.nml
+1 −1		regtests/mww3_test_06/input/ww3_multi_grdset_d.inp
+145 −0		regtests/mww3_test_06/input/ww3_multi_grdset_d_h.inp
+146 −0		regtests/mww3_test_06/input/ww3_multi_grdset_d_r.inp
+242 −0		regtests/mww3_test_06/input/ww3_multi_grdset_d_r.nml
+1 −1		regtests/ww3_ts4/input_rg_multi/switch_MPI
+1 −1		regtests/ww3_ts4/input_rg_shel/switch_MPI
+1 −1		regtests/ww3_ts4/input_ug/switch_MPI