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.

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

Feature/cmake2 #7

Merged
merged 50 commits into from
Apr 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
41a3d36
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 13, 2020
e1294d9
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 13, 2020
459bae6
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 14, 2020
746cfe3
Merge branch 'feature/cmake2' of github.com:GeorgeGayno-NOAA/UFS_UTIL…
GeorgeGayno-NOAA Apr 14, 2020
5dde30c
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 14, 2020
19a4329
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 14, 2020
db79ffd
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 14, 2020
2042cf0
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 14, 2020
a60d024
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 14, 2020
57d97fb
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 14, 2020
ccd7866
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 14, 2020
6575874
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 15, 2020
25b3183
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 15, 2020
f28941a
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 15, 2020
37d7982
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 15, 2020
ebc3cfb
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 15, 2020
4f77f17
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 16, 2020
e0d7632
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 16, 2020
a802c63
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 16, 2020
53c1fa3
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 16, 2020
466fb4c
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 16, 2020
5749b52
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 16, 2020
1443a91
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 16, 2020
8316be6
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 16, 2020
c4ee540
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 17, 2020
df7cc5b
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 17, 2020
267901d
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 17, 2020
9adb80f
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 20, 2020
384148e
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 20, 2020
4bf732f
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 20, 2020
d2ac06c
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 20, 2020
7b22ded
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 20, 2020
0b9f7f6
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 20, 2020
f3710ae
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 20, 2020
0a3a2c1
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 21, 2020
6394312
CMake fixes
kgerheiser Apr 21, 2020
e9c4ec3
Merge pull request #6 from kgerheiser/feature/cmake-fixes
GeorgeGayno-NOAA Apr 22, 2020
f72582e
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 22, 2020
81fc0f1
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 22, 2020
8c26ff3
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 22, 2020
4d8517b
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 22, 2020
f890bf0
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 23, 2020
3e233da
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 24, 2020
594d722
feature/cmake2 this commit references #91.
GeorgeGayno-NOAA Apr 24, 2020
5f50cfc
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 24, 2020
e25b1ea
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 24, 2020
b73a219
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 24, 2020
cec5098
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 27, 2020
47e7cac
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 27, 2020
4b6f997
feature/cmake2 This commit references #91.
GeorgeGayno-NOAA Apr 27, 2020
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 .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "cmake"]
path = cmake
url = git@github.com:GeorgeGayno-NOAA/CMakeModules.git
url = https://github.com/GeorgeGayno-NOAA/CMakeModules
branch = feature/findNetCDF
47 changes: 34 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ file(STRINGS "VERSION" pVersion)
project(
ufs_util
VERSION ${pVersion}
LANGUAGES Fortran)
LANGUAGES C Fortran)
# LANGUAGES C CXX Fortran)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")

Expand All @@ -22,6 +22,10 @@ if(NOT CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel|GNU|Clang|AppleClang)$")
message(WARNING "Compiler not officially supported: ${CMAKE_Fortran_COMPILER_ID}")
endif()

if(NOT CMAKE_C_COMPILER_ID MATCHES "^(Intel|GNU)$")
message(WARNING "Compiler not officially supported: ${CMAKE_C_COMPILER_ID}")
endif()

if(POLICY CMP0054)
cmake_policy(SET CMP0054 NEW)
endif()
Expand All @@ -31,18 +35,11 @@ endif()

option(OPENMP "use OpenMP threading" ON)

if(NOT NETCDF)
if(NOT DEFINED ENV{NETCDF})
message(FATAL_ERROR "fatal error netcdf not set")
else()
list(APPEND CMAKE_PREFIX_PATH $ENV{NETCDF})
set(NETCDF $ENV{NETCDF})
endif()
if(DEFINED_ENV{NETCDF_FORTRAN})
list(APPEND CMAKE_PREFIX_PATH $ENV{NETCDF_FORTRAN})
endif()
endif()
find_package(NetCDF MODULE REQUIRED COMPONENTS C Fortran)
find_package(PNG REQUIRED)
find_package(ZLIB REQUIRED)
find_package(Jasper REQUIRED)

find_package(NetCDF REQUIRED C Fortran)
#unset(CMAKE_C_COMPILER_LOADED)
#unset(CMAKE_CXX_COMPILER_LOADED)
find_package(MPI REQUIRED )
Expand All @@ -55,6 +52,10 @@ endif()

set(CMAKE_FIND_PACKAGE_PREFER_CONFIG true)

if(NOT TARGET gfsio_4)
find_package(gfsio REQUIRED)
endif()

if(NOT TARGET sfcio_4)
find_package(sfcio REQUIRED)
endif()
Expand All @@ -63,6 +64,10 @@ if(NOT TARGET w3nco_d)
find_package(w3nco REQUIRED)
endif()

if(NOT TARGET landsfcutil_d)
find_package(landsfcutil REQUIRED)
endif()

if(NOT TARGET bacio_4)
find_package(bacio REQUIRED)
endif()
Expand All @@ -71,6 +76,10 @@ if(NOT TARGET nemsio)
find_package(nemsio REQUIRED)
endif()

if(NOT TARGET nemsiogfs)
find_package(nemsiogfs REQUIRED)
endif()

if(NOT TARGET sigio_4)
find_package(sigio REQUIRED)
endif()
Expand All @@ -79,4 +88,16 @@ if(NOT TARGET sp_d)
find_package(sp REQUIRED)
endif()

if(NOT TARGET ip_d)
find_package(ip REQUIRED)
endif()

if(NOT TARGET w3emc_d)
find_package(w3emc REQUIRED)
endif()

if(NOT TARGET g2_d)
find_package(g2 REQUIRED)
endif()

add_subdirectory(sorc)
2 changes: 1 addition & 1 deletion cmake
3 changes: 2 additions & 1 deletion driver_scripts/driver_grid.dell.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ module load EnvVars/1.0.2
module load lsf/10.1
module load ips/18.0.1.163
module load impi/18.0.1
module load NetCDF/4.5.0
module load HDF5-serial/1.10.1
module use /usrx/local/nceplibs/dev/NCEPLIBS/modulefiles
module load netcdf_parallel/4.7.4
module list

#-----------------------------------------------------------------------
Expand Down
21 changes: 0 additions & 21 deletions modulefiles/chgres_cube.hera

This file was deleted.

24 changes: 0 additions & 24 deletions modulefiles/chgres_cube.linux.gnu

This file was deleted.

24 changes: 0 additions & 24 deletions modulefiles/chgres_cube.linux.intel

This file was deleted.

27 changes: 0 additions & 27 deletions modulefiles/chgres_cube.odin

This file was deleted.

26 changes: 0 additions & 26 deletions modulefiles/chgres_cube.orion

This file was deleted.

18 changes: 0 additions & 18 deletions modulefiles/chgres_cube.wcoss_dell_p3

This file was deleted.

10 changes: 0 additions & 10 deletions modulefiles/fv3gfs/fre-nctools.gaea

This file was deleted.

9 changes: 0 additions & 9 deletions modulefiles/fv3gfs/fre-nctools.hera

This file was deleted.

8 changes: 0 additions & 8 deletions modulefiles/fv3gfs/fre-nctools.jet

This file was deleted.

6 changes: 0 additions & 6 deletions modulefiles/fv3gfs/fre-nctools.wcoss

This file was deleted.

9 changes: 0 additions & 9 deletions modulefiles/fv3gfs/fre-nctools.wcoss_cray

This file was deleted.

9 changes: 0 additions & 9 deletions modulefiles/fv3gfs/fre-nctools.wcoss_dell_p3

This file was deleted.

26 changes: 0 additions & 26 deletions modulefiles/fv3gfs/global_chgres.jet

This file was deleted.

22 changes: 0 additions & 22 deletions modulefiles/fv3gfs/global_chgres.wcoss

This file was deleted.

27 changes: 0 additions & 27 deletions modulefiles/fv3gfs/global_chgres.wcoss_cray

This file was deleted.

Loading