ufs-community · DusanJovic-NOAA · Dec 13, 2023 · Dec 14, 2023 · Dec 14, 2023 · Dec 14, 2023
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/DusanJovic-NOAA/fv3atm
+  branch = remove_nfhout
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3

diff --git a/FV3 b/FV3
diff --git 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
@@ -1452,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

diff --git 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,11 +1333,7 @@ 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 OUTPUT_FH='3 -1'
 }
 export_hrrr() {
 export_fv3

diff --git 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
@@ -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
@@ -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
diff --git 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]
@@ -140,10 +139,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
@@ -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
@@ -8,7 +8,6 @@ nhours_fcst:             @[FHMAX]
 dt_atmos:                60
 cpl:                     .false.
 restart_interval:        @[RESTART_INTERVAL]
-output_1st_tstep_rst:    .false.
 quilting:                @[QUILTING]
 
 
@@ -21,26 +20,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:  1 -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
@@ -9,7 +9,6 @@ fhrot:                   @[FHROT]
 
 dt_atmos:                36
 restart_interval:        @[RESTART_INTERVAL]
-output_1st_tstep_rst:    .false.
 
 quilting:                @[QUILTING]
 write_groups:            1
@@ -32,6 +31,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
@@ -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]
@@ -29,26 +28,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/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
@@ -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
@@ -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
@@ -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
 ::

diff --git 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
 

diff --git 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

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -53,4 +53,3 @@ dy: 3000.0
		#dlat: 0.025

		output_fh: @[OUTPUT_FH]
		nsout: -1