flexible output hour for history files and and update MOM6 to GFDL 2…

…0210723 (ufs-community#691) * add code changes for flexible output hour * replace FDIAG with OUTPUT_FH in test script * fix RESTART_INTERVAL for control_atm_aerosols test * Fix for new hera ecflow requirements * update mom6 to GFDL 20210723 * update fv3 for print line with gnu * remove nemsio in model_configure_fhout.IN * revert FMS2 to FMS1 in MOM6-interface/mom6_files.cmake for gnu compiler * Changes to keep utests up to date with PR 691 Co-authored-by: Jun Wang <junwang-noaa@users.noreply.github.com> Co-authored-by: Brian Curtis <brian.curtis@noaa.gov> Co-authored-by: MinsukJi-NOAA <minsuk.ji@noaa.gov> Co-authored-by: jiandewang <jiande.wang@noaa.gov>
mzhangw · Jul 27, 2021 · 74a34d2 · 74a34d2
1 parent 98dfa96
commit 74a34d2
Show file tree

Hide file tree

Showing 110 changed files with 3,081 additions and 2,696 deletions.
diff --git a/FV3 b/FV3
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
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_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/default_vars.sh b/tests/default_vars.sh
@@ -548,7 +548,7 @@ export NPY=97
 export NPZ=64
 export NPZP=65
 export NSTF_NAME=2,1,1,0,5
-export FDIAG=0,1,2,3,4,5,6,7,8,9,10,11,12,15,18,21,24,27,30,33,36,39,42,45,48
+export OUTPUT_FH="0 1 2 3 4 5 6 7 8 9 10 11 12 15 18 21 24 27 30 33 36 39 42 45 48"
 export NFHOUT=3
 export NFHMAX_HF=12
 export NFHOUT_HF=1
@@ -695,11 +695,7 @@ export DIAG_TABLE_ADDITIONAL=''
 
 export FHROT='0'
 export NSOUT='-1'
-export FDIAG='6'
-export NFHOUT='6'
-#no high freq fv3 output
-export NFHMAX_HF='-1'
-export NFHOUT_HF='-1'
+export OUTPUT_FH='6 -1'
 export FHZERO=${FHZERO}
 
 export CPLFLX='.T.'
@@ -820,8 +816,7 @@ export SDAY='01'
 export SHOUR='00'
 export CDATE=${SYEAR}${SMONTH}${SDAY}${SHOUR}
 
-export NFHOUT=6
-export FDIAG=6
+export NFHOUT="6"
 export DT_ATMOS='900'
 export DT_CICE=${DT_ATMOS}
 export DT_DYNAM_MOM6='1800'
@@ -932,8 +927,7 @@ export SDAY='01'
 export SHOUR='00'
 export CDATE=${SYEAR}${SMONTH}${SDAY}${SHOUR}
 
-export NFHOUT=6
-export FDIAG=6
+export NFHOUT="6"
 export DT_ATMOS='900'
 export DT_CICE=${DT_ATMOS}
 export DT_DYNAM_MOM6='1800'

diff --git a/tests/detect_machine.sh b/tests/detect_machine.sh
@@ -59,6 +59,7 @@ case $(hostname -f) in
   hfe10)                   MACHINE_ID=hera ;; ### hera10
   hfe11)                   MACHINE_ID=hera ;; ### hera11
   hfe12)                   MACHINE_ID=hera ;; ### hera12
+  hecflow01)               MACHINE_ID=hera ;; ### heraecflow01
 
   fe1)                     MACHINE_ID=jet ;; ### jet01
   fe2)                     MACHINE_ID=jet ;; ### jet02

diff --git a/tests/parm/c96_HAFS_v0_hwrf.nml.IN b/tests/parm/c96_HAFS_v0_hwrf.nml.IN
@@ -2,11 +2,6 @@
   blocksize = 32
   chksum_debug = .false.
   dycore_only = .false.
-  fdiag = 1
-  fhmax = 384
-  fhout = 3
-  fhmaxhf = 120
-  fhouthf = 1
   ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/control.nml.IN b/tests/parm/control.nml.IN
@@ -2,7 +2,6 @@
   blocksize = 32
   chksum_debug = .false.
   dycore_only = .false.
-  fdiag = @[FDIAG]
   ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/control_ca.nml.IN b/tests/parm/control_ca.nml.IN
@@ -2,7 +2,6 @@
   blocksize = 32
   chksum_debug = .false.
   dycore_only = .false.
-  fdiag = @[FDIAG]
   ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/control_csawmg.nml.IN b/tests/parm/control_csawmg.nml.IN
@@ -2,7 +2,6 @@
   blocksize = 32
   chksum_debug = .false.
   dycore_only = .false.
-  fdiag = @[FDIAG]
   ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/control_flake.nml.IN b/tests/parm/control_flake.nml.IN
@@ -2,7 +2,6 @@
   blocksize = 32
   chksum_debug = .false.
   dycore_only = .false.
-  fdiag = @[FDIAG]
   ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/control_gdas.nml.IN b/tests/parm/control_gdas.nml.IN
@@ -2,7 +2,6 @@
   blocksize = 32
   chksum_debug = .false.
   dycore_only = .false.
-  fdiag = @[FDIAG]
   ccpp_suite = '@[CCPP_SUITE]'
 
 /

diff --git a/tests/parm/control_noahmp.nml.IN b/tests/parm/control_noahmp.nml.IN
@@ -2,7 +2,6 @@
   blocksize = 32
   chksum_debug = .false.
   dycore_only = .false.
-  fdiag = @[FDIAG]
   ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/control_rrtmgp.nml.IN b/tests/parm/control_rrtmgp.nml.IN
@@ -2,7 +2,6 @@
   blocksize = 32
   chksum_debug = .false.
   dycore_only = .false.
-  fdiag = @[FDIAG]
   ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/control_thompson.nml.IN b/tests/parm/control_thompson.nml.IN
@@ -2,7 +2,6 @@
   blocksize = 32
   chksum_debug = .false.
   dycore_only = .false.
-  fdiag = @[FDIAG]
   ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/control_ugwpv1.nml.IN b/tests/parm/control_ugwpv1.nml.IN
@@ -2,7 +2,6 @@
   blocksize = 32
   chksum_debug = .false.
   dycore_only = .false.
-  fdiag = @[FDIAG]
   ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/cpt.nml.IN b/tests/parm/cpt.nml.IN
@@ -2,7 +2,6 @@
        blocksize    = 32
        chksum_debug = .false.
        dycore_only  = .false.
-       fdiag        = @[FDIAG]
        ccpp_suite   = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/csawmg3shoc127.nml.IN b/tests/parm/csawmg3shoc127.nml.IN
@@ -2,7 +2,6 @@
        blocksize    = 32
        chksum_debug = .false.
        dycore_only  = .false.
-       fdiag        = @[FDIAG]
        ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/csawmgshoc.nml.IN b/tests/parm/csawmgshoc.nml.IN
@@ -2,7 +2,6 @@
        blocksize    = 32
        chksum_debug = .false.
        dycore_only  = .false.
-       fdiag        = @[FDIAG]
        ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/esg_HAFS_v0_hwrf.nml.IN b/tests/parm/esg_HAFS_v0_hwrf.nml.IN
@@ -2,11 +2,6 @@
   blocksize = 10
   chksum_debug = .false.
   dycore_only = .false.
-  fdiag = 1
-  fhmax = 384
-  fhout = 3
-  fhmaxhf = 120
-  fhouthf = 1
   ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/gsd.nml.IN b/tests/parm/gsd.nml.IN
@@ -2,7 +2,6 @@
        blocksize = 32
        chksum_debug = .false.
        dycore_only = .false.
-       fdiag = @[FDIAG]
        ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/gsd_rrtmgp.nml.IN b/tests/parm/gsd_rrtmgp.nml.IN
@@ -2,7 +2,6 @@
        blocksize = 32
        chksum_debug = .false.
        dycore_only = .false.
-       fdiag = @[FDIAG]
        ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/gsd_sar.nml.IN b/tests/parm/gsd_sar.nml.IN
@@ -2,7 +2,6 @@
      blocksize = 550
      chksum_debug = .false.
      dycore_only = .false.
-     fdiag = 1
      ccpp_suite = 'FV3_GSD_SAR'
 /
 

diff --git a/tests/parm/input.benchmark_v16.nml.IN b/tests/parm/input.benchmark_v16.nml.IN
@@ -2,11 +2,6 @@
   blocksize = 32
   chksum_debug = .false.
   dycore_only = .false.
-  fdiag = @[FDIAG]
-  fhmax = @[FHMAX]
-  fhout = @[NFHOUT]
-  fhmaxhf = @[NFHMAX_HF]
-  fhouthf = @[NFHOUT_HF]
   ccpp_suite = '@[CCPP_SUITE]'
 
 /

diff --git a/tests/parm/input.benchmark_v16_p7b.nml.IN b/tests/parm/input.benchmark_v16_p7b.nml.IN
@@ -2,11 +2,6 @@
   blocksize = 32
   chksum_debug = .false.
   dycore_only = .false.
-  fdiag = @[FDIAG]
-  fhmax = @[FHMAX]
-  fhout = @[NFHOUT]
-  fhmaxhf = @[NFHMAX_HF]
-  fhouthf = @[NFHOUT_HF]
   ccpp_suite = '@[CCPP_SUITE]'
 
 /

diff --git a/tests/parm/input.mom6_ccpp.nml.IN b/tests/parm/input.mom6_ccpp.nml.IN
@@ -2,11 +2,6 @@
        blocksize = 32
        chksum_debug = .false.
        dycore_only = .false.
-       fdiag = @[FDIAG]
-       fhmax = @[FHMAX]
-       fhout = @[NFHOUT]
-       fhmaxhf = @[NFHMAX_HF]
-       fhouthf = @[NFHOUT_HF]
        ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/input_nest02.nml.IN b/tests/parm/input_nest02.nml.IN
@@ -2,7 +2,6 @@
        blocksize = 24
        chksum_debug = .false.
        dycore_only = .false.
-       fdiag = @[FDIAG]
        ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/model_configure.IN b/tests/parm/model_configure.IN
@@ -28,8 +28,5 @@ nbits:                   @[NBITS]
 imo:                     @[IMO]
 jmo:                     @[JMO]
 
-nfhout:                  @[NFHOUT]
-nfhmax_hf:               @[NFHMAX_HF]
-nfhout_hf:               @[NFHOUT_HF]
-nsout:                   -1
+output_fh:               @[OUTPUT_FH]
 iau_offset:              @[IAU_OFFSET]
diff --git a/tests/parm/model_configure_fhout.IN b/tests/parm/model_configure_fhout.IN
@@ -0,0 +1,37 @@
+total_member:            @[ENS_NUM]
+print_esmf:              .true.
+PE_MEMBER01:             @[TASKS]
+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]
+calendar:                'julian'
+restart_interval:        @[RESTART_INTERVAL]
+fhrot:                   @[FHROT]
+output_1st_tstep_rst:    .false.
+atm_coupling_interval_sec:      @[coupling_interval_fast_sec]
+
+quilting:                @[QUILTING]
+write_groups:            @[WRITE_GROUP]
+write_tasks_per_group:   @[WRTTASK_PER_GROUP]
+output_history:          @[OUTPUT_HISTORY]
+write_dopost:            @[WRITE_DOPOST]
+num_files:               @[NUM_FILES]
+filename_base:           @[FILENAME_BASE]
+output_grid:             @[OUTPUT_GRID]
+output_file:             @[OUTPUT_FILE]
+ideflate:                @[IDEFLATE]
+nbits:                   @[NBITS]
+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_regional.IN b/tests/parm/model_configure_regional.IN
@@ -64,4 +64,5 @@ kchunk3d:                -1
 nfhout:                  3
 nfhmax_hf:               12
 nfhout_hf:               1
+output_fh:               @[OUTPUT_FH]
 nsout:                   -1
diff --git a/tests/parm/multi_gases.nml.IN b/tests/parm/multi_gases.nml.IN
@@ -2,7 +2,6 @@
        blocksize = 32
        chksum_debug = .false.
        dycore_only = .false.
-       fdiag = @[FDIAG]
        ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/regional.nml.IN b/tests/parm/regional.nml.IN
@@ -2,7 +2,6 @@
        blocksize = 32
        chksum_debug = .false.
        dycore_only = .false.
-       fdiag = @[FDIAG]
        ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/regional_c768.nml.IN b/tests/parm/regional_c768.nml.IN
@@ -2,7 +2,6 @@
        blocksize = 32
        chksum_debug = .false.
        dycore_only = .false.
-       fdiag = 1
        ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/regional_rrtmgp.nml.IN b/tests/parm/regional_rrtmgp.nml.IN
@@ -2,7 +2,6 @@
        blocksize = 32
        chksum_debug = .false.
        dycore_only = .false.
-       fdiag = @[FDIAG]
        ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/stretched-input.nml.IN b/tests/parm/stretched-input.nml.IN
@@ -2,7 +2,6 @@
        blocksize = 32
        chksum_debug = .false.
        dycore_only = .false.
-       fdiag = @[FDIAG]
        ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/parm/stretched-nest-input.nml.IN b/tests/parm/stretched-nest-input.nml.IN
@@ -2,7 +2,6 @@
        blocksize = 24
        chksum_debug = .false.
        dycore_only = .false.
-       fdiag = @[FDIAG]
        ccpp_suite = '@[CCPP_SUITE]'
 /
 

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -40,6 +40,7 @@ RUN     | control
 RUN     | control_decomp                                                                                                          |                                         |     |
 RUN     | control_2threads                                                                                                        | - wcoss_cray                            |     |
 RUN     | control_restart                                                                                                         |                                         |     | control
+RUN     | control_fhzero                                                                                                          |                                         |     |
 RUN     | control_CubedSphereGrid                                                                                                 |                                         | fv3 |
 RUN     | control_wrtGauss_netcdf_parallel                                                                                        |                                         | fv3 |
 RUN     | control_c192                                                                                                            |                                         | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -194,7 +194,7 @@ elif [[ $MACHINE_ID = wcoss2 ]]; then
   #ECFLOW_START=${ECF_ROOT}/intel/bin/ecflow_start.sh
   #ECF_PORT=$(grep $USER /usrx/local/sys/ecflow/assigned_ports.txt | awk '{print $2}')
 
-  DISKNM=/lfs/h1/emc/ptmp/Dusan.Jovic/RT
+  DISKNM=/lfs/h1/emc/ptmp/${USER}/RT
   QUEUE=workq
   COMPILE_QUEUE=workq
   PARTITION=
@@ -235,8 +235,13 @@ elif [[ $MACHINE_ID = hera.* ]]; then
   PYTHONHOME=/scratch1/NCEPDEV/nems/emc.nemspara/soft/miniconda3_new_20210629
   export PATH=$PYTHONHOME/bin:$PATH
   export PYTHONPATH=$PYTHONHOME/lib/python3.7/site-packages
-  ECFLOW_START=$PYTHONHOME/bin/ecflow_start.sh
-  ECF_PORT=$(( $(id -u) + 1500 ))
+
+  if [[ ! $HOSTNAME = hecflow* ]]; then
+    echo "ERROR: On Hera we must be logged into 'hecflow' login nodes"
+    exit 1
+  fi
+  module load ecflow
+  ECFLOW_START=ecflow_start.sh
 
   QUEUE=debug
   COMPILE_QUEUE=batch

diff --git a/tests/rt_utils.sh b/tests/rt_utils.sh
@@ -538,7 +538,7 @@ ecflow_run() {
   not_running=$?
   if [[ $not_running -eq 1 ]]; then
     echo "ecflow_server is NOT running on ${ECF_HOST}:${ECF_PORT}"
-    sh ${ECFLOW_START} -p ${ECF_PORT}
+    ${ECFLOW_START} -p ${ECF_PORT}
   else
     echo "ecflow_server is already running on ${ECF_HOST}:${ECF_PORT}"
   fi