Merge pull request #86 from hafs-community/feature/hafs_sync_202107

Sync HAFS submodules with their corresponding authoritative branches: - hafs_forecast.fd as of 08/05/2021 - hafs_gsi.fd as of 08/06/2021 plus the dual-resolution 3DEnVar bug fix - hafs_post.fd as of 08/02/2021 - hafs_utils.fd as of as of 07/23/2021 - hafs_graphics.fd/hrd_gplot as of 08/10/2021 - hafs_graphics.fd/emc_graphics as of 08/10/2021 Besides application level changes were made accordingly with the updated submodules. This PR addresses issue #80. Notes: - The [bug of wrong Time dimension in FV3 restart sfc_data files](NOAA-EMC/fv3atm#344) has been fixed in ufs-weather-model through this ufs-weather-model [PR](ufs-community/ufs-weather-model#702). - The bug fix in for the dual-resolution EnVar analysis in GSI (hafs_gsi.fd) contributed from OU collaborators has also been included in this PR. With that the HAFS ENSDA configurations can now work properly. - As for the hafs_forecast.fd submodule, support/HAFS branch is identical to the ufs-weather-model develop branch as of 08/05/2021. More information can be found through this PR (ufs-community/ufs-weather-model#715)
hafs-community · Aug 13, 2021 · 79f611d · 79f611d
2 parents da78d4d + a349a24
commit 79f611d
Show file tree

Hide file tree

Showing 41 changed files with 230 additions and 200 deletions.
diff --git a/jobs/JHAFS_FORECAST b/jobs/JHAFS_FORECAST
@@ -21,7 +21,12 @@ if [ "${RUN_ENVIR^^}" != NCO ]; then
     module unload intelpython 
   fi
   module use ${HOMEhafs}/sorc/hafs_forecast.fd/modulefiles
-  module load ufs_${machine}
+  module unload intelpython 
+  if [ "${machine}" = "wcoss_cray" ] || [ "${machine}" = "wcoss_dell_p3" ]; then 
+    module load ufs_${machine}
+  else
+    module load ufs_${machine}.intel
+  fi
   module list
 fi
 

diff --git a/jobs/JHAFS_HRDGRAPHICS b/jobs/JHAFS_HRDGRAPHICS
@@ -47,7 +47,7 @@ export STORMID=${STORMID:-00L}
 export ENSDA=${ENSDA:-NO}
 
 export INPdir=${INPdir:-${WORKhafs}/forecast}
-export DATA=${WORKhafs}/hrd_graphics
+export DATA=${WORKhafs}/hrdgraphics
 
 export SENDCOM=${SENDCOM:-YES}
 export SCRUBDATA=${SCRUBDATA:-YES}

diff --git a/parm/forecast/globnest/data_table b/parm/forecast/globnest/data_table
diff --git a/parm/forecast/globnest/input.nml.tmp b/parm/forecast/globnest/input.nml.tmp
@@ -1,22 +1,8 @@
- &amip_interp_nml
-       interp_oi_sst = .true.
-       use_ncep_sst = .true.
-       use_ncep_ice = .false.
-       no_anom_sst = .false.
-       data_set = 'reynolds_oi'
-       date_out_of_range = 'climo'
-/
-
  &atmos_model_nml
        blocksize = _blocksize_
        chksum_debug = .false.
        dycore_only = .false.
-       fdiag = 3
        avg_max_length = 3600.
-       fhmax = _fhmax_
-       fhout = 3
-       fhmaxhf = 0
-       fhouthf = 3
        ccpp_suite = '_ccpp_suite_'
 /
 
@@ -170,7 +156,6 @@
        fhcyc          = 24.
        use_ufo        = .true.
        pre_rad        = .false.
-       ncld           = 5
        imp_physics    = 11
        pdfcld         = .false.
        fhswr          = _fhswr_

diff --git a/parm/forecast/globnest/input_nest02.nml.tmp b/parm/forecast/globnest/input_nest02.nml.tmp
@@ -1,22 +1,8 @@
- &amip_interp_nml
-       interp_oi_sst = .true.
-       use_ncep_sst = .true.
-       use_ncep_ice = .false.
-       no_anom_sst = .false.
-       data_set = 'reynolds_oi'
-       date_out_of_range = 'climo'
-/
-
  &atmos_model_nml
        blocksize = _blocksize_
        chksum_debug = .false.
        dycore_only = .false.
-       fdiag = 3
        avg_max_length = 3600.
-       fhmax = _fhmax_
-       fhout = 3
-       fhmaxhf = 0
-       fhouthf = 3
        ccpp_suite = '_ccpp_suite_'
 /
 
@@ -159,7 +145,6 @@
        fhcyc          = 24.
        use_ufo        = .true.
        pre_rad        = .false.
-       ncld           = 5
        imp_physics    = 11
        pdfcld         = .false.
        fhswr          = _fhswr_

diff --git a/parm/forecast/globnest/model_configure.tmp b/parm/forecast/globnest/model_configure.tmp
@@ -1,23 +1,13 @@
 print_esmf:              .false.
-total_member:            1
-PE_MEMBER01:             NTASKS
 start_year:              YR
 start_month:             MN
 start_day:               DY
 start_hour:              H_R
 start_minute:            0
 start_second:            0
 nhours_fcst:             NHRS
-RUN_CONTINUE:            .false.
-ENS_SPS:                 .false.
 dt_atmos:                _dt_atmos_
-cpl:                     _cpl_
 calendar:                'julian'
-memuse_verbose:          .false.
-atmos_nthreads:          NTHRD
-use_hyper_thread:        .false.
-ncores_per_node:         NCNODE
-debug_affinity:          .true.
 restart_interval:        _restart_interval_
 output_1st_tstep_rst:    .false.
 
@@ -36,8 +26,6 @@ jchunk3d:                -1
 kchunk3d:                -1
 ideflate:                1
 nbits:                   0
-write_nemsioflip:        .false.
-write_fsyncflag:         .false.
 
 app_domain:              '_app_domain_'
 output_grid:             '_OUTPUT_GRID_'
@@ -54,3 +42,4 @@ nfhout:                  3
 nfhmax_hf:               -1
 nfhout_hf:               3
 nsout:                   -1
+output_fh:               -1
diff --git a/parm/forecast/globnest_hwrf/data_table b/parm/forecast/globnest_hwrf/data_table
diff --git a/parm/forecast/globnest_hwrf/input.nml.tmp b/parm/forecast/globnest_hwrf/input.nml.tmp
@@ -1,22 +1,8 @@
- &amip_interp_nml
-       interp_oi_sst = .true.
-       use_ncep_sst = .true.
-       use_ncep_ice = .false.
-       no_anom_sst = .false.
-       data_set = 'reynolds_oi'
-       date_out_of_range = 'climo'
-/
-
  &atmos_model_nml
        blocksize = _blocksize_
        chksum_debug = .false.
        dycore_only = .false.
-       fdiag = 3
        avg_max_length = 3600.
-       fhmax = _fhmax_
-       fhout = 3
-       fhmaxhf = 0
-       fhouthf = 3
        ccpp_suite = '_ccpp_suite_'
 /
 
@@ -169,7 +155,6 @@
        fhcyc          = 0.
        use_ufo        = .true.
        pre_rad        = .false.
-       ncld           = 5
        imp_physics    = 15         ! F-A MP scheme
        RHGRD          = 0.975      ! F-A
        spec_adv       = .true.     ! F-A

diff --git a/parm/forecast/globnest_hwrf/input_nest02.nml.tmp b/parm/forecast/globnest_hwrf/input_nest02.nml.tmp
@@ -1,22 +1,8 @@
- &amip_interp_nml
-       interp_oi_sst = .true.
-       use_ncep_sst = .true.
-       use_ncep_ice = .false.
-       no_anom_sst = .false.
-       data_set = 'reynolds_oi'
-       date_out_of_range = 'climo'
-/
-
  &atmos_model_nml
        blocksize = _blocksize_
        chksum_debug = .false.
        dycore_only = .false.
-       fdiag = 3
        avg_max_length = 3600.
-       fhmax = _fhmax_
-       fhout = 3
-       fhmaxhf = 0
-       fhouthf = 3
        ccpp_suite = '_ccpp_suite_'
 /
 
@@ -159,7 +145,6 @@
        fhcyc          = 0.
        use_ufo        = .true.
        pre_rad        = .false.
-       ncld           = 5
        imp_physics    = 15         ! F-A MP scheme
        RHGRD          = 1.0        ! F-A
        spec_adv       = .true.     ! F-A

diff --git a/parm/forecast/globnest_hwrf/model_configure.tmp b/parm/forecast/globnest_hwrf/model_configure.tmp
@@ -1,23 +1,13 @@
 print_esmf:              .false.
-total_member:            1
-PE_MEMBER01:             NTASKS
 start_year:              YR
 start_month:             MN
 start_day:               DY
 start_hour:              H_R
 start_minute:            0
 start_second:            0
 nhours_fcst:             NHRS
-RUN_CONTINUE:            .false.
-ENS_SPS:                 .false.
 dt_atmos:                _dt_atmos_
-cpl:                     _cpl_
 calendar:                'julian'
-memuse_verbose:          .false.
-atmos_nthreads:          NTHRD
-use_hyper_thread:        .false.
-ncores_per_node:         NCNODE
-debug_affinity:          .true.
 restart_interval:        _restart_interval_
 output_1st_tstep_rst:    .false.
 
@@ -36,8 +26,6 @@ jchunk3d:                -1
 kchunk3d:                -1
 ideflate:                1
 nbits:                   0
-write_nemsioflip:        .false.
-write_fsyncflag:         .false.
 
 app_domain:              '_app_domain_'
 output_grid:             '_OUTPUT_GRID_'
@@ -54,3 +42,4 @@ nfhout:                  3
 nfhmax_hf:               -1
 nfhout_hf:               3
 nsout:                   -1
+output_fh:               -1
diff --git a/parm/forecast/regional/data_table b/parm/forecast/regional/data_table
diff --git a/parm/forecast/regional/input.nml.tmp b/parm/forecast/regional/input.nml.tmp
@@ -1,24 +1,9 @@
- &amip_interp_nml
-       interp_oi_sst = .true.
-       use_ncep_sst = .true.
-       use_ncep_ice = .false.
-       no_anom_sst = .false.
-       data_set = 'reynolds_oi'
-       date_out_of_range = 'climo'
-/
-
  &atmos_model_nml
        blocksize = _blocksize_
        chksum_debug = .false.
        dycore_only = .false.
-       fdiag = 3
        avg_max_length = 3600.
-       fhmax = _fhmax_
-       fhout = 3
-       fhmaxhf = 0
-       fhouthf = 3
        ccpp_suite = '_ccpp_suite_'
-       merge_import = _merge_import_
 /
 
  &diag_manager_nml
@@ -164,7 +149,6 @@
        fhcyc          = 24.
        use_ufo        = .true.
        pre_rad        = .false.
-       ncld           = 5
        imp_physics    = 11
        pdfcld         = .false.
        fhswr          = _fhswr_
@@ -223,6 +207,7 @@
        cplice         = .false.
        cplwav         = .false.
        cplwav2atm     = .false.
+       cpl_imp_mrg    = _merge_import_
        psautco        = 0.0008, 0.0005
        prautco        = 0.00015, 0.00015
        iau_delthrs    = 6

diff --git a/parm/forecast/regional/model_configure.tmp b/parm/forecast/regional/model_configure.tmp
@@ -1,23 +1,13 @@
 print_esmf:              .false.
-total_member:            1
-PE_MEMBER01:             NTASKS
 start_year:              YR
 start_month:             MN
 start_day:               DY
 start_hour:              H_R
 start_minute:            0
 start_second:            0
 nhours_fcst:             NHRS
-RUN_CONTINUE:            .false.
-ENS_SPS:                 .false.
 dt_atmos:                _dt_atmos_
-cpl:                     _cpl_
 calendar:                'julian'
-memuse_verbose:          .false.
-atmos_nthreads:          NTHRD
-use_hyper_thread:        .false.
-ncores_per_node:         NCNODE
-debug_affinity:          .true.
 restart_interval:        _restart_interval_
 output_1st_tstep_rst:    .false.
 
@@ -36,8 +26,6 @@ jchunk3d:                -1
 kchunk3d:                -1
 ideflate:                1
 nbits:                   0
-write_nemsioflip:        .false.
-write_fsyncflag:         .false.
 
 app_domain:              '_app_domain_'
 output_grid:             '_OUTPUT_GRID_'
@@ -54,3 +42,4 @@ nfhout:                  3
 nfhmax_hf:               -1
 nfhout_hf:               3
 nsout:                   -1
+output_fh:               -1
diff --git a/parm/forecast/regional_hwrf/data_table b/parm/forecast/regional_hwrf/data_table
diff --git a/parm/forecast/regional_hwrf/input.nml.tmp b/parm/forecast/regional_hwrf/input.nml.tmp
@@ -1,24 +1,9 @@
- &amip_interp_nml
-       interp_oi_sst = .true.
-       use_ncep_sst = .true.
-       use_ncep_ice = .false.
-       no_anom_sst = .false.
-       data_set = 'reynolds_oi'
-       date_out_of_range = 'climo'
-/
-
  &atmos_model_nml
        blocksize = _blocksize_
        chksum_debug = .false.
        dycore_only = .false.
-       fdiag = 3
        avg_max_length = 3600.
-       fhmax = _fhmax_
-       fhout = 3
-       fhmaxhf = 0
-       fhouthf = 3
        ccpp_suite = '_ccpp_suite_'
-       merge_import = _merge_import_
 /
 
  &diag_manager_nml
@@ -164,7 +149,6 @@
        fhcyc          = 0.
        use_ufo        = .true.
        pre_rad        = .false.
-       ncld           = 5
        imp_physics    = 15         ! F-A MP scheme
        RHGRD          = 1.0        ! F-A
        spec_adv       = .true.     ! F-A
@@ -228,6 +212,7 @@
        cplice         = .false.
        cplwav         = .false.
        cplwav2atm     = .false.
+       cpl_imp_mrg    = _merge_import_
        psautco        = 0.0008, 0.0005
        prautco        = 0.00015, 0.00015
        iau_delthrs    = 6

diff --git a/parm/forecast/regional_hwrf/model_configure.tmp b/parm/forecast/regional_hwrf/model_configure.tmp
@@ -1,23 +1,13 @@
 print_esmf:              .false.
-total_member:            1
-PE_MEMBER01:             NTASKS
 start_year:              YR
 start_month:             MN
 start_day:               DY
 start_hour:              H_R
 start_minute:            0
 start_second:            0
 nhours_fcst:             NHRS
-RUN_CONTINUE:            .false.
-ENS_SPS:                 .false.
 dt_atmos:                _dt_atmos_
-cpl:                     _cpl_
 calendar:                'julian'
-memuse_verbose:          .false.
-atmos_nthreads:          NTHRD
-use_hyper_thread:        .false.
-ncores_per_node:         NCNODE
-debug_affinity:          .true.
 restart_interval:        _restart_interval_
 output_1st_tstep_rst:    .false.
 
@@ -36,8 +26,6 @@ jchunk3d:                -1
 kchunk3d:                -1
 ideflate:                1
 nbits:                   0
-write_nemsioflip:        .false.
-write_fsyncflag:         .false.
 
 app_domain:              '_app_domain_'
 output_grid:             '_OUTPUT_GRID_'
@@ -54,3 +42,4 @@ nfhout:                  3
 nfhmax_hf:               -1
 nfhout_hf:               3
 nsout:                   -1
+output_fh:               -1
diff --git a/parm/hafs.conf b/parm/hafs.conf
@@ -190,9 +190,9 @@ lnsigcutoff=1.3           ;; length for vertical localization
 
 [forecast]
 # ccpp suites
-ccpp_suite_regional=HAFS_v0_gfdlmp_tedmf
-ccpp_suite_glob=HAFS_v0_gfdlmp_tedmf
-ccpp_suite_nest=HAFS_v0_gfdlmp_tedmf
+ccpp_suite_regional=FV3_HAFS_v0_gfdlmp_tedmf
+ccpp_suite_glob=FV3_HAFS_v0_gfdlmp_tedmf
+ccpp_suite_nest=FV3_HAFS_v0_gfdlmp_tedmf
 
 #radiation scheme calling time steps
 fhswr=1800.