From c23cfe4779097fde8221cd9384b829c4d4cfeb27 Mon Sep 17 00:00:00 2001
From: Dusan Jovic <dusan.jovic@noaa.gov>
Date: Wed, 13 Dec 2023 13:24:34 -0600
Subject: [PATCH 1/8] Update .gitmodules

---
 .gitmodules | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index a3775fc12d..2992ffcd15 100644
--- 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/DusanJovic-NOAA/fv3atm
+  branch = remove_nfhout
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3

From 184576ac4f69fd689a0d19b80334069ec0849ec5 Mon Sep 17 00:00:00 2001
From: Dusan Jovic <dusan.jovic@noaa.gov>
Date: Wed, 13 Dec 2023 18:57:21 -0600
Subject: [PATCH 2/8] Remove nfhout, nfhout_hf, nsout

---
 FV3                                           |  2 +-
 tests/default_vars.sh                         | 12 -------
 tests/parm/datm_cdeps_configure.IN            |  4 ---
 tests/parm/model_configure.IN                 |  1 +
 tests/parm/model_configure_atmaq.IN           |  1 -
 tests/parm/model_configure_fhout.IN           | 34 -------------------
 tests/parm/model_configure_hafs.IN            |  4 ---
 tests/parm/model_configure_regional.IN        |  1 -
 tests/parm/model_configure_regional_rrfs_a.IN | 23 ++-----------
 tests/parm/model_configure_regional_stoch.IN  |  3 +-
 tests/parm/model_configure_rrfs_conus13km.IN  | 21 +-----------
 tests/tests/control_CubedSphereGrid           |  1 -
 tests/tests/control_CubedSphereGrid_parallel  |  1 -
 tests/tests/control_c384gdas                  |  1 -
 tests/tests/control_c384gdas_debug            |  1 -
 tests/tests/control_c384gdas_wav              |  1 -
 tests/tests/control_wam                       |  3 --
 tests/tests/control_wam_debug                 |  3 --
 tests/tests/gnv1_nested                       |  4 +--
 tests/tests/hafs_global_1nest_atm             |  4 +--
 tests/tests/hafs_global_multiple_4nests_atm   |  4 +--
 .../hafs_global_storm_following_1nest_atm     |  4 +--
 tests/tests/hafs_regional_1nest_atm           |  4 +--
 tests/tests/hafs_regional_atm                 |  4 +--
 tests/tests/hafs_regional_atm_ocn             |  4 +--
 tests/tests/hafs_regional_atm_ocn_wav         |  4 +--
 tests/tests/hafs_regional_atm_thompson_gfdlsf |  4 +--
 tests/tests/hafs_regional_atm_wav             |  4 +--
 tests/tests/hafs_regional_docn                |  4 +--
 tests/tests/hafs_regional_docn_oisst          |  4 +--
 .../hafs_regional_specified_moving_1nest_atm  |  4 +--
 .../hafs_regional_storm_following_1nest_atm   |  4 +--
 ...afs_regional_storm_following_1nest_atm_ocn |  4 +--
 ...gional_storm_following_1nest_atm_ocn_debug |  4 +--
 ...regional_storm_following_1nest_atm_ocn_wav |  4 +--
 .../tests/hafs_regional_telescopic_2nests_atm |  4 +--
 tests/tests/regional_atmaq                    |  1 -
 tests/tests/regional_atmaq_debug              |  1 -
 tests/tests/regional_atmaq_faster             |  1 -
 39 files changed, 25 insertions(+), 167 deletions(-)
 delete mode 100644 tests/parm/model_configure_fhout.IN

diff --git a/FV3 b/FV3
index a82381c0b7..eb5d087401 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit a82381c0b751a15e5343de5078ef836b2c444c89
+Subproject commit eb5d087401283cb133991899940d43aff8ae7353
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 314a20900e..34e3163135 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -564,9 +564,6 @@ export NPZ=64
 export NPZP=65
 export NSTF_NAME=2,1,1,0,5
 export OUTPUT_FH="12 -1"
-export NFHOUT=12
-export NFHMAX_HF=12
-export NFHOUT_HF=6
 export FHZERO=6
 export FNALBC="'global_snowfree_albedo.bosu.t126.384.190.rg.grb'"
 export FNVETC="'global_vegtype.igbp.t126.384.190.rg.grb'"
@@ -872,7 +869,6 @@ export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 export DIAG_TABLE=diag_table_p8_template
 export DIAG_TABLE_ADDITIONAL=''
 
-export NSOUT=-1
 export FHZERO=6
 export DT_INNER=${DT_ATMOS}
 
@@ -1023,7 +1019,6 @@ export SHOUR=00
 export FHMAX=24
 export DT_ATMOS=900
 export FHROT=0
-export NFHOUT=6
 
 # required but unused
 export WARM_START=.false.
@@ -1148,9 +1143,6 @@ export OUTPUT_GRID="'regional_latlon'"
 export OUTPUT_FILE="'netcdf'"
 export IDEFLATE=0
 export QUANTIZE_NSD=0
-export NFHOUT=3
-export NFHMAX_HF=-1
-export NFHOUT_HF=3
 export CEN_LON=-62.0
 export CEN_LAT=25.0
 export LON1=-114.5
@@ -1341,10 +1333,6 @@ export NY_6=''
 export DX_6=''
 export DY_6=''
 
-export NFHOUT=3
-export NFHMAX_HF=-1
-export NFHOUT_HF=3
-export NSOUT=-1
 export OUTPUT_FH=-1
 }
 export_hrrr() {
diff --git a/tests/parm/datm_cdeps_configure.IN b/tests/parm/datm_cdeps_configure.IN
index 267dce2bd1..1b38eb9a5f 100644
--- a/tests/parm/datm_cdeps_configure.IN
+++ b/tests/parm/datm_cdeps_configure.IN
@@ -7,7 +7,3 @@ start_second:            0
 nhours_fcst:             @[FHMAX]
 dt_atmos:                @[DT_ATMOS]
 fhrot:                   @[FHROT]
-nfhout:                  @[NFHOUT]
-nfhmax_hf:               -1
-nfhout_hf:               3
-nsout:                   -1
diff --git a/tests/parm/model_configure.IN b/tests/parm/model_configure.IN
index 7e7f05e500..a112bc0a01 100644
--- a/tests/parm/model_configure.IN
+++ b/tests/parm/model_configure.IN
@@ -16,6 +16,7 @@ write_groups:            @[WRITE_GROUP]
 write_tasks_per_group:   @[WRTTASK_PER_GROUP]
 itasks:                  @[ITASKS]
 output_history:          @[OUTPUT_HISTORY]
+history_file_on_native_grid: @[HISTORY_FILE_ON_NATIVE_GRID]
 write_dopost:            @[WRITE_DOPOST]
 write_nsflip:            @[WRITE_NSFLIP]
 num_files:               @[NUM_FILES]
diff --git a/tests/parm/model_configure_atmaq.IN b/tests/parm/model_configure_atmaq.IN
index 740f52e4df..f28f81da55 100644
--- a/tests/parm/model_configure_atmaq.IN
+++ b/tests/parm/model_configure_atmaq.IN
@@ -19,7 +19,6 @@ num_files:               @[NUM_FILES]
 filename_base:           @[FILENAME_BASE]
 output_file:             @[OUTPUT_FILE]
 output_fh:  		 @[OUTPUT_FH]
-nsout:      		 @[NSOUT]
 output_grid:  		 @[OUTPUT_GRID]
 
 cen_lon:  @[CEN_LON]
diff --git a/tests/parm/model_configure_fhout.IN b/tests/parm/model_configure_fhout.IN
deleted file mode 100644
index 7b18b19493..0000000000
--- a/tests/parm/model_configure_fhout.IN
+++ /dev/null
@@ -1,34 +0,0 @@
-start_year:              @[SYEAR]
-start_month:             @[SMONTH]
-start_day:               @[SDAY]
-start_hour:              @[SHOUR]
-start_minute:            0
-start_second:            0
-nhours_fcst:             @[FHMAX]
-
-dt_atmos:                @[DT_ATMOS]
-restart_interval:        @[RESTART_INTERVAL]
-fhrot:                   @[FHROT]
-output_1st_tstep_rst:    .false.
-
-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]
-output_grid:             @[OUTPUT_GRID]
-output_file:             @[OUTPUT_FILE]
-ideflate:                @[IDEFLATE]
-quantize_mode:           'quantize_bitround'
-quantize_nsd:            @[QUANTIZE_NSD]
-imo:                     @[IMO]
-jmo:                     @[JMO]
-
-nfhout:                  @[NFHOUT]
-nfhmax_hf:               @[NFHMAX_HF]
-nfhout_hf:               @[NFHOUT_HF]
-nsout:                   -1
-iau_offset:              @[IAU_OFFSET]
diff --git a/tests/parm/model_configure_hafs.IN b/tests/parm/model_configure_hafs.IN
index e3c2e25edb..522e64cca6 100644
--- a/tests/parm/model_configure_hafs.IN
+++ b/tests/parm/model_configure_hafs.IN
@@ -140,10 +140,6 @@ dx:                      @[DX_6]
 dy:                      @[DY_6]
 </output_grid_06>
 
-nfhout:                  @[NFHOUT]          # Output frequency in hours after forecast hour nfhmax_hf
-nfhmax_hf:               @[NFHMAX_HF]       # Number of forecast hours until output frequency nfhout takes affect
-nfhout_hf:               @[NFHOUT_HF]       # Output frequency in hours until forecast hour nfhmax_hf
-nsout:                   @[NSOUT]           # Output frequency in time steps (positive values override nfhout and nfhout_hf)
 output_fh:               @[OUTPUT_FH]       # Output forecast hours controlled by output_fh (see notes below)
 # a) An array of output_fh means to output history files at those forecast time (e.g., "output_fh: 0 1 2 3 12 24 48")
 #    If the first elelment is zero, it means the first time step output
diff --git a/tests/parm/model_configure_regional.IN b/tests/parm/model_configure_regional.IN
index 471f31c53c..a2180d2eae 100644
--- a/tests/parm/model_configure_regional.IN
+++ b/tests/parm/model_configure_regional.IN
@@ -53,4 +53,3 @@ dy:       3000.0
 #dlat:                     0.025
 
 output_fh:               @[OUTPUT_FH]
-nsout:                   -1
diff --git a/tests/parm/model_configure_regional_rrfs_a.IN b/tests/parm/model_configure_regional_rrfs_a.IN
index d553ba6fef..a26b3aff52 100644
--- a/tests/parm/model_configure_regional_rrfs_a.IN
+++ b/tests/parm/model_configure_regional_rrfs_a.IN
@@ -21,26 +21,9 @@ num_files:               2
 filename_base:           'dyn''phy'
 output_file:             'netcdf'
 write_nemsioflip:        .false.
-#
-# Write-component output frequency parameter definitions:
-#
-# nfhout:
-# Output frequency in hours after forecast hour "nfhmax_hf".
-#
-# nfhmax_hf:
-# Number of forecast hours until output frequency "nfhout" takes affect.
-#
-# nfhout_hf:
-# Output frequency in hours until forecast hour "nfhmax_hf".
-#
-# nsout:
-# Output frequency in time steps (positive values override "nfhout" and 
-# "nfhout_hf").
-#
-nfhout:     1
-nfhmax_hf:  60
-nfhout_hf:  1
-nsout:      0
+
+output_fh:  60 -1
+
 #
 # Coordinate system used by the output grid.
 #
diff --git a/tests/parm/model_configure_regional_stoch.IN b/tests/parm/model_configure_regional_stoch.IN
index 77ccf60c3a..0f7b44b803 100644
--- a/tests/parm/model_configure_regional_stoch.IN
+++ b/tests/parm/model_configure_regional_stoch.IN
@@ -32,6 +32,5 @@ lon1:     -109.97410429
 lat1:     26.31459843
 dx:       3000.0
 dy:       3000.0
-                        
+
 output_fh:               @[OUTPUT_FH]
-nsout:                   -1
diff --git a/tests/parm/model_configure_rrfs_conus13km.IN b/tests/parm/model_configure_rrfs_conus13km.IN
index d42c30abec..c4e0fc7096 100644
--- a/tests/parm/model_configure_rrfs_conus13km.IN
+++ b/tests/parm/model_configure_rrfs_conus13km.IN
@@ -29,26 +29,7 @@ kchunk3d:                @[KCHUNK3D]
 imo:                     @[IMO]
 jmo:                     @[JMO]
 
-#
-# Write-component output frequency parameter definitions:
-#
-# nfhout:
-# Output frequency in hours after forecast hour "nfhmax_hf".
-#
-# nfhmax_hf:
-# Number of forecast hours until output frequency "nfhout" takes affect.
-#
-# nfhout_hf:
-# Output frequency in hours until forecast hour "nfhmax_hf".
-#
-# nsout:
-# Output frequency in time steps (positive values override "nfhout" and 
-# "nfhout_hf").
-#
-nfhout:     1
-nfhmax_hf:  60
-nfhout_hf:  1
-nsout:      -1
+output_fh:  1 -1
 
 #
 # Coordinate system used by the output grid.
diff --git a/tests/tests/control_CubedSphereGrid b/tests/tests/control_CubedSphereGrid
index 9940a26bd2..74eb30485c 100644
--- a/tests/tests/control_CubedSphereGrid
+++ b/tests/tests/control_CubedSphereGrid
@@ -51,4 +51,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
diff --git a/tests/tests/control_CubedSphereGrid_parallel b/tests/tests/control_CubedSphereGrid_parallel
index 124f6d355d..3063c0db11 100644
--- a/tests/tests/control_CubedSphereGrid_parallel
+++ b/tests/tests/control_CubedSphereGrid_parallel
@@ -42,4 +42,3 @@ export WRITE_DOPOST=.true.
 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
diff --git a/tests/tests/control_c384gdas b/tests/tests/control_c384gdas
index d9483371ca..a40889545a 100644
--- a/tests/tests/control_c384gdas
+++ b/tests/tests/control_c384gdas
@@ -68,7 +68,6 @@ export SDAY=21
 export SHOUR=18
 export FHROT=3
 export OUTPUT_FH="3 -1"
-export NFHMAX_HF=0
 export IAU_OFFSET=6
 export CDMBWD=${CDMBWD_c384}
 export OUTPUT_GRID='gaussian_grid'
diff --git a/tests/tests/control_c384gdas_debug b/tests/tests/control_c384gdas_debug
index 06aae996e4..fc5dd2d7e5 100644
--- a/tests/tests/control_c384gdas_debug
+++ b/tests/tests/control_c384gdas_debug
@@ -65,7 +65,6 @@ export SDAY=21
 export SHOUR=18
 export FHROT=3
 export OUTPUT_FH="0 1"
-export NFHMAX_HF=7
 export IAU_OFFSET=6
 export CDMBWD=${CDMBWD_c384}
 export OUTPUT_GRID='gaussian_grid'
diff --git a/tests/tests/control_c384gdas_wav b/tests/tests/control_c384gdas_wav
index ee244f62d7..c6f768ae95 100644
--- a/tests/tests/control_c384gdas_wav
+++ b/tests/tests/control_c384gdas_wav
@@ -74,7 +74,6 @@ export SDAY=21
 export SHOUR=18
 export FHROT=3
 export OUTPUT_FH="3 -1"
-export NFHMAX_HF=0
 export IAU_OFFSET=6
 export CDMBWD=${CDMBWD_c384}
 export OUTPUT_GRID='gaussian_grid'
diff --git a/tests/tests/control_wam b/tests/tests/control_wam
index 06c9477d6b..ce4499d7de 100644
--- a/tests/tests/control_wam
+++ b/tests/tests/control_wam
@@ -43,7 +43,4 @@ export OUTPUT_GRID="gaussian_grid"
 export OZ_PHYS_OLD=.false.
 export OZ_PHYS_NEW=.true.
 export H2O_PHYS=.true.
-export NFHOUT=6
-export NFHMAX=24
-export NFHOUT_HF=6
 export FHROT=18
diff --git a/tests/tests/control_wam_debug b/tests/tests/control_wam_debug
index cd87450c7e..6d000e0752 100644
--- a/tests/tests/control_wam_debug
+++ b/tests/tests/control_wam_debug
@@ -46,7 +46,4 @@ export OUTPUT_GRID="gaussian_grid"
 export OZ_PHYS_OLD=.false.
 export OZ_PHYS_NEW=.true.
 export H2O_PHYS=.true.
-export NFHOUT=6
-export NFHMAX=24
-export NFHOUT_HF=6
 export FHROT=18
diff --git a/tests/tests/gnv1_nested b/tests/tests/gnv1_nested
index e9917cb4dc..e4733994c9 100644
--- a/tests/tests/gnv1_nested
+++ b/tests/tests/gnv1_nested
@@ -63,9 +63,7 @@ export RESTART_N=${FHMAX}
 export atm_omp_num_threads=2
 export DT_ATMOS=90
 export IDEFLATE=1
-export NFHMAX_HF=-1
-export NFHOUT_HF=3
-export NFHOUT=3
+export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
 export SHOUR=12
diff --git a/tests/tests/hafs_global_1nest_atm b/tests/tests/hafs_global_1nest_atm
index 5851e28be0..fef76044e1 100644
--- a/tests/tests/hafs_global_1nest_atm
+++ b/tests/tests/hafs_global_1nest_atm
@@ -63,9 +63,7 @@ export RESTART_N=${FHMAX}
 export atm_omp_num_threads=2
 export DT_ATMOS=90
 export IDEFLATE=1
-export NFHMAX_HF=-1
-export NFHOUT_HF=3
-export NFHOUT=3
+export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
 export SHOUR=12
diff --git a/tests/tests/hafs_global_multiple_4nests_atm b/tests/tests/hafs_global_multiple_4nests_atm
index 38cef6282d..cc001fb94a 100644
--- a/tests/tests/hafs_global_multiple_4nests_atm
+++ b/tests/tests/hafs_global_multiple_4nests_atm
@@ -97,9 +97,7 @@ export RESTART_N=${FHMAX}
 export atm_omp_num_threads=2
 export DT_ATMOS=90
 export IDEFLATE=1
-export NFHMAX_HF=-1
-export NFHOUT_HF=3
-export NFHOUT=3
+export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
 export SHOUR=12
diff --git a/tests/tests/hafs_global_storm_following_1nest_atm b/tests/tests/hafs_global_storm_following_1nest_atm
index 1b70ee3b5f..00bf0ca217 100644
--- a/tests/tests/hafs_global_storm_following_1nest_atm
+++ b/tests/tests/hafs_global_storm_following_1nest_atm
@@ -23,9 +23,7 @@ export atm_omp_num_threads=2
 
 export DT_ATMOS=180
 export IDEFLATE=1
-export NFHMAX_HF=-1
-export NFHOUT_HF=3
-export NFHOUT=3
+export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
 export SHOUR=12
diff --git a/tests/tests/hafs_regional_1nest_atm b/tests/tests/hafs_regional_1nest_atm
index ae063cebfe..e032112d5c 100644
--- a/tests/tests/hafs_regional_1nest_atm
+++ b/tests/tests/hafs_regional_1nest_atm
@@ -37,9 +37,7 @@ export RESTART_N=${FHMAX}
 export atm_omp_num_threads=2
 export DT_ATMOS=90
 export IDEFLATE=1
-export NFHMAX_HF=-1
-export NFHOUT_HF=3
-export NFHOUT=3
+export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
 export SHOUR=12
diff --git a/tests/tests/hafs_regional_atm b/tests/tests/hafs_regional_atm
index 8cd666473d..bc75d82dc4 100644
--- a/tests/tests/hafs_regional_atm
+++ b/tests/tests/hafs_regional_atm
@@ -21,9 +21,7 @@ export RESTART_N=${FHMAX}
 export atm_omp_num_threads=2
 export DT_ATMOS=180
 export IDEFLATE=1
-export NFHMAX_HF=-1
-export NFHOUT_HF=3
-export NFHOUT=3
+export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
 export SHOUR=00
diff --git a/tests/tests/hafs_regional_atm_ocn b/tests/tests/hafs_regional_atm_ocn
index 357f126de4..7ec5159cdc 100644
--- a/tests/tests/hafs_regional_atm_ocn
+++ b/tests/tests/hafs_regional_atm_ocn
@@ -24,9 +24,7 @@ export FHMAX=6
 export RESTART_N=${FHMAX}
 export DT_ATMOS=180
 export IDEFLATE=1
-export NFHMAX_HF=-1
-export NFHOUT_HF=3
-export NFHOUT=3
+export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
 export SHOUR=00
diff --git a/tests/tests/hafs_regional_atm_ocn_wav b/tests/tests/hafs_regional_atm_ocn_wav
index e3210d7fff..5fab96a158 100644
--- a/tests/tests/hafs_regional_atm_ocn_wav
+++ b/tests/tests/hafs_regional_atm_ocn_wav
@@ -26,9 +26,7 @@ export FHMAX=6
 export RESTART_N=${FHMAX}
 export DT_ATMOS=180
 export IDEFLATE=1
-export NFHMAX_HF=-1
-export NFHOUT_HF=3
-export NFHOUT=3
+export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
 export SHOUR=00
diff --git a/tests/tests/hafs_regional_atm_thompson_gfdlsf b/tests/tests/hafs_regional_atm_thompson_gfdlsf
index d450fc3a56..8b19ff6aa1 100644
--- a/tests/tests/hafs_regional_atm_thompson_gfdlsf
+++ b/tests/tests/hafs_regional_atm_thompson_gfdlsf
@@ -21,9 +21,7 @@ export atm_omp_num_threads=2
 export DT_ATMOS=180
 export DT_INNER=${DT_ATMOS}
 export IDEFLATE=1
-export NFHMAX_HF=-1
-export NFHOUT_HF=3
-export NFHOUT=3
+export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
 export SHOUR=00
diff --git a/tests/tests/hafs_regional_atm_wav b/tests/tests/hafs_regional_atm_wav
index 38982873b5..588af2cc02 100644
--- a/tests/tests/hafs_regional_atm_wav
+++ b/tests/tests/hafs_regional_atm_wav
@@ -24,9 +24,7 @@ export FHMAX=6
 export RESTART_N=${FHMAX}
 export DT_ATMOS=180
 export IDEFLATE=1
-export NFHMAX_HF=-1
-export NFHOUT_HF=3
-export NFHOUT=3
+export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
 export SHOUR=00
diff --git a/tests/tests/hafs_regional_docn b/tests/tests/hafs_regional_docn
index ee3443f90c..cf63e3c3e2 100644
--- a/tests/tests/hafs_regional_docn
+++ b/tests/tests/hafs_regional_docn
@@ -24,9 +24,7 @@ export FHMAX=6
 export RESTART_N=${FHMAX}
 export DT_ATMOS=180
 export IDEFLATE=1
-export NFHMAX_HF=-1
-export NFHOUT_HF=3
-export NFHOUT=3
+export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
 export SHOUR=00
diff --git a/tests/tests/hafs_regional_docn_oisst b/tests/tests/hafs_regional_docn_oisst
index b303e33287..5daf17b36d 100644
--- a/tests/tests/hafs_regional_docn_oisst
+++ b/tests/tests/hafs_regional_docn_oisst
@@ -24,9 +24,7 @@ export FHMAX=6
 export RESTART_N=${FHMAX}
 export DT_ATMOS=180
 export IDEFLATE=1
-export NFHMAX_HF=-1
-export NFHOUT_HF=3
-export NFHOUT=3
+export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=29
 export SHOUR=00
diff --git a/tests/tests/hafs_regional_specified_moving_1nest_atm b/tests/tests/hafs_regional_specified_moving_1nest_atm
index 62f27c03d5..b63514076c 100644
--- a/tests/tests/hafs_regional_specified_moving_1nest_atm
+++ b/tests/tests/hafs_regional_specified_moving_1nest_atm
@@ -24,9 +24,7 @@ export RESTART_N=${FHMAX}
 export atm_omp_num_threads=2
 export DT_ATMOS=180
 export IDEFLATE=1
-export NFHMAX_HF=-1
-export NFHOUT_HF=3
-export NFHOUT=3
+export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
 export SHOUR=12
diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm b/tests/tests/hafs_regional_storm_following_1nest_atm
index e8ba8b173c..86bcd9a155 100644
--- a/tests/tests/hafs_regional_storm_following_1nest_atm
+++ b/tests/tests/hafs_regional_storm_following_1nest_atm
@@ -37,9 +37,7 @@ export RESTART_N=${FHMAX}
 export atm_omp_num_threads=2
 export DT_ATMOS=180
 export IDEFLATE=1
-export NFHMAX_HF=-1
-export NFHOUT_HF=3
-export NFHOUT=3
+export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
 export SHOUR=12
diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn
index 9deabd4cab..ea93a7bcbd 100644
--- a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn
+++ b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn
@@ -24,9 +24,7 @@ export FHMAX=6
 export RESTART_N=${FHMAX}
 export DT_ATMOS=180
 export IDEFLATE=1
-export NFHMAX_HF=-1
-export NFHOUT_HF=3
-export NFHOUT=3
+export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
 export SHOUR=12
diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug
index 130798abf4..5c154521f5 100644
--- a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug
+++ b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug
@@ -22,9 +22,7 @@ export FHMAX=1
 export RESTART_N=${FHMAX}
 export DT_ATMOS=180
 export IDEFLATE=1
-export NFHMAX_HF=-1
-export NFHOUT_HF=1
-export NFHOUT=1
+export OUTPUT_FH='1 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
 export SHOUR=12
diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav
index 1ff1f19a28..01e0e6985e 100644
--- a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav
+++ b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav
@@ -26,9 +26,7 @@ export FHMAX=6
 export RESTART_N=${FHMAX}
 export DT_ATMOS=180
 export IDEFLATE=1
-export NFHMAX_HF=-1
-export NFHOUT_HF=3
-export NFHOUT=3
+export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
 export SHOUR=12
diff --git a/tests/tests/hafs_regional_telescopic_2nests_atm b/tests/tests/hafs_regional_telescopic_2nests_atm
index aba5b99b0a..b2dbfbab9c 100644
--- a/tests/tests/hafs_regional_telescopic_2nests_atm
+++ b/tests/tests/hafs_regional_telescopic_2nests_atm
@@ -24,9 +24,7 @@ export RESTART_N=${FHMAX}
 export atm_omp_num_threads=2
 export DT_ATMOS=90
 export IDEFLATE=1
-export NFHMAX_HF=-1
-export NFHOUT_HF=3
-export NFHOUT=3
+export OUTPUT_FH='3 -1'
 export OUTPUT_FILE="'netcdf' 'netcdf'"
 export SDAY=25
 export SHOUR=12
diff --git a/tests/tests/regional_atmaq b/tests/tests/regional_atmaq
index 6df575f467..dedb5bd9d4 100644
--- a/tests/tests/regional_atmaq
+++ b/tests/tests/regional_atmaq
@@ -31,7 +31,6 @@ export SHOUR=12
 export FHMAX=6
 export DT_ATMOS=180
 export WRTTASK_PER_GROUP=8
-export NSOUT=-1
 export OUTPUT_GRID='lambert_conformal'
 export NSTF_NAME='2,0,0,0,0'
 export IAER=5111
diff --git a/tests/tests/regional_atmaq_debug b/tests/tests/regional_atmaq_debug
index 0e4aa0216c..5dff07333f 100644
--- a/tests/tests/regional_atmaq_debug
+++ b/tests/tests/regional_atmaq_debug
@@ -29,7 +29,6 @@ export SHOUR=12
 export FHMAX=1
 export DT_ATMOS=180
 export WRTTASK_PER_GROUP=8
-export NSOUT=-1
 export OUTPUT_GRID='lambert_conformal'
 export NSTF_NAME='2,0,0,0,0'
 export IAER=5111
diff --git a/tests/tests/regional_atmaq_faster b/tests/tests/regional_atmaq_faster
index 0d2bc1a434..8530247914 100644
--- a/tests/tests/regional_atmaq_faster
+++ b/tests/tests/regional_atmaq_faster
@@ -31,7 +31,6 @@ export SHOUR=12
 export FHMAX=6
 export DT_ATMOS=120
 export WRTTASK_PER_GROUP=8
-export NSOUT=-1
 export OUTPUT_GRID='lambert_conformal'
 export NSTF_NAME='2,0,0,0,0'
 export IAER=5111

From 45aa6084d3a239166f6890d3c2d6c056c8c3a440 Mon Sep 17 00:00:00 2001
From: Dusan Jovic <dusan.jovic@noaa.gov>
Date: Thu, 14 Dec 2023 02:24:14 +0000
Subject: [PATCH 3/8] Remove output_1st_tstep_rst

---
 doc/UsersGuide/source/InputsOutputs.rst       | 4 ----
 tests/parm/model_configure_hafs.IN            | 1 -
 tests/parm/model_configure_regional_rrfs_a.IN | 1 -
 tests/parm/model_configure_regional_stoch.IN  | 1 -
 tests/parm/model_configure_rrfs_conus13km.IN  | 1 -
 5 files changed, 8 deletions(-)

diff --git a/doc/UsersGuide/source/InputsOutputs.rst b/doc/UsersGuide/source/InputsOutputs.rst
index 7e19dca68a..66e0359ad8 100644
--- a/doc/UsersGuide/source/InputsOutputs.rst
+++ b/doc/UsersGuide/source/InputsOutputs.rst
@@ -1404,10 +1404,6 @@ shows the following parameters that can be set in ``model_configure`` at run-tim
      - atmosphere time step in second
      - integer
      - 1800 (for C96)
-   * - output_1st_tstep_rst
-     - output first time step history file after restart
-     - logical
-     - .false.
    * - restart_interval
      - frequency to output restart file or forecast hours to write out restart file
      - integer
diff --git a/tests/parm/model_configure_hafs.IN b/tests/parm/model_configure_hafs.IN
index 522e64cca6..5408507b7e 100644
--- a/tests/parm/model_configure_hafs.IN
+++ b/tests/parm/model_configure_hafs.IN
@@ -7,7 +7,6 @@ start_second:            0
 nhours_fcst:             @[FHMAX]
 dt_atmos:                @[DT_ATMOS]
 restart_interval:        @[RESTART_INTERVAL]
-output_1st_tstep_rst:    .false.
 
 quilting:                @[QUILTING]
 quilting_restart:        @[QUILTING_RESTART]
diff --git a/tests/parm/model_configure_regional_rrfs_a.IN b/tests/parm/model_configure_regional_rrfs_a.IN
index a26b3aff52..2bc7c4c963 100644
--- a/tests/parm/model_configure_regional_rrfs_a.IN
+++ b/tests/parm/model_configure_regional_rrfs_a.IN
@@ -8,7 +8,6 @@ nhours_fcst:             @[FHMAX]
 dt_atmos:                60
 cpl:                     .false.
 restart_interval:        @[RESTART_INTERVAL]
-output_1st_tstep_rst:    .false.
 quilting:                @[QUILTING]
 
 
diff --git a/tests/parm/model_configure_regional_stoch.IN b/tests/parm/model_configure_regional_stoch.IN
index 0f7b44b803..64928e436f 100644
--- a/tests/parm/model_configure_regional_stoch.IN
+++ b/tests/parm/model_configure_regional_stoch.IN
@@ -9,7 +9,6 @@ fhrot:                   @[FHROT]
 
 dt_atmos:                36
 restart_interval:        @[RESTART_INTERVAL]
-output_1st_tstep_rst:    .false.
 
 quilting:                @[QUILTING]
 write_groups:            1
diff --git a/tests/parm/model_configure_rrfs_conus13km.IN b/tests/parm/model_configure_rrfs_conus13km.IN
index c4e0fc7096..792afa352f 100644
--- a/tests/parm/model_configure_rrfs_conus13km.IN
+++ b/tests/parm/model_configure_rrfs_conus13km.IN
@@ -9,7 +9,6 @@ fhrot:                   @[FHROT]
 
 dt_atmos:                @[DT_ATMOS]
 restart_interval:        @[RESTART_INTERVAL]
-output_1st_tstep_rst:    .false.
 
 quilting:                @[QUILTING]
 quilting_restart:        @[QUILTING_RESTART]

From cbcab340e632ce51686377538f49349335d2b085 Mon Sep 17 00:00:00 2001
From: Dusan Jovic <dusan.jovic@noaa.gov>
Date: Thu, 14 Dec 2023 02:26:30 +0000
Subject: [PATCH 4/8] Update documentation, remove nfhout, nfhmax_hf,
 nfhout_hf, nsout

---
 doc/UsersGuide/source/InputsOutputs.rst | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/doc/UsersGuide/source/InputsOutputs.rst b/doc/UsersGuide/source/InputsOutputs.rst
index 66e0359ad8..0489b632d8 100644
--- a/doc/UsersGuide/source/InputsOutputs.rst
+++ b/doc/UsersGuide/source/InputsOutputs.rst
@@ -1448,22 +1448,6 @@ shows the following parameters that can be set in ``model_configure`` at run-tim
      - j-dimension for output grid
      - integer
      - 190
-   * - nfhout
-     - history file output frequency
-     - integer
-     - 3
-   * - nfhmax_hf
-     - forecast length of high history file
-     - integer
-     - 0 (0:no high frequency output)
-   * - nfhout_hf
-     - high history file output frequency
-     - integer
-     - 1
-   * - nsout
-     - output frequency of number of time step
-     - integer
-     - -1 (negative: turn off the option, 1: output history file at every time step)
    * - output_fh
      - history file output forecast hours or history file output frequency if the second elelment is -1
      - real

From bd9a70d04e1a2c88b0ddfd6f285796aed0869168 Mon Sep 17 00:00:00 2001
From: Dusan Jovic <dusan.jovic@noaa.gov>
Date: Thu, 14 Dec 2023 02:28:44 +0000
Subject: [PATCH 5/8] Update rt_utils.sh, set test_status to FAIL if nccmp
 crashes due to an error

---
 tests/rt_utils.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/rt_utils.sh b/tests/rt_utils.sh
index fec27a0d50..41f09b1501 100755
--- a/tests/rt_utils.sh
+++ b/tests/rt_utils.sh
@@ -348,18 +348,18 @@ check_results() {
 
         if [[ $d -eq 1 && ${i##*.} == 'nc' ]] ; then
           if [[ " orion hercules hera wcoss2 acorn cheyenne gaea gaea-c5 jet s4 noaacloud " =~ " ${MACHINE_ID} " ]]; then
-            printf ".......ALT CHECK.." >> ${RT_LOG}
-            printf ".......ALT CHECK.."
-              if [[ $CMP_DATAONLY == false ]]; then
-                nccmp -d -S -q -f -g -B --Attribute=checksum --warn=format ${RTPWD}/${CNTL_DIR}_${RT_COMPILER}/${i} ${RUNDIR}/${i} > ${i}_nccmp.log 2>&1 && d=$? || d=$?
-              else
-                nccmp -d -S -q -f -B --Attribute=checksum --warn=format ${RTPWD}/${CNTL_DIR}_${RT_COMPILER}/${i} ${RUNDIR}/${i} > ${i}_nccmp.log 2>&1 && d=$? || d=$?
-              fi
-              if [[ $d -ne 0 && $d -ne 1 ]]; then
-                echo "....ERROR" >> ${RT_LOG}
-                echo "....ERROR"
-                exit 1
-              fi
+            printf "....ALT CHECK" >> ${RT_LOG}
+            printf "....ALT CHECK"
+            if [[ $CMP_DATAONLY == false ]]; then
+              nccmp -d -S -q -f -g -B --Attribute=checksum --warn=format ${RTPWD}/${CNTL_DIR}_${RT_COMPILER}/${i} ${RUNDIR}/${i} > ${i}_nccmp.log 2>&1 && d=$? || d=$?
+            else
+              nccmp -d -S -q -f    -B --Attribute=checksum --warn=format ${RTPWD}/${CNTL_DIR}_${RT_COMPILER}/${i} ${RUNDIR}/${i} > ${i}_nccmp.log 2>&1 && d=$? || d=$?
+            fi
+            if [[ $d -ne 0 && $d -ne 1 ]]; then
+              printf "....ERROR" >> ${RT_LOG}
+              printf "....ERROR"
+              test_status='FAIL'
+            fi
           fi
         fi
 

From 1d11152b0fe71e68256905feab5d0e76342f7cc8 Mon Sep 17 00:00:00 2001
From: Dusan Jovic <dusan.jovic@noaa.gov>
Date: Thu, 14 Dec 2023 02:33:20 +0000
Subject: [PATCH 6/8] Delete 'diro' and 'logfile' from WAV section in
 ufs.configure templates

---
 tests/parm/ufs.configure.atmw.IN      | 2 --
 tests/parm/ufs.configure.s2sw.IN      | 2 --
 tests/parm/ufs.configure.s2sw_slow.IN | 2 --
 tests/parm/ufs.configure.s2swa.IN     | 2 --
 4 files changed, 8 deletions(-)

diff --git a/tests/parm/ufs.configure.atmw.IN b/tests/parm/ufs.configure.atmw.IN
index d954841a35..8434d5a7cb 100644
--- a/tests/parm/ufs.configure.atmw.IN
+++ b/tests/parm/ufs.configure.atmw.IN
@@ -34,8 +34,6 @@ WAV_omp_num_threads:            @[wav_omp_num_threads]
 WAV_attributes::
   Verbosity = 0
   OverwriteSlice = false
-  diro = "."
-  logfile = wav.log
   mesh_wav = @[MESH_WAV]
   user_sets_restname = true
 ::
diff --git a/tests/parm/ufs.configure.s2sw.IN b/tests/parm/ufs.configure.s2sw.IN
index 0add5c014a..84efa7ca6b 100644
--- a/tests/parm/ufs.configure.s2sw.IN
+++ b/tests/parm/ufs.configure.s2sw.IN
@@ -66,8 +66,6 @@ WAV_omp_num_threads:            @[wav_omp_num_threads]
 WAV_attributes::
   Verbosity = 0
   OverwriteSlice = false
-  diro = "."
-  logfile = wav.log
   mesh_wav = @[MESH_WAV]
   user_sets_restname = true
 ::
diff --git a/tests/parm/ufs.configure.s2sw_slow.IN b/tests/parm/ufs.configure.s2sw_slow.IN
index ef48b33b82..63e691c892 100644
--- a/tests/parm/ufs.configure.s2sw_slow.IN
+++ b/tests/parm/ufs.configure.s2sw_slow.IN
@@ -62,8 +62,6 @@ WAV_petlist_bounds:             @[wav_petlist_bounds]
 WAV_attributes::
   Verbosity = 0
   OverwriteSlice = false
-  diro = "."
-  logfile = wav.log
   mesh_wav = @[MESH_WAV]
   user_sets_restname = true
 ::
diff --git a/tests/parm/ufs.configure.s2swa.IN b/tests/parm/ufs.configure.s2swa.IN
index fa0cb655ff..48f999c211 100644
--- a/tests/parm/ufs.configure.s2swa.IN
+++ b/tests/parm/ufs.configure.s2swa.IN
@@ -73,8 +73,6 @@ WAV_omp_num_threads:            @[wav_omp_num_threads]
 WAV_attributes::
   Verbosity = 0
   OverwriteSlice = false
-  diro = "."
-  logfile = wav.log
   mesh_wav = @[MESH_WAV]
   user_sets_restname = true
 ::

From cceedab79ffa08ad0ce0b0c0f0c67789c143ad12 Mon Sep 17 00:00:00 2001
From: Dusan Jovic <dusan.jovic@noaa.gov>
Date: Thu, 14 Dec 2023 02:38:44 +0000
Subject: [PATCH 7/8] Update FV3

---
 FV3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FV3 b/FV3
index eb5d087401..4592fade6f 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit eb5d087401283cb133991899940d43aff8ae7353
+Subproject commit 4592fade6fd141307bdb0799dfab949576b10467

From 81526d74631b5b0f8c434d29f4db56d03c575378 Mon Sep 17 00:00:00 2001
From: Dusan Jovic <dusan.jovic@noaa.gov>
Date: Thu, 14 Dec 2023 15:44:49 +0000
Subject: [PATCH 8/8] Fix default value of output_fh for hafs, and rrfs_a.

---
 tests/default_vars.sh                         | 2 +-
 tests/parm/model_configure_regional_rrfs_a.IN | 2 +-
 tests/rt_weekly.conf                          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 34e3163135..ff3d867daf 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -1333,7 +1333,7 @@ export NY_6=''
 export DX_6=''
 export DY_6=''
 
-export OUTPUT_FH=-1
+export OUTPUT_FH='3 -1'
 }
 export_hrrr() {
 export_fv3
diff --git a/tests/parm/model_configure_regional_rrfs_a.IN b/tests/parm/model_configure_regional_rrfs_a.IN
index 2bc7c4c963..bfe5b89802 100644
--- a/tests/parm/model_configure_regional_rrfs_a.IN
+++ b/tests/parm/model_configure_regional_rrfs_a.IN
@@ -21,7 +21,7 @@ filename_base:           'dyn''phy'
 output_file:             'netcdf'
 write_nemsioflip:        .false.
 
-output_fh:  60 -1
+output_fh:  1 -1
 
 #
 # Coordinate system used by the output grid.
diff --git a/tests/rt_weekly.conf b/tests/rt_weekly.conf
index e3ff4bd16b..5d460e6df2 100644
--- a/tests/rt_weekly.conf
+++ b/tests/rt_weekly.conf
@@ -1,6 +1,6 @@
 ### Weekly tests ###
 
-COMPILE | 1 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_nsstNoahmpUGWPv1 -D32BIT=ON | + hera | fv3 |
+COMPILE | 1 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON | + hera | fv3 |
 RUN     | control_c768         | + hera | baseline |
 
 # CPLD Benchmark 35d tests