From 6680d366973900ce1845b33833438db532d0280a Mon Sep 17 00:00:00 2001 From: Bin Liu Date: Thu, 27 Jan 2022 12:30:56 -0500 Subject: [PATCH] Sync HAFS submodules as of 01/26/2022 (#123) 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 --- .gitmodules | 6 +----- modulefiles/modulefile.hafs.hera | 1 - modulefiles/modulefile.hafs.jet | 1 - modulefiles/modulefile.hafs.orion | 1 - modulefiles/modulefile.hafs.wcoss_cray | 1 - modulefiles/modulefile.hafs.wcoss_dell_p3 | 1 - sorc/build_all.sh | 8 ++++---- sorc/build_forecast.sh | 2 +- sorc/{build_vortextracker.sh => build_tracker.sh} | 2 +- sorc/hafs_build.cfg | 2 +- sorc/hafs_forecast.fd | 2 +- sorc/hafs_post.fd | 2 +- sorc/{hafs_vortextracker.fd => hafs_tracker.fd} | 0 sorc/hafs_utils.fd | 2 +- sorc/hafs_vortexinit.fd/.gitkeep | 0 sorc/install_all.sh | 12 ++++++------ sorc/partial_build.sh | 2 +- 17 files changed, 18 insertions(+), 27 deletions(-) rename sorc/{build_vortextracker.sh => build_tracker.sh} (61%) mode change 160000 => 120000 sorc/hafs_post.fd rename sorc/{hafs_vortextracker.fd => hafs_tracker.fd} (100%) delete mode 100644 sorc/hafs_vortexinit.fd/.gitkeep diff --git a/.gitmodules b/.gitmodules index 35c7bcb13..50d3c2f97 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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"] diff --git a/modulefiles/modulefile.hafs.hera b/modulefiles/modulefile.hafs.hera index b2cabca7f..e1716fafa 100644 --- a/modulefiles/modulefile.hafs.hera +++ b/modulefiles/modulefile.hafs.hera @@ -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 diff --git a/modulefiles/modulefile.hafs.jet b/modulefiles/modulefile.hafs.jet index 016da78f5..25269bd8d 100644 --- a/modulefiles/modulefile.hafs.jet +++ b/modulefiles/modulefile.hafs.jet @@ -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 diff --git a/modulefiles/modulefile.hafs.orion b/modulefiles/modulefile.hafs.orion index 415a03cb4..c1be63c60 100644 --- a/modulefiles/modulefile.hafs.orion +++ b/modulefiles/modulefile.hafs.orion @@ -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 diff --git a/modulefiles/modulefile.hafs.wcoss_cray b/modulefiles/modulefile.hafs.wcoss_cray index 4bef5bbf9..b20c015f7 100644 --- a/modulefiles/modulefile.hafs.wcoss_cray +++ b/modulefiles/modulefile.hafs.wcoss_cray @@ -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 diff --git a/modulefiles/modulefile.hafs.wcoss_dell_p3 b/modulefiles/modulefile.hafs.wcoss_dell_p3 index 6be20784c..8928b7ce6 100644 --- a/modulefiles/modulefile.hafs.wcoss_dell_p3 +++ b/modulefiles/modulefile.hafs.wcoss_dell_p3 @@ -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 diff --git a/sorc/build_all.sh b/sorc/build_all.sh index c1b2647a5..28e44154c 100755 --- a/sorc/build_all.sh +++ b/sorc/build_all.sh @@ -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 } #------------------------------------ diff --git a/sorc/build_forecast.sh b/sorc/build_forecast.sh index 8833058b5..3595cdbd9 100755 --- a/sorc/build_forecast.sh +++ b/sorc/build_forecast.sh @@ -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 diff --git a/sorc/build_vortextracker.sh b/sorc/build_tracker.sh similarity index 61% rename from sorc/build_vortextracker.sh rename to sorc/build_tracker.sh index 89a90ef86..92d3aae89 100755 --- a/sorc/build_vortextracker.sh +++ b/sorc/build_tracker.sh @@ -1,7 +1,7 @@ #!/bin/sh set -eux -cd hafs_vortextracker.fd/src +cd hafs_tracker.fd/src ./build_all_cmake.sh exit diff --git a/sorc/hafs_build.cfg b/sorc/hafs_build.cfg index a7b428d88..1517fe0c9 100644 --- a/sorc/hafs_build.cfg +++ b/sorc/hafs_build.cfg @@ -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 diff --git a/sorc/hafs_forecast.fd b/sorc/hafs_forecast.fd index b52f83cfd..4604d7073 160000 --- a/sorc/hafs_forecast.fd +++ b/sorc/hafs_forecast.fd @@ -1 +1 @@ -Subproject commit b52f83cfdff49d98cbc3c2f6074ffde288bb5327 +Subproject commit 4604d7073b83790bbb2995d5b1d0477931289fbe diff --git a/sorc/hafs_post.fd b/sorc/hafs_post.fd deleted file mode 160000 index e59b906cf..000000000 --- a/sorc/hafs_post.fd +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e59b906cfd80afd71cf19bd5c5a0b0909b65cf3b diff --git a/sorc/hafs_post.fd b/sorc/hafs_post.fd new file mode 120000 index 000000000..14711ca34 --- /dev/null +++ b/sorc/hafs_post.fd @@ -0,0 +1 @@ +hafs_forecast.fd/FV3/upp \ No newline at end of file diff --git a/sorc/hafs_vortextracker.fd b/sorc/hafs_tracker.fd similarity index 100% rename from sorc/hafs_vortextracker.fd rename to sorc/hafs_tracker.fd diff --git a/sorc/hafs_utils.fd b/sorc/hafs_utils.fd index 2977272fd..f2b376645 160000 --- a/sorc/hafs_utils.fd +++ b/sorc/hafs_utils.fd @@ -1 +1 @@ -Subproject commit 2977272fd95c122ef9e6c4d9facda915a95d25a5 +Subproject commit f2b376645f2f250624dba7bab2f73f36985c3240 diff --git a/sorc/hafs_vortexinit.fd/.gitkeep b/sorc/hafs_vortexinit.fd/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/sorc/install_all.sh b/sorc/install_all.sh index 3f8ca5556..a0fb4e768 100755 --- a/sorc/install_all.sh +++ b/sorc/install_all.sh @@ -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 } #------------------------------------ diff --git a/sorc/partial_build.sh b/sorc/partial_build.sh index a83477f3d..5fc05d6f8 100755 --- a/sorc/partial_build.sh +++ b/sorc/partial_build.sh @@ -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" \