Merge branch 'develop' into feature/cycle_noahmp

Fixes ufs-community#761.
GeorgeGayno-NOAA · Apr 18, 2023 · f2ee012 · f2ee012
2 parents c4f0690 + d1e928b
commit f2ee012
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ lib/
 
 fix/am
 fix/orog
+fix/orog_raw
 fix/sfc_climo
 
 *.[ao]

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.9.0
+1.10.0
diff --git a/docs/user_guide.md b/docs/user_guide.md
@@ -9,6 +9,7 @@ https://github.com/ufs-community/UFS_UTILS.
 
 ## Documentation for Previous Versions of UFS_UTILS
 
+* [UFS_UTILS Version 1.10.0](ver-1.10.0/index.html)
 * [UFS_UTILS Version 1.9.0](ver-1.9.0/index.html)
 * [UFS_UTILS Version 1.8.0](ver-1.8.0/index.html)
 * [UFS_UTILS Version 1.7.0](ver-1.7.0/index.html)

diff --git a/modulefiles/build.wcoss2.intel.lua b/modulefiles/build.wcoss2.intel.lua
@@ -69,7 +69,6 @@ load(pathJoin("gsl", gsl_ver))
 nco_ver=os.getenv("nco_ver") or "4.9.7"
 load(pathJoin("nco", nco_ver))
 
-prepend_path("MODULEPATH", "/apps/dev/lmodules/intel_cray_mpich/19.1.3.304/cray-mpich/8.1.4")
 esmf_ver=os.getenv("esmf_ver") or "8.4.1"
 load(pathJoin("esmf", esmf_ver))