Update ufs_utils to ufs_utils_1_8_0 [26Aug22 commit, NOAA-EMC#1001]

jkhender · Aug 29, 2022 · 106fbad · 106fbad
1 parent 366edad
commit 106fbad
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 87 deletions.
diff --git a/Externals.cfg b/Externals.cfg
@@ -1,11 +1,10 @@
 # External sub-modules of global-workflow
 
-[FV3GFS]
-tag = global-29Mar2022
-#hash = b771e5b
-local_path = sorc/fv3gfs.fd
+[UFS]
+tag = HFIP2022-08-17
+local_path = sorc/ufs_model.fd
 repo_url = https://github.com/NOAA-GSL/ufs-weather-model.git
-#repo_url = https://github.com/ufs-community/ufs-weather-model.git
+epo_url = https://github.com/ufs-community/ufs-weather-model.git
 protocol = git
 required = True
 
@@ -32,9 +31,9 @@ protocol = git
 required = True
 
 [UFS_UTILS]
-tag = ufs_utils_1_6_0
+tag = ufs_utils_1_8_0
 local_path = sorc/ufs_utils.fd
-repo_url = https://github.com/NOAA-EMC/UFS_UTILS.git
+repo_url = https://github.com/ufs-community/UFS_UTILS.git
 protocol = git
 required = True
 

diff --git a/Externals_jet.cfg b/Externals_jet.cfg
@@ -1,11 +1,9 @@
 # External sub-modules of global-workflow
 
-[FV3GFS]
-tag = global-29Mar2022
-#hash = b771e5b
-local_path = sorc/fv3gfs.fd
+[UFS]
+tag = HFIP2022-08-17
+local_path = sorc/ufs_model.fd
 repo_url = https://github.com/NOAA-GSL/ufs-weather-model.git
-#repo_url = https://github.com/ufs-community/ufs-weather-model.git
 protocol = git
 required = True
 
@@ -32,7 +30,7 @@ protocol = git
 required = True
 
 [UFS_UTILS]
-hash = 26cd024
+tag = ufs_utils_1_8_0
 local_path = sorc/ufs_utils.fd
 repo_url = https://github.com/ufs-community/UFS_UTILS.git
 protocol = git

diff --git a/INFO b/INFO
@@ -1,3 +1,5 @@
+26 Aug 2022
+    - update ufs_utils to ufs_utils_1_8_0
 19 Aug 2022
     - update UFS to 17Aug22 gsl/develop branch, b42ca73 
       * add FV3_GFS_v17_p8_gf_mynn suite

diff --git a/sorc/checkout.sh b/sorc/checkout.sh
@@ -87,7 +87,7 @@ if [[ ! -d ufs_utils.fd ]] ; then
     rm -f ${topdir}/checkout-ufs_utils.log
     git clone --recursive https://github.com/ufs-community/UFS_UTILS.git ufs_utils.fd >> ${logdir}/checkout-ufs_utils.fd.log 2>&1
     cd ufs_utils.fd
-    git checkout 26cd024
+    git checkout ufs_utils_1_8_0
     cd ${topdir}
     if [[ -d ufs_utils.fd_gsl ]]; then
         rsync -avx ufs_utils.fd_gsl/ ufs_utils.fd/        ## copy over GSL changes not in UFS_UTILS repository

diff --git a/sorc/ufs_utils.fd_gsl/modulefiles/build.hera.intel b/sorc/ufs_utils.fd_gsl/modulefiles/build.hera.intel
diff --git a/sorc/ufs_utils.fd_gsl/sorc/machine-setup.sh b/sorc/ufs_utils.fd_gsl/sorc/machine-setup.sh
@@ -27,6 +27,9 @@ if [[ -d /lfs4 ]] ; then
     fi
     target=jet
     module purge
+elif [[ -d /lfs/h1 ]] ; then
+    target=wcoss2
+    module reset
 elif [[ -d /scratch1 ]] ; then
     # We are on NOAA Hera
     if ( ! eval module help > /dev/null 2>&1 ) ; then
@@ -35,48 +38,6 @@ elif [[ -d /scratch1 ]] ; then
     fi
     target=hera
     module purge
-elif [[ -d /gpfs/hps && -e /etc/SuSE-release ]] ; then
-    # We are on NOAA Luna or Surge
-    if ( ! eval module help > /dev/null 2>&1 ) ; then
-        echo load the module command 1>&2
-        source /opt/modules/default/init/$__ms_shell
-    fi
-    target=wcoss_cray
-
-    # Silence the "module purge" to avoid the expected error messages
-    # related to modules that load modules.
-    module purge > /dev/null 2>&1
-    module use /usrx/local/prod/modulefiles
-    module use /gpfs/hps/nco/ops/nwprod/lib/modulefiles
-    module use /gpfs/hps/nco/ops/nwprod/modulefiles
-    module use /opt/cray/alt-modulefiles
-    module use /opt/cray/craype/default/alt-modulefiles
-    module use /opt/cray/ari/modulefiles
-    module use /opt/modulefiles
-    module purge > /dev/null 2>&1
-
-    # Workaround until module issues are fixed:
-    #unset _LMFILES_
-    #unset LOADEDMODULES
-    echo y 2> /dev/null | module clear > /dev/null 2>&1
-
-    module use /usrx/local/prod/modulefiles
-    module use /gpfs/hps/nco/ops/nwprod/lib/modulefiles
-    module use /gpfs/hps/nco/ops/nwprod/modulefiles
-    module use /opt/cray/alt-modulefiles
-    module use /opt/cray/craype/default/alt-modulefiles
-    module use /opt/cray/ari/modulefiles
-    module use /opt/modulefiles
-    module load modules
-
-elif [[ -L /usrx && "$( readlink /usrx 2> /dev/null )" =~ dell ]] ; then
-    # We are on NOAA Venus or Mars
-    if ( ! eval module help > /dev/null 2>&1 ) ; then
-        echo load the module command 1>&2
-        source /usrx/local/prod/lmod/lmod/init/$__ms_shell
-    fi
-    target=wcoss_dell_p3
-    module purge
 elif [[ -d /glade ]] ; then
     # We are on NCAR Cheyenne
     if ( ! eval module help > /dev/null 2>&1 ) ; then
@@ -131,6 +92,14 @@ elif [[ "$(hostname)" =~ "odin" ]]; then
 elif [[ -d /work/00315 && -d /scratch/00315 ]] ; then
     target=stampede
     module purge
+elif [[ -d /data/prod ]] ; then
+    # We are on SSEC S4
+    if ( ! eval module help > /dev/null 2>&1 ) ; then
+        echo load the module command 1>&2
+        source /usr/share/lmod/lmod/init/$__ms_shell
+    fi
+    target=s4
+    module purge
 else
     echo WARNING: UNKNOWN PLATFORM 1>&2
 fi