Skip to content

UFS-dev PR#26 #98

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

Merged
grantfirl merged 7 commits into from
Jun 29, 2023
Merged

UFS-dev PR#26 #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
46ef6d5
Use nccmp to compare netcdf files in regression test on NOAA R&D mach…
DusanJovic-NOAA Apr 24, 2023
3cc95d6
Add CLM Lake Model and update Flake (#1509)
SamuelTrahanNOAA Apr 26, 2023
e23c8ff
Merge commit '3cc95d67' into ufs-dev-PR26
grantfirl May 9, 2023
f651b67
Merge branch 'main' into ufs-dev-PR26
grantfirl Jun 13, 2023
0bd36d8
add successful Hera RT logs
grantfirl Jun 14, 2023
8e4addc
add successful Cheyenne logs and update BL_DATE in rt.ncar.sh
Jun 15, 2023
361e269
update FV3 submodule pointer
grantfirl Jun 29, 2023
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
2 changes: 1 addition & 1 deletion CMEPS-interface/CMEPS
Open in desktop
Submodule CMEPS updated 2 files
+26 −5 ufs/ccpp/data/MED_typedefs.F90
+52 −6 ufs/ccpp/data/MED_typedefs.meta
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 15 files
+1 −0 CMakeLists.txt
+1 −0 ccpp/config/ccpp_prebuild_config.py
+0 −3 ccpp/data/CCPP_typedefs.F90
+0 −6 ccpp/data/CCPP_typedefs.meta
+250 −16 ccpp/data/GFS_typedefs.F90
+431 −4 ccpp/data/GFS_typedefs.meta
+387 −0 ccpp/driver/GFS_diagnostics.F90
+28 −0 ccpp/driver/GFS_restart.F90
+1 −1 ccpp/physics
+95 −0 ccpp/suites/suite_FV3_GFS_v16_clm_lake.xml
+1 −1 ccpp/suites/suite_FV3_HRRR.xml
+82 −0 ccpp/suites/suite_FV3_HRRR_flake.xml
+91 −0 ccpp/suites/suite_FV3_RAP_clm_lake.xml
+166 −16 io/FV3GFS_io.F90
+432 −0 io/clm_lake_io.F90
2 changes: 1 addition & 1 deletion WW3
Open in desktop
Submodule WW3 updated 4 files
+3 −0 .gitignore
+27 −27 model/src/w3gridmd.F90
+2 −1 model/src/w3iogrmd.F90
+8 −8 model/src/w3profsmd_pdlib.F90
84 changes: 29 additions & 55 deletions modulefiles/ufs_common.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,30 @@
help([[
loads UFS Model common libraries
]])

jasper_ver=os.getenv("jasper_ver") or "2.0.25"
load(pathJoin("jasper", jasper_ver))

zlib_ver=os.getenv("zlib_ver") or "1.2.11"
load(pathJoin("zlib", zlib_ver))

libpng_ver=os.getenv("libpng_ver") or "1.6.37"
load(pathJoin("libpng", libpng_ver))

hdf5_ver=os.getenv("hdf5_ver") or "1.10.6"
load(pathJoin("hdf5", hdf5_ver))

netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
load(pathJoin("netcdf", netcdf_ver))

pio_ver=os.getenv("pio_ver") or "2.5.7"
load(pathJoin("pio", pio_ver))

esmf_ver=os.getenv("esmf_ver") or "8.3.0b09"
load(pathJoin("esmf", esmf_ver))

fms_ver=os.getenv("fms_ver") or "2022.04"
load(pathJoin("fms",fms_ver))

bacio_ver=os.getenv("bacio_ver") or "2.4.1"
load(pathJoin("bacio", bacio_ver))

crtm_ver=os.getenv("crtm_ver") or "2.4.0"
load(pathJoin("crtm", crtm_ver))

g2_ver=os.getenv("g2_ver") or "3.4.5"
load(pathJoin("g2", g2_ver))

g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.2"
load(pathJoin("g2tmpl", g2tmpl_ver))

ip_ver=os.getenv("ip_ver") or "3.3.3"
load(pathJoin("ip", ip_ver))

sp_ver=os.getenv("sp_ver") or "2.3.3"
load(pathJoin("sp", sp_ver))

w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
load(pathJoin("w3emc", w3emc_ver))

gftl_shared_ver=os.getenv("gftl_shared_ver") or "v1.5.0"
load(pathJoin("gftl-shared", gftl_shared_ver))

mapl_ver=os.getenv("mapl_ver") or "2.22.0-esmf-8.3.0b09"
load(pathJoin("mapl", mapl_ver))

whatis("Description: UFS build environment common libraries")

help([[Load UFS Model common libraries]])

local ufs_modules = {
{["jasper"] = "2.0.25"},
{["zlib"] = "1.2.11"},
{["libpng"] = "1.6.37"},
{["hdf5"] = "1.10.6"},
{["netcdf"] = "4.7.4"},
{["pio"] = "2.5.7"},
{["esmf"] = "8.3.0b09"},
{["fms"] = "2022.04"},
{["bacio"] = "2.4.1"},
{["crtm"] = "2.4.0"},
{["g2"] = "3.4.5"},
{["g2tmpl"] = "1.10.2"},
{["ip"] = "3.3.3"},
{["sp"] = "2.3.3"},
{["w3emc"] = "2.9.2"},
{["gftl-shared"] = "v1.5.0"},
{["mapl"] = "2.22.0-esmf-8.3.0b09"},
}

for i = 1, #ufs_modules do
for name, default_version in pairs(ufs_modules[i]) do
local env_version_name = string.gsub(name, "-", "_") .. "_ver"
load(pathJoin(name, os.getenv(env_version_name) or default_version))
end
end
7 changes: 0 additions & 7 deletions modulefiles/ufs_gaea.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ help([[

whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea ]===])

prepend_path("MODULEPATH", "/lustre/f2/dev/role.epic/contrib/modulefiles")
load(pathJoin("miniconda3",os.getenv("miniconda_ver") or "4.12.0"))

load(pathJoin("cmake", os.getenv("cmake_ver") or "3.20.1"))

prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/hpc-stack/intel-2021.3.0_noarch/modulefiles/stack")
Expand All @@ -22,14 +19,10 @@ load(pathJoin("libpng", os.getenv("libpng_ver") or "1.6.37"))
load(pathJoin("gcc", os.getenv("gcc_ver") or "8.3.0"))
-- Needed at runtime:
load("alps")
load("rocoto")

load("ufs_common")

setenv("CC","cc")
setenv("FC","ftn")
setenv("CXX","CC")
setenv("CMAKE_C_COMPILER","cc")
setenv("CMAKE_CXX_COMPILER","CC")
setenv("CMAKE_Fortran_COMPILER","ftn")
setenv("CMAKE_Platform","gaea.intel")
4 changes: 0 additions & 4 deletions modulefiles/ufs_hera.gnu.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ help([[
loads UFS Model prerequisites for Hera/GNU
]])

prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles")
miniconda3_ver=os.getenv("miniconda3_ver") or "4.12.0"
load(pathJoin("miniconda3", miniconda3_ver))

prepend_path("MODULEPATH", "/contrib/sutils/modulefiles")
load("sutils")

Expand Down
4 changes: 0 additions & 4 deletions modulefiles/ufs_hera.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ help([[
loads UFS Model prerequisites for Hera/Intel
]])

prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles")
miniconda3_ver=os.getenv("miniconda3_ver") or "4.12.0"
load(pathJoin("miniconda3", miniconda3_ver))

prepend_path("MODULEPATH", "/contrib/sutils/modulefiles")
load("sutils")

Expand Down
5 changes: 0 additions & 5 deletions modulefiles/ufs_jet.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ load("sutils")
cmake_ver=os.getenv("cmake_ver") or "3.20.1"
load(pathJoin("cmake", cmake_ver))

prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/miniconda3/modulefiles")
miniconda3_ver=os.getenv("miniconda3_ver") or "4.12.0"
load(pathJoin("miniconda3", miniconda3_ver))


prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/hpc-stack/libs/intel-2022.1.2/modulefiles/stack")

hpc_ver=os.getenv("hpc_ver") or "1.2.0"
Expand Down
4 changes: 0 additions & 4 deletions modulefiles/ufs_orion.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ load("noaatools")
cmake_ver=os.getenv("cmake_ver") or "3.22.1"
load(pathJoin("cmake", cmake_ver))

prepend_path("MODULEPATH", "/work/noaa/epic-ps/role-epic-ps/miniconda3/modulefiles")
miniconda3_ver=os.getenv("miniconda3_ver") or "4.12.0"
load(pathJoin("miniconda3", miniconda3_ver))

prepend_path("MODULEPATH", "/work/noaa/epic-ps/role-epic-ps/hpc-stack/libs/intel-2022.1.2/modulefiles/stack")

hpc_ver=os.getenv("hpc_ver") or "1.2.0"
Expand Down
Loading