ufs-community · jkbk2004 · Jun 24, 2022 · Jun 8, 2022 · Jun 8, 2022 · Jun 8, 2022
diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss2.intel.log b/tests/RegressionTests_wcoss2.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/parm/cpt.nml.IN b/tests/parm/cpt.nml.IN
@@ -94,20 +94,6 @@
        z_tracer   = .true.
 /
 
-#&coupler_nml
-#       months   = 0
-#       days     = 1
-#       hours    = 0
-#       dt_atmos = 225
-#       dt_ocean = 225
-#       current_date =  2016,10,03,00,0,0
-#       calendar = 'julian'
-#       memuse_verbose = .false.
-#       atmos_nthreads = 1
-#       use_hyper_thread = .false.
-#       ncores_per_node = 24
-#/
-
 &external_ic_nml
        filtered_terrain = .true.
        levp       = @[NPZP]

diff --git a/tests/parm/csawmg3shoc127.nml.IN b/tests/parm/csawmg3shoc127.nml.IN
@@ -94,20 +94,6 @@
        res_latlon_dynamics = "fv3_increment.nc"
 /
 
-#&coupler_nml
-#       months   = 0
-#       days     = 1
-#       hours    = 0
-#       dt_atmos = 225
-#       dt_ocean = 225
-#       current_date =  2016,10,03,00,0,0
-#       calendar = 'julian'
-#       memuse_verbose = .false.
-#       atmos_nthreads = 1
-#       use_hyper_thread = .false.
-#       ncores_per_node = 24
-#/
-
 &external_ic_nml
        filtered_terrain = .true.
        levp       = @[NPZP]

diff --git a/tests/parm/csawmgshoc.nml.IN b/tests/parm/csawmgshoc.nml.IN
@@ -93,20 +93,6 @@
        res_latlon_dynamics = "fv3_increment.nc"
 /
 
-#&coupler_nml
-#       months   = 0
-#       days     = 1
-#       hours    = 0
-#       dt_atmos = 225
-#       dt_ocean = 225
-#       current_date =  2016,10,03,00,0,0
-#       calendar = 'julian'
-#       memuse_verbose = .false.
-#       atmos_nthreads = 1
-#       use_hyper_thread = .false.
-#       ncores_per_node = 24
-#/
-
 &external_ic_nml
        filtered_terrain = .true.
        levp       = @[NPZP]

diff --git a/tests/parm/field_table/field_table_regional b/tests/parm/field_table/field_table_regional
diff --git a/tests/parm/field_table/field_table_wam b/tests/parm/field_table/field_table_wam
diff --git a/tests/parm/params_grib2_tbl_new b/tests/parm/params_grib2_tbl_new
diff --git a/tests/parm/wam.nml.IN b/tests/parm/wam.nml.IN
@@ -96,20 +96,6 @@
        res_latlon_dynamics = "fv3_increment.nc"
 /
 
-#&coupler_nml
-#       months = 0
-#       days  = 1
-#       hours = 0
-#       dt_atmos = 225
-#       dt_ocean = 225
-#       current_date =  2016,10,03,00,0,0
-#       calendar = 'julian'
-#       memuse_verbose = .false.
-#       atmos_nthreads = 1
-#       use_hyper_thread = .false.
-#       ncores_per_node = 24
-#/
-
 &external_ic_nml
        filtered_terrain = .true.
        levp = @[NPZP]

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -42,6 +42,7 @@ RUN     | control_2threads
 RUN     | control_restart                                                                                                         |                                         |     | control
 RUN     | control_fhzero                                                                                                          |                                         |     |
 RUN     | control_CubedSphereGrid                                                                                                 |                                         | fv3 |
+RUN     | control_CubedSphereGrid_parallel                                                                                        | - wcoss2.intel                          | fv3 |
 RUN     | control_latlon                                                                                                          |                                         | fv3 |
 RUN     | control_wrtGauss_netcdf_parallel                                                                                        |                                         | fv3 |
 RUN     | control_c48                                                                                                             |                                         | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -485,7 +485,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20220616
+BL_DATE=20220623
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]] || [[ $MACHINE_ID = wcoss2.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else

diff --git a/tests/tests/control_CubedSphereGrid_parallel b/tests/tests/control_CubedSphereGrid_parallel
@@ -0,0 +1,35 @@
+###############################################################################
+#
+#  Global control with native grid output test
+#
+###############################################################################
+
+export TEST_DESCR="Compare global control native grid output results with previous trunk version"
+
+export CNTL_DIR=control_CubedSphereGrid_parallel
+
+export LIST_FILES="sfcf000.nc \
+                   sfcf024.nc \
+                   atmf000.nc \
+                   atmf024.nc"
+export_fv3
+export NPZ=127
+export NPZP=128
+export DT_ATMOS=720
+export SYEAR=2021
+export SMONTH=03
+export SDAY=22
+export SHOUR=06
+export RESTART_INTERVAL=0
+export OUTPUT_GRID='cubed_sphere_grid'
+export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
+export NSTF_NAME='2,0,0,0,0'
+export IAER=5111
+export IOVR=3
+
+export WRITE_DOPOST=.false.
+
+export FV3_RUN=control_run.IN
+export CCPP_SUITE=FV3_GFS_v16
+export INPUT_NML=control.nml.IN
+export MODEL_CONFIGURE=model_configure_fhout.IN