Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync HAFS submodules as of 12/06/2021 #118

Merged
merged 3 commits into from
Dec 8, 2021
Merged

Sync HAFS submodules as of 12/06/2021 #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14cebba
Point hafs_forecast.fd to ufs-weather-model develop branch directly (…
BinLiu-NOAA Nov 21, 2021
fcc60db
Merge remote-tracking branch 'remotes/origin/develop' into feature/ha…
BinLiu-NOAA Dec 6, 2021
1fcae63
*Point submodule hafs_forecast.fd to ufs-weather-model develop branch…
BinLiu-NOAA Dec 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions modulefiles/modulefile.hafs.hera
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions modulefiles/modulefile.hafs.jet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions modulefiles/modulefile.hafs.orion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion modulefiles/modulefile.hafs.wcoss_cray
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions modulefiles/modulefile.hafs.wcoss_dell_p3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions parm/forecast/globnest/input.nml.tmp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions parm/forecast/globnest/input_nest02.nml.tmp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions parm/forecast/globnest_hwrf/input.nml.tmp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions parm/forecast/globnest_hwrf/input_nest02.nml.tmp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions parm/forecast/regional/input.nml.tmp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions parm/forecast/regional_hwrf/input.nml.tmp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion sorc/hafs_forecast.fd
Open in desktop
Submodule hafs_forecast.fd updated 155 files
2 changes: 1 addition & 1 deletion sorc/hafs_post.fd
Open in desktop
Submodule hafs_post.fd updated 34 files
+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 changes: 1 addition & 1 deletion sorc/hafs_utils.fd
Open in desktop
Submodule hafs_utils.fd updated 20 files
+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