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 prebuilt FMS library #534

Merged
merged 31 commits into from
May 14, 2021
Merged

Use prebuilt FMS library #534

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
3a53642
Use prebuilt FMS library
DusanJovic-NOAA Apr 19, 2021
f38e59e
Merge remote-tracking branch 'origin/develop' into libfms
DusanJovic-NOAA Apr 19, 2021
aa34475
remove FMS submodule
DusanJovic-NOAA Apr 19, 2021
08cc619
Update cmake version in all cheyenne module files
DusanJovic-NOAA Apr 19, 2021
fd3c6ac
Update CMakeLists.txt (remove printing CMAKE_VERSION)
DusanJovic-NOAA Apr 19, 2021
c9b1a97
delete FMS directory
DusanJovic-NOAA Apr 19, 2021
7b341b4
Update README.md (remove FMS)
DusanJovic-NOAA Apr 20, 2021
887f5ed
Merge remote-tracking branch 'origin/develop' into libfms
DusanJovic-NOAA Apr 20, 2021
46cdf3b
Merge remote-tracking branch 'origin/develop' into libfms
DusanJovic-NOAA Apr 23, 2021
f295d4e
Update fms module
DusanJovic-NOAA Apr 23, 2021
7e88c52
Update cmake modules on gaea
DusanJovic-NOAA Apr 28, 2021
836e2da
Merge remote-tracking branch 'origin/develop' into libfms
DusanJovic-NOAA Apr 30, 2021
9e29d95
Update cmake in modulefiles/ufs_hera.gnu
DusanJovic-NOAA Apr 30, 2021
8428dad
Update cmake module on wcoss_dell_p3
DusanJovic-NOAA Apr 30, 2021
3413341
Update cmake module on orion
DusanJovic-NOAA Apr 30, 2021
ee03283
Update cmake module on jet
DusanJovic-NOAA May 4, 2021
06495f3
Merge remote-tracking branch 'origin/develop' into libfms
DusanJovic-NOAA May 9, 2021
ab1e2c2
update wcoss_cray modulefiles
DusanJovic-NOAA May 9, 2021
9353c8c
Merge remote-tracking branch 'origin/develop' into libfms
DusanJovic-NOAA May 13, 2021
c46b545
Update BL_DATE to 20210513
DusanJovic-NOAA May 13, 2021
e6285e5
RT JOBS PASSED: cheyenne.gnu. Log file uploaded.
BrianCurtis-NOAA May 13, 2021
0c83335
RT JOBS PASSED: hera.gnu. Log file uploaded.
BrianCurtis-NOAA May 13, 2021
f902218
Update ci for fms library #575 (#13)
MinsukJi-NOAA May 13, 2021
0cdb2ff
run-ci
DusanJovic-NOAA May 13, 2021
7039643
RT JOBS PASSED: gaea.intel. Log file uploaded.
BrianCurtis-NOAA May 13, 2021
a723923
RT JOBS PASSED: cheyenne.intel. Log file uploaded.
BrianCurtis-NOAA May 13, 2021
88fa043
RT JOBS PASSED: hera.intel. Log file uploaded.
BrianCurtis-NOAA May 13, 2021
3d1f3ba
add RegressionTests_wcoss_cray.log
DusanJovic-NOAA May 13, 2021
cba3be4
Add RegressionTests_wcoss_dell_p3.log
DusanJovic-NOAA May 14, 2021
1b1030a
RT JOBS PASSED: jet.intel. Log file uploaded.
BrianCurtis-NOAA May 14, 2021
98ed044
Add RegressionTests_orion.intel.log
DusanJovic-NOAA May 14, 2021
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
4 changes: 0 additions & 4 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
path = NEMS
url = https://github.com/NOAA-EMC/NEMS
branch = develop
[submodule "FMS"]
path = FMS
url = https://github.com/NOAA-GFDL/FMS
branch = release/2020.04
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
Expand Down
39 changes: 9 additions & 30 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.15)
cmake_minimum_required(VERSION 3.18)

foreach(env_var IN ITEMS CMAKE_C_COMPILER CMAKE_CXX_COMPILER CMAKE_Fortran_COMPILER)
if(NOT DEFINED ENV{${env_var}})
Expand Down Expand Up @@ -65,17 +65,6 @@ if(CMAKE_Platform)
else()
message("Platform '${CMAKE_Platform}' configuration file does not exist")
endif()

DusanJovic-NOAA marked this conversation as resolved.
Show resolved Hide resolved
# DH* 20210208 temporary workaround for FMS issues on Cheyenne with GNU 9.1.0
if (CMAKE_Platform MATCHES "cheyenne.gnu")
message("Applying patch cheyenne_gnu_fms_mpp_util_mpi_inc.patch")
execute_process(COMMAND patch -N -p0 INPUT_FILE cheyenne_gnu_fms_mpp_util_mpi_inc.patch
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/cheyenne_gnu_fms_mpp_util_mpi_inc.patch.out
ERROR_FILE ${CMAKE_CURRENT_BINARY_DIR}/cheyenne_gnu_fms_mpp_util_mpi_inc.patch.err
RESULT_VARIABLE RC)
# *DH 20210208
endif()
endif()

message("")
Expand Down Expand Up @@ -133,6 +122,14 @@ if(OPENMP)
endif()
find_package(NetCDF REQUIRED C Fortran)
find_package(ESMF MODULE REQUIRED)
if(FMS)
find_package(FMS REQUIRED COMPONENTS R4 R8)
if(32BIT)
add_library(fms ALIAS FMS::fms_r4)
else()
add_library(fms ALIAS FMS::fms_r8)
endif()
endif()
if(CMEPS)
find_package(PIO REQUIRED COMPONENTS C Fortran STATIC)
endif()
Expand All @@ -153,24 +150,6 @@ target_link_libraries(nemsio::nemsio INTERFACE w3emc::w3emc_d bacio::bacio_4)
find_package(Python 3 REQUIRED COMPONENTS Interpreter)
message("Found Python: ${Python_EXECUTABLE}")

###############################################################################
### FMS
###############################################################################
if(FMS)
set(GFS_PHYS ON CACHE BOOL "Enable GFS Physics")
if(NOT 32BIT)
set(64BIT ON CACHE BOOL "Enable 64-bit")
endif()

add_subdirectory(FMS)

if(32BIT)
add_library(fms ALIAS fms_r4)
else()
add_library(fms ALIAS fms_r8)
endif()
endif(FMS)

###############################################################################
### stochastic_physics
###############################################################################
Expand Down
1 change: 0 additions & 1 deletion FMS
Open in desktop
Submodule FMS deleted from d4724f
12 changes: 0 additions & 12 deletions cheyenne_gnu_fms_mpp_util_mpi_inc.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion modulefiles/ufs_cheyenne.gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ proc ModulesHelp {} {

module-whatis "loads UFS Model prerequisites for Cheyenne/GNU"

module load cmake/3.16.4
module load cmake/3.18.2
setenv CMAKE_C_COMPILER mpicc
setenv CMAKE_CXX_COMPILER mpicxx
setenv CMAKE_Fortran_COMPILER mpif90
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_cheyenne.gnu_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ proc ModulesHelp {} {

module-whatis "loads UFS Model prerequisites for Cheyenne/GNU"

module load cmake/3.16.4
module load cmake/3.18.2
setenv CMAKE_C_COMPILER mpicc
setenv CMAKE_CXX_COMPILER mpicxx
setenv CMAKE_Fortran_COMPILER mpif90
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_cheyenne.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ proc ModulesHelp {} {

module-whatis "loads UFS Model prerequisites for Cheyenne/Intel"

module load cmake/3.16.4
module load cmake/3.18.2
setenv CMAKE_C_COMPILER mpicc
setenv CMAKE_CXX_COMPILER mpicxx
setenv CMAKE_Fortran_COMPILER mpif90
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_cheyenne.intel_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ proc ModulesHelp {} {

module-whatis "loads UFS Model prerequisites for Cheyenne/Intel"

module load cmake/3.16.4
module load cmake/3.18.2
setenv CMAKE_C_COMPILER mpicc
setenv CMAKE_CXX_COMPILER mpicxx
setenv CMAKE_Fortran_COMPILER mpif90
Expand Down
2 changes: 2 additions & 0 deletions modulefiles/ufs_common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.4

module load fms/noaa-gfdl-2020.04.03
2 changes: 2 additions & 0 deletions modulefiles/ufs_common_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.4

module load fms/noaa-gfdl-2020.04.03
4 changes: 3 additions & 1 deletion modulefiles/ufs_hera.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ module-whatis "loads UFS Model prerequisites for Hera/Intel"
module use /contrib/sutils/modulefiles
module load sutils

module load cmake/3.16.1
setenv CMAKE_C_COMPILER mpiicc
setenv CMAKE_CXX_COMPILER mpiicpc
setenv CMAKE_Fortran_COMPILER mpiifort
Expand All @@ -18,6 +17,9 @@ setenv CMAKE_Platform hera.intel
module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack

module load hpc/1.1.0

module load cmake/3.20.0

module load hpc-intel/18.0.5.274
module load hpc-impi/2018.0.4

Expand Down
4 changes: 3 additions & 1 deletion modulefiles/ufs_hera.intel_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ module-whatis "loads UFS Model prerequisites for Hera/Intel"
module use /contrib/sutils/modulefiles
module load sutils

module load cmake/3.16.1
setenv CMAKE_C_COMPILER mpiicc
setenv CMAKE_CXX_COMPILER mpiicpc
setenv CMAKE_Fortran_COMPILER mpiifort
Expand All @@ -18,6 +17,9 @@ setenv CMAKE_Platform hera.intel
module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack

module load hpc/1.1.0

module load cmake/3.20.0

module load hpc-intel/18.0.5.274
module load hpc-impi/2018.0.4

Expand Down