ufs-community · zach1221 · Jul 31, 2023 · Jun 28, 2023 · Jun 28, 2023 · Jul 11, 2023
diff --git a/FV3 b/FV3
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1,2 +1,2 @@
-export BL_DATE=20230726
+export BL_DATE=20230728
 
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -348,6 +348,7 @@ export WRITE_GROUP=1
 export WRTTASK_PER_GROUP=6
 export ITASKS=1
 export OUTPUT_HISTORY=.true.
+export HISTORY_FILE_ON_NATIVE_GRID=.false.
 export WRITE_DOPOST=.false.
 export NUM_FILES=2
 export FILENAME_BASE="'atm' 'sfc'"

diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/logs/RegressionTests_jet.log b/tests/logs/RegressionTests_jet.log
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
diff --git a/tests/logs/RegressionTests_wcoss2.log b/tests/logs/RegressionTests_wcoss2.log
diff --git a/tests/parm/model_configure_fhout.IN b/tests/parm/model_configure_fhout.IN
@@ -15,6 +15,7 @@ quilting:                @[QUILTING]
 write_groups:            @[WRITE_GROUP]
 write_tasks_per_group:   @[WRTTASK_PER_GROUP]
 output_history:          @[OUTPUT_HISTORY]
+history_file_on_native_grid: @[HISTORY_FILE_ON_NATIVE_GRID]
 write_dopost:            @[WRITE_DOPOST]
 num_files:               @[NUM_FILES]
 filename_base:           @[FILENAME_BASE]

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -75,7 +75,7 @@ RUN | cpld_debug_pdlib_p8                               | + hera orion cheyenne
 COMPILE | atm_dyn32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn -D32BIT=ON | | fv3 |
 RUN | control_flake                                     |                            | baseline |
 RUN | control_CubedSphereGrid                           |                            | baseline |
-RUN | control_CubedSphereGrid_parallel                  | - wcoss2 acorn             | baseline |
+RUN | control_CubedSphereGrid_parallel                  |                            | baseline |
 RUN | control_latlon                                    |                            | baseline |
 RUN | control_wrtGauss_netcdf_parallel                  |                            | baseline |
 RUN | control_c48                                       |                            | baseline |

diff --git a/tests/tests/control_CubedSphereGrid_parallel b/tests/tests/control_CubedSphereGrid_parallel
@@ -11,7 +11,16 @@ export CNTL_DIR=control_CubedSphereGrid_parallel
 export LIST_FILES="sfcf000.nc \
                    sfcf024.nc \
                    atmf000.nc \
-                   atmf024.nc"
+                   atmf024.nc \
+                   cubed_sphere_grid_sfcf000.nc \
+                   cubed_sphere_grid_sfcf024.nc \
+                   cubed_sphere_grid_atmf000.nc \
+                   cubed_sphere_grid_atmf024.nc \
+                   GFSFLX.GrbF00 \
+                   GFSFLX.GrbF24 \
+                   GFSPRS.GrbF00 \
+                   GFSPRS.GrbF24"
+
 export_fv3
 export NPZ=127
 export NPZP=128
@@ -21,13 +30,14 @@ export SMONTH=03
 export SDAY=22
 export SHOUR=06
 export RESTART_INTERVAL=0
-export OUTPUT_GRID='cubed_sphere_grid'
+export OUTPUT_GRID='gaussian_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 HISTORY_FILE_ON_NATIVE_GRID=.true.
+export WRITE_DOPOST=.true.
 
 export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v16
+5 −4		fv3_cap.F90
+27 −31		io/module_write_netcdf.F90
+115 −57		io/module_wrt_grid_comp.F90
+3 −1		io/post_fv3.F90
+78 −120		module_fcst_grid_comp.F90
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		export BL_DATE=20230726
		export BL_DATE=20230728