Skip to content

Commit

Permalink
Sync HAFS submodules as of 01/26/2022 (hafs-community#123)
Browse files Browse the repository at this point in the history
Sync HAFS submodules (hafs_forecast.fd, hafs_post.fd, hafs_utils.fd) with their latest authoritative branches as of 01/26/2022
*Update submodule hafs_forecast.fd to point to the ufs-weather-model develop branch as of 01/26/2022
*Remove hafs_post.fd (UPP) as a direct submodule of HAFS, and use the same one used by ufs-weather-model/FV3atm
(hafs_forecast.fd/FV3/upp)
*Sync hafs_utils.fd with its latest develop branch (as of 01/26/2022)
*Rename sorc/hafs_vortextracker.fd into sorc/hafs_tracker.fd
*Remove sorc/hafs_vortexinit.fd/.gitkeep
  • Loading branch information
BinLiu-NOAA authored Jan 27, 2022
1 parent 45d5bb5 commit 6680d36
Show file tree
Hide file tree
Showing 17 changed files with 18 additions and 27 deletions.
6 changes: 1 addition & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@
path = sorc/hafs_forecast.fd
url = https://github.com/ufs-community/ufs-weather-model.git
branch = develop
[submodule "UPP"]
path = sorc/hafs_post.fd
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
branch = support/HAFS
[submodule "gfdl-tracker"]
path = sorc/hafs_vortextracker.fd
path = sorc/hafs_tracker.fd
url = https://github.com/hafs-community/gfdl-tracker.git
branch = support/HAFS
[submodule "NCEPLIBS-pyprodutil"]
Expand Down
1 change: 0 additions & 1 deletion modulefiles/modulefile.hafs.hera
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.10

module load gftl-shared/v1.3.0
module load yafyaml/v0.5.1
Expand Down
1 change: 0 additions & 1 deletion modulefiles/modulefile.hafs.jet
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.10

module load gftl-shared/v1.3.0
module load yafyaml/v0.5.1
Expand Down
1 change: 0 additions & 1 deletion modulefiles/modulefile.hafs.orion
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.10

module load gftl-shared/v1.3.0
module load yafyaml/v0.5.1
Expand Down
1 change: 0 additions & 1 deletion modulefiles/modulefile.hafs.wcoss_cray
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.10

module load g2/3.4.3

Expand Down
1 change: 0 additions & 1 deletion modulefiles/modulefile.hafs.wcoss_dell_p3
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.10

module load gftl-shared/v1.3.0
module load yafyaml/v0.5.1
Expand Down
8 changes: 4 additions & 4 deletions sorc/build_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ echo " .... Building post .... "
}

#------------------------------------
# build vortextracker
# build tracker
#------------------------------------
$Build_vortextracker && {
echo " .... Building vortextracker .... "
./build_vortextracker.sh > $logs_dir/build_vortextracker.log 2>&1
$Build_tracker && {
echo " .... Building tracker .... "
./build_tracker.sh > $logs_dir/build_tracker.log 2>&1
}

#------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion sorc/build_forecast.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ else
fi
cd hafs_forecast.fd/tests

./compile.sh "$target" "-DAPP=$app -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_hwrf_thompson -D32BIT=ON" 32bit YES NO
./compile.sh "$target" "-DAPP=$app -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON" 32bit YES NO

exit
2 changes: 1 addition & 1 deletion sorc/build_vortextracker.sh → sorc/build_tracker.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
set -eux

cd hafs_vortextracker.fd/src
cd hafs_tracker.fd/src
./build_all_cmake.sh

exit
2 changes: 1 addition & 1 deletion sorc/hafs_build.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Building libraries (libs) ............................. no
Building forecast (forecast) .......................... yes
Building post (post) .................................. yes
Building vortextracker (vortextracker) ................ yes
Building tracker (tracker) ............................ yes
Building utils (utils) ................................ yes
Building tools (tools) ................................ yes
Building gsi (gsi) .................................... yes
Expand Down
2 changes: 1 addition & 1 deletion sorc/hafs_forecast.fd
Submodule hafs_forecast.fd updated 208 files
1 change: 0 additions & 1 deletion sorc/hafs_post.fd
Submodule hafs_post.fd deleted from e59b90
1 change: 1 addition & 0 deletions sorc/hafs_post.fd
2 changes: 1 addition & 1 deletion sorc/hafs_utils.fd
Submodule hafs_utils.fd updated 70 files
+9 −9 .github/workflows/debug-docs-test_coverage.yml
+9 −9 .github/workflows/intel.yml
+8 −8 .github/workflows/linux-mac-nceplibs-mpi.yml
+9 −9 .github/workflows/netcdf-versions.yml
+0 −28 modulefiles/build.hera.gnu
+64 −0 modulefiles/build.hera.gnu.lua
+0 −31 modulefiles/build.hera.intel
+67 −0 modulefiles/build.hera.intel.lua
+0 −27 modulefiles/build.jet.intel
+64 −0 modulefiles/build.jet.intel.lua
+0 −30 modulefiles/build.orion.intel
+64 −0 modulefiles/build.orion.intel.lua
+0 −35 modulefiles/build.wcoss_dell_p3.intel
+75 −0 modulefiles/build.wcoss_dell_p3.intel.lua
+3 −0 reg_tests/chgres_cube/13km.conus.nam.grib2.sh
+5 −2 reg_tests/chgres_cube/13km.conus.rap.grib2.sh
+3 −0 reg_tests/chgres_cube/13km.na.gfs.ncei.grib2.sh
+3 −0 reg_tests/chgres_cube/25km.conus.gfs.grib2.sh
+3 −0 reg_tests/chgres_cube/25km.conus.gfs.pbgrib2.sh
+5 −2 reg_tests/chgres_cube/3km.conus.hrrr.gfssdf.grib2.sh
+5 −2 reg_tests/chgres_cube/3km.conus.hrrr.newsfc.grib2.sh
+3 −0 reg_tests/chgres_cube/c192.fv3.history.sh
+3 −0 reg_tests/chgres_cube/c192.gfs.grib2.sh
+3 −0 reg_tests/chgres_cube/c96.fv3.nemsio.sh
+3 −0 reg_tests/chgres_cube/c96.fv3.netcdf.sh
+3 −0 reg_tests/chgres_cube/c96.fv3.netcdf2wam.sh
+3 −0 reg_tests/chgres_cube/c96.fv3.restart.sh
+3 −0 reg_tests/chgres_cube/c96.gfs.nemsio.sh
+3 −0 reg_tests/chgres_cube/c96.gfs.sigio.sh
+3 −0 reg_tests/chgres_cube/c96.regional.sh
+8 −1 reg_tests/chgres_cube/driver.hera.sh
+8 −1 reg_tests/chgres_cube/driver.jet.sh
+24 −17 reg_tests/chgres_cube/driver.orion.sh
+7 −0 reg_tests/chgres_cube/driver.wcoss_cray.sh
+7 −0 reg_tests/chgres_cube/driver.wcoss_dell_p3.sh
+11 −0 reg_tests/get_hash.sh
+3 −0 reg_tests/global_cycle/C768.fv3gfs.sh
+3 −0 reg_tests/global_cycle/C768.lndincsnow.sh
+3 −0 reg_tests/global_cycle/C768.lndincsoil.sh
+8 −1 reg_tests/global_cycle/driver.hera.sh
+8 −1 reg_tests/global_cycle/driver.jet.sh
+8 −1 reg_tests/global_cycle/driver.orion.sh
+7 −0 reg_tests/global_cycle/driver.wcoss_cray.sh
+7 −0 reg_tests/global_cycle/driver.wcoss_dell_p3.sh
+3 −0 reg_tests/grid_gen/c96.uniform.sh
+3 −0 reg_tests/grid_gen/c96.viirs.vegt.sh
+8 −1 reg_tests/grid_gen/driver.hera.sh
+8 −1 reg_tests/grid_gen/driver.jet.sh
+9 −1 reg_tests/grid_gen/driver.orion.sh
+7 −0 reg_tests/grid_gen/driver.wcoss_cray.sh
+7 −0 reg_tests/grid_gen/driver.wcoss_dell_p3.sh
+3 −0 reg_tests/grid_gen/esg.regional.sh
+3 −0 reg_tests/grid_gen/gfdl.regional.sh
+3 −0 reg_tests/grid_gen/regional.gsl.gwd.sh
+8 −1 reg_tests/ice_blend/driver.hera.sh
+11 −3 reg_tests/ice_blend/driver.jet.sh
+8 −1 reg_tests/ice_blend/driver.orion.sh
+7 −0 reg_tests/ice_blend/driver.wcoss_cray.sh
+8 −0 reg_tests/ice_blend/driver.wcoss_dell_p3.sh
+5 −1 reg_tests/ice_blend/ice_blend.sh
+1 −1 reg_tests/rt.sh
+8 −1 reg_tests/snow2mdl/driver.hera.sh
+8 −1 reg_tests/snow2mdl/driver.jet.sh
+8 −1 reg_tests/snow2mdl/driver.orion.sh
+7 −0 reg_tests/snow2mdl/driver.wcoss_cray.sh
+8 −0 reg_tests/snow2mdl/driver.wcoss_dell_p3.sh
+5 −1 reg_tests/snow2mdl/snow2mdl.sh
+56 −0 reg_tests/update_baseline.sh
+54 −7 sorc/fvcom_tools.fd/module_nwp.f90
+24 −6 sorc/fvcom_tools.fd/process_FVCOM.f90
Empty file removed sorc/hafs_vortexinit.fd/.gitkeep
Empty file.
12 changes: 6 additions & 6 deletions sorc/install_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ $Build_post && {
}

#------------------------------------
# install vortextracker
# install tracker
#------------------------------------
$Build_vortextracker && {
${CP} hafs_vortextracker.fd/exec/gettrk.x ../exec/hafs_gettrk.x
${CP} hafs_vortextracker.fd/exec/tave.x ../exec/hafs_tave.x
${CP} hafs_vortextracker.fd/exec/vint.x ../exec/hafs_vint.x
${CP} hafs_vortextracker.fd/exec/supvit.x ../exec/hafs_supvit.x
$Build_tracker && {
${CP} hafs_tracker.fd/exec/gettrk.x ../exec/hafs_gettrk.x
${CP} hafs_tracker.fd/exec/tave.x ../exec/hafs_tave.x
${CP} hafs_tracker.fd/exec/vint.x ../exec/hafs_vint.x
${CP} hafs_tracker.fd/exec/supvit.x ../exec/hafs_supvit.x
}

#------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion sorc/partial_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
declare -a Build_prg=("Build_libs"
"Build_forecast" \
"Build_post" \
"Build_vortextracker" \
"Build_tracker" \
"Build_utils" \
"Build_tools" \
"Build_hycom_utils" \
Expand Down

0 comments on commit 6680d36

Please sign in to comment.