ufs-community · junwang-noaa · Feb 2, 2022 · Jan 19, 2022 · Jan 25, 2022 · Jan 25, 2022
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,9 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  #url = https://github.com/NOAA-EMC/fv3atm
+  #branch = develop
+  url = https://github.com/junwang-noaa/fv3atm
+  branch = upp2d
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3

diff --git a/FV3 b/FV3
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -744,6 +744,7 @@ export RESTART_INTERVAL=0
 export QUILTING=.true.
 export WRITE_GROUP=1
 export WRTTASK_PER_GROUP=6
+export ITASKS=1
 export OUTPUT_HISTORY=.true.
 export WRITE_DOPOST=.false.
 export NUM_FILES=2

diff --git a/tests/parm/model_configure.IN b/tests/parm/model_configure.IN
@@ -15,6 +15,7 @@ output_1st_tstep_rst:    .false.
 quilting:                @[QUILTING]
 write_groups:            @[WRITE_GROUP]
 write_tasks_per_group:   @[WRTTASK_PER_GROUP]
+itasks:                  @[ITASKS]
 output_history:          @[OUTPUT_HISTORY]
 write_dopost:            @[WRITE_DOPOST]
 num_files:               @[NUM_FILES]

diff --git a/tests/parm/model_configure_regional.IN b/tests/parm/model_configure_regional.IN
@@ -15,6 +15,7 @@ output_1st_tstep_rst:    .false.
 quilting:                @[QUILTING]
 write_groups:            1
 write_tasks_per_group:   8
+itasks:                  @[ITASKS]
 write_dopost:            @[WRITE_DOPOST]
 num_files:               2
 filename_base:           'dyn' 'phy'

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -33,6 +33,7 @@ RUN     | cpld_debug_p8
 COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_thompson_mynn_RRTMGP,FV3_GFS_v16_p7_rrtmgp,FV3_GFS_v16_p8 -D32BIT=ON   |                | fv3 |
 RUN     | control                                                                                                                 |                                         | fv3 |
 RUN     | control_decomp                                                                                                          |                                         |     |
+RUN     | control_2dwrtdecomp                                                                                                     |                                         |     |
 RUN     | control_2threads                                                                                                        | - wcoss_cray                            |     |
 RUN     | control_restart                                                                                                         |                                         |     | control
 RUN     | control_fhzero                                                                                                          | - wcoss2                                |     |
@@ -56,6 +57,7 @@ RUN     | control_p7_rrtmgp
 
 RUN     | regional_control                                                                                                        |                                         | fv3 |
 RUN     | regional_restart                                                                                                        |                                         |     | regional_control
+RUN     | regional_control_2dwrtdecomp                                                                                            |                                         |     |
 RUN     | regional_noquilt                                                                                                        |                                         | fv3 |
 RUN     | regional_2threads                                                                                                       | - wcoss_cray jet.intel                  |     |
 RUN     | regional_hafs                                                                                                           |                                         | fv3 |

diff --git a/tests/tests/control_2dwrtdecomp b/tests/tests/control_2dwrtdecomp
@@ -0,0 +1,33 @@
+###############################################################################
+#
+#  Global 2D write domain decomposition test 
+#
+###############################################################################
+
+export TEST_DESCR="Compare global 2D write decomp results with control test"
+
+export CNTL_DIR=control
+
+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='gaussian_grid'
+export NSTF_NAME='2,0,0,0,0'
+export WRITE_DOPOST=.false.
+export IAER=5111
+
+export ITASKS=2
+
+export FV3_RUN=control_run.IN
+export CCPP_SUITE=FV3_GFS_v16
+export INPUT_NML=control.nml.IN
diff --git a/tests/tests/regional_control_2dwrtdecomp b/tests/tests/regional_control_2dwrtdecomp
@@ -0,0 +1,38 @@
+###############################################################################
+#
+#  FV3 regional 2D write decomposition domain test
+#
+###############################################################################
+
+export TEST_DESCR="Compare FV3 regional 2D write decomposition domain with control test"
+
+export CNTL_DIR=fv3_regional_control
+
+export LIST_FILES="dynf000.nc \
+                   dynf024.nc \
+                   phyf000.nc \
+                   phyf024.nc"
+
+export_fv3
+
+export FV3_RUN=regional_run.IN
+
+export OZ_PHYS_OLD=.false.
+export OZ_PHYS_NEW=.true.
+export H2O_PHYS=.true.
+export HYBEDMF=.false.
+export RESTART_INTERVAL="12 -1"
+export WRITE_DOPOST=.false.
+export POSTAPP='lam'
+
+export CCPP_SUITE=FV3_GFS_v15_thompson_mynn
+export INPUT_NML=regional.nml.IN
+export MODEL_CONFIGURE=model_configure_regional.IN
+export DIAG_TABLE=diag_table_lam
+export FIELD_TABLE=field_table_regional
+
+export TASKS=68
+export INPES=10
+export JNPES=6
+export ITASKS=2
+export OUTPUT_FH="12 -1"