Skip to content
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

Use combined IP/IP2 library #695

Merged
merged 40 commits into from
Feb 22, 2023
Merged

Use combined IP/IP2 library #695

Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
5dd6340
feature/new_ip
GeorgeGayno-NOAA Jan 27, 2021
9e786b9
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Apr 14, 2021
c093082
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Apr 21, 2021
e6bab4c
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Apr 26, 2021
dac7fc1
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Apr 27, 2021
0399124
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA May 19, 2021
2b2a235
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Aug 3, 2021
292be97
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Sep 7, 2022
7d4d516
Point to my local copy of ip v4 on wcoss2.
GeorgeGayno-NOAA Sep 9, 2022
c70851d
Update orography code so it can call either v4 or v3.3.3 of iplib.
GeorgeGayno-NOAA Sep 9, 2022
59292b4
Mods to run with ip v3.3.3 for testing purposes.
GeorgeGayno-NOAA Sep 9, 2022
8e3842e
Rename orog code with capital F extension to use
GeorgeGayno-NOAA Sep 12, 2022
201754f
Add preprocessor directives the ipolates routine.
GeorgeGayno-NOAA Sep 13, 2022
b2f7b70
Update orog and snow2mdl build modules to include compiler
GeorgeGayno-NOAA Sep 13, 2022
86818a3
Use ip v4.0.0 on Hera.
GeorgeGayno-NOAA Sep 13, 2022
b187192
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Sep 14, 2022
5cf0dd8
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Sep 20, 2022
2dd1efb
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Oct 14, 2022
f83014d
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Oct 14, 2022
794304d
Update orion build module to use ip v4.0.
GeorgeGayno-NOAA Oct 14, 2022
363871c
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Oct 19, 2022
7f7feec
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Nov 1, 2022
bf05b7f
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Nov 29, 2022
5fbfa1f
Point to Hang's ip v4.0 version of Cactus.
GeorgeGayno-NOAA Nov 29, 2022
37787b4
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Dec 1, 2022
36b5592
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Dec 1, 2022
a50b3c3
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Dec 7, 2022
ef794d9
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Dec 19, 2022
9291b37
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Jan 3, 2023
1fccbcc
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Jan 10, 2023
dd32d75
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Jan 19, 2023
17a80f1
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Jan 25, 2023
7dd4780
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Feb 2, 2023
b960a81
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Feb 2, 2023
a58f82f
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Feb 7, 2023
b2696d9
Point to new EPIC hpc stack and use ip 4.0.0 on Jet.
GeorgeGayno-NOAA Feb 8, 2023
f426727
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Feb 9, 2023
227e5e5
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Feb 16, 2023
a682ce8
Point to official hpc stack version of ip v4.0.0 on
GeorgeGayno-NOAA Feb 21, 2023
0f50253
Merge branch 'develop' into feature/new_ip
GeorgeGayno-NOAA Feb 22, 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 modulefiles/build.hera.gnu.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ load(pathJoin("bacio", bacio_ver))
g2_ver=os.getenv("g2_ver") or "3.4.3"
load(pathJoin("g2", g2_ver))

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

nemsio_ver=os.getenv("nemsio_ver") or "2.5.2"
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/build.hera.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ load(pathJoin("bacio", bacio_ver))
g2_ver=os.getenv("g2_ver") or "3.4.5"
load(pathJoin("g2", g2_ver))

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

nemsio_ver=os.getenv("nemsio_ver") or "2.5.4"
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/build.jet.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ load(pathJoin("w3nco", w3nco_ver))
sp_ver=os.getenv("sp_ver") or "2.3.3"
load(pathJoin("sp", sp_ver))

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

bacio_ver=os.getenv("bacio_ver") or "2.4.1"
Expand Down
4 changes: 2 additions & 2 deletions modulefiles/build.orion.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Load environment to compile UFS_UTILS on Orion
cmake_ver=os.getenv("cmake_ver") or "3.17.3"
load(pathJoin("cmake", cmake_ver))

prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack")
prepend_path("MODULEPATH", "/apps/contrib/NCEP/hpc-stack/libs/hpc-stack/modulefiles/stack")

hpc_ver=os.getenv("hpc_ver") or "1.2.0"
load(pathJoin("hpc", hpc_ver))
Expand All @@ -22,7 +22,7 @@ load(pathJoin("bacio", bacio_ver))
g2_ver=os.getenv("g2_ver") or "3.4.5"
load(pathJoin("g2", g2_ver))

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

nemsio_ver=os.getenv("nemsio_ver") or "2.5.4"
Expand Down
7 changes: 5 additions & 2 deletions modulefiles/build.wcoss2.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ load(pathJoin("sigio", sigio_ver))
sp_ver=os.getenv("sp_ver") or "2.3.3"
load(pathJoin("sp", sp_ver))

ip_ver=os.getenv("ip_ver") or "3.3.3"
load(pathJoin("ip", ip_ver))
-- setenv("ip_DIR","/lfs/h2/emc/global/noscrub/George.Gayno/ip.git/lib64/cmake/ip")

JeffBeck-NOAA marked this conversation as resolved.
Show resolved Hide resolved
g2_ver=os.getenv("g2_ver") or "3.4.5"
load(pathJoin("g2", g2_ver))
Expand All @@ -76,4 +75,8 @@ prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/mpi/intel/19.1.3.304
esmf_ver=os.getenv("esmf_ver") or "8.4.0b08"
load(pathJoin("esmf", esmf_ver))

prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.9")
ip_ver=os.getenv("ip_ver") or "4.0.0"
load(pathJoin("ip", ip_ver))

whatis("Description: UFS_UTILS build environment")
3 changes: 3 additions & 0 deletions sorc/emcsfc_snow2mdl.fd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8 -fconvert=big-endian")
endif()
if(ip_VERSION GREATER_EQUAL 4.0.0)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -DIP_V4")
endif()

set(exe_name emcsfc_snow2mdl)

Expand Down
Loading