Sync HAFS submodules as of 12/06/2021 (hafs-community#118)

*Point submodule hafs_forecast.fd to ufs-weather-model develop branch directly (as of 12/06/2021) *Point submodule hafs_post.fd to UPP develop branch directly (as of 12/06/2021) *Sync hafs_utils.fd with latest UFS_UTILS develop branch as of 12/06/2021
JohnSteffen-NOAA · Dec 8, 2021 · 30666cc · 30666cc
1 parent 1f7fb15
commit 30666cc
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 28 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,11 +1,11 @@
 [submodule "ufs-weather-model"]
 	path = sorc/hafs_forecast.fd
-	url = https://github.com/hafs-community/ufs-weather-model.git
-	branch = support/HAFS
+	url = https://github.com/ufs-community/ufs-weather-model.git
+	branch = develop
 [submodule "UPP"]
 	path = sorc/hafs_post.fd
-	url = https://github.com/hafs-community/UPP.git
-	branch = support/HAFS
+	url = https://github.com/NOAA-EMC/UPP.git
+	branch = develop
 [submodule "UFS_UTILS"]
 	path = sorc/hafs_utils.fd
 	url = https://github.com/hafs-community/UFS_UTILS.git

diff --git a/modulefiles/modulefile.hafs.hera b/modulefiles/modulefile.hafs.hera
@@ -28,7 +28,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.2
-module load esmf/8_2_0_beta_snapshot_14
+module load esmf/8_2_0
 module load fms/2021.03-avx
 
 module load bacio/2.4.1
@@ -43,7 +43,7 @@ module load upp/10.0.10
 
 module load gftl-shared/v1.3.0
 module load yafyaml/v0.5.1
-module load mapl/v2.7.3-esmf820bs14
+module load mapl/2.11.0-esmf-8_2_0
 
 module load g2/3.4.3
 

diff --git a/modulefiles/modulefile.hafs.jet b/modulefiles/modulefile.hafs.jet
@@ -28,7 +28,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.2
-module load esmf/8_2_0_beta_snapshot_14
+module load esmf/8_2_0
 module load fms/2021.03
 
 module load bacio/2.4.1
@@ -43,7 +43,7 @@ module load upp/10.0.10
 
 module load gftl-shared/v1.3.0
 module load yafyaml/v0.5.1
-module load mapl/v2.7.3-esmf820bs14
+module load mapl/2.11.0-esmf-8_2_0
 
 module load g2/3.4.3
 

diff --git a/modulefiles/modulefile.hafs.orion b/modulefiles/modulefile.hafs.orion
@@ -26,7 +26,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.2
-module load esmf/8_2_0_beta_snapshot_14
+module load esmf/8_2_0
 module load fms/2021.03
 
 module load bacio/2.4.1
@@ -41,7 +41,7 @@ module load upp/10.0.10
 
 module load gftl-shared/v1.3.0
 module load yafyaml/v0.5.1
-module load mapl/v2.7.3-esmf820bs14
+module load mapl/2.11.0-esmf-8_2_0
 
 module load g2/3.4.3
 

diff --git a/modulefiles/modulefile.hafs.wcoss_cray b/modulefiles/modulefile.hafs.wcoss_cray
@@ -60,7 +60,7 @@ module load wrf_io/1.1.1
 module load wgrib2/2.0.8
 #doesn't work setenv WGRIB2 /usrx/local/nceplibs/NCEPLIBS/cmake/install/NCEPLIBS-v1.3.0/wgrib2/wgrib2-2.0.8/bin/wgrib2
 
-module load esmf/811
+module load esmf/820
 module load fms/2021.03
 
 ## WCOSS Cray execution prereqs:

diff --git a/modulefiles/modulefile.hafs.wcoss_dell_p3 b/modulefiles/modulefile.hafs.wcoss_dell_p3
@@ -25,7 +25,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.2
-module load esmf/8_2_0_beta_snapshot_14
+module load esmf/8_2_0
 module load fms/2021.03
 
 module load bacio/2.4.1
@@ -40,7 +40,7 @@ module load upp/10.0.10
 
 module load gftl-shared/v1.3.0
 module load yafyaml/v0.5.1
-module load mapl/v2.7.3-esmf820bs14
+module load mapl/2.11.0-esmf-8_2_0
 
 module load g2/3.4.3
 

diff --git a/parm/forecast/globnest/input.nml.tmp b/parm/forecast/globnest/input.nml.tmp
@@ -233,8 +233,8 @@
        do_ca          = .false.
        ca_sgs         = .false.
        nca            = 1
-       scells         = 2600
-       tlives         = 1800
+       ncells         = 5
+       nlives         = 12
        nseed          = 1
        nfracseed      = 0.5
        ca_trigger     = .false.

diff --git a/parm/forecast/globnest/input_nest02.nml.tmp b/parm/forecast/globnest/input_nest02.nml.tmp
@@ -222,8 +222,8 @@
        do_ca          = .false.
        ca_sgs         = .false.
        nca            = 1
-       scells         = 2600
-       tlives         = 1800
+       ncells         = 5
+       nlives         = 12
        nseed          = 1
        nfracseed      = 0.5
        ca_trigger     = .false.

diff --git a/parm/forecast/globnest_hwrf/input.nml.tmp b/parm/forecast/globnest_hwrf/input.nml.tmp
@@ -237,8 +237,8 @@
        do_ca          = .false.
        ca_sgs         = .false.
        nca            = 1
-       scells         = 2600
-       tlives         = 1800
+       ncells         = 5
+       nlives         = 12
        nseed          = 1
        nfracseed      = 0.5
        ca_trigger     = .false.

diff --git a/parm/forecast/globnest_hwrf/input_nest02.nml.tmp b/parm/forecast/globnest_hwrf/input_nest02.nml.tmp
@@ -227,8 +227,8 @@
        do_ca          = .false.
        ca_sgs         = .false.
        nca            = 1
-       scells         = 2600
-       tlives         = 1800
+       ncells         = 5
+       nlives         = 12
        nseed          = 1
        nfracseed      = 0.5
        ca_trigger     = .false.

diff --git a/parm/forecast/regional/input.nml.tmp b/parm/forecast/regional/input.nml.tmp
@@ -226,8 +226,8 @@
        do_ca          = .false.
        ca_sgs         = .false.
        nca            = 1
-       scells         = 2600
-       tlives         = 1800
+       ncells         = 5
+       nlives         = 12
        nseed          = 1
        nfracseed      = 0.5
        ca_trigger     = .false.

diff --git a/parm/forecast/regional_hwrf/input.nml.tmp b/parm/forecast/regional_hwrf/input.nml.tmp
@@ -231,8 +231,8 @@
        do_ca          = .false.
        ca_sgs         = .false.
        nca            = 1
-       scells         = 2600
-       tlives         = 1800
+       ncells         = 5
+       nlives         = 12
        nseed          = 1
        nfracseed      = 0.5
        ca_trigger     = .false.

diff --git a/sorc/hafs_forecast.fd b/sorc/hafs_forecast.fd
diff --git a/sorc/hafs_post.fd b/sorc/hafs_post.fd
diff --git a/sorc/hafs_utils.fd b/sorc/hafs_utils.fd
+25 −0		CMakeLists.txt
+1 −1		VERSION
+1 −1		modulefiles/post/v8.0.0-jet
+0 −1		modulefiles/post/v8.0.0-wcoss_cray
+0 −1,304		parm/nam_cntrl_cmaq.parm
+0 −503		parm/nmb_cntrl.parm
+8 −0		parm/post_avblflds.xml
+5 −0		parm/postcntrl_gfs_f00_two.xml
+5 −0		parm/postcntrl_gfs_flux.xml
+5 −0		parm/postcntrl_gfs_flux_f00.xml
+5 −0		parm/postcntrl_gfs_two.xml
+38 −1		parm/postxconfig-NT-GFS-F00-TWO.txt
+38 −1		parm/postxconfig-NT-GFS-FLUX-F00.txt
+38 −1		parm/postxconfig-NT-GFS-FLUX.txt
+38 −1		parm/postxconfig-NT-GFS-TWO.txt
+0 −365		parm/rap_wrf_cntrl.parm
+0 −499		parm/wrf_cntrl.parm
+2 −0		sorc/ncep_post.fd/ALLOCATE_ALL.f
+1 −29		sorc/ncep_post.fd/CMakeLists.txt
+1 −0		sorc/ncep_post.fd/DEALLOCATE.f
+22 −2		sorc/ncep_post.fd/FIXED.f
+36 −37		sorc/ncep_post.fd/INITPOST_GFS_NEMS.f
+0 −1		sorc/ncep_post.fd/INITPOST_GFS_NEMS_MPIIO.f
+0 −1		sorc/ncep_post.fd/INITPOST_GFS_NETCDF.f
+8 −3		sorc/ncep_post.fd/INITPOST_GFS_NETCDF_PARA.f
+0 −3,062		sorc/ncep_post.fd/INITPOST_GFS_SIGIO.f
+0 −1		sorc/ncep_post.fd/INITPOST_NEMS.f
+0 −1		sorc/ncep_post.fd/INITPOST_NEMS_MPIIO.f
+0 −1		sorc/ncep_post.fd/INITPOST_NETCDF.f
+0 −240		sorc/ncep_post.fd/READCNTRL.F
+0 −2,753		sorc/ncep_post.fd/RQSTFLD.F
+44 −0		sorc/ncep_post.fd/RQSTFLD.f
+1 −1		sorc/ncep_post.fd/VRBLS2D_mod.f
+1 −78		sorc/ncep_post.fd/WRFPOST.f
+2 −2		sorc/chgres_cube.fd/docs/user_guide.md
+2 −6		sorc/emcsfc_ice_blend.fd/docs/user_guide.md
+2 −4		sorc/emcsfc_snow2mdl.fd/docs/user_guide.md
+17 −4		sorc/fvcom_tools.fd/CMakeLists.txt
+48 −10		sorc/fvcom_tools.fd/docs/user_guide.md
+0 −41		sorc/fvcom_tools.fd/fvcom_readme.md
+66 −19		sorc/fvcom_tools.fd/module_ncio.f90
+228 −49		sorc/fvcom_tools.fd/module_nwp.f90
+116 −44		sorc/fvcom_tools.fd/process_FVCOM.f90
+2 −6		sorc/gblevents.fd/docs/user_guide.md
+2 −2		sorc/global_cycle.fd/docs/user_guide.md
+2 −5		sorc/grid_tools.fd/docs/user_guide.md
+2 −2		sorc/lsm_routines.fd/docs/user_guide.md
+2 −2		sorc/lsm_routines.fd/noah.fd/docs/user_guide.md
+2 −4		sorc/orog_mask_tools.fd/docs/user_guide.md
+2 −4		sorc/sfc_climo_gen.fd/docs/user_guide.md
+2 −4		sorc/vcoord_gen.fd/docs/user_guide.md
+26 −0		tests/fvcom_tools/CMakeLists.txt
+2 −0		tests/fvcom_tools/LSanSuppress.supp
+146 −0		tests/fvcom_tools/ftst_readfvcomnetcdf.F90