Merge pull request #54 from climbfuji/openmp_bugfix

Bugfix for OpenMP
ufs-community · Feb 16, 2020 · 8934efa · 8934efa
2 parents 512fdd4 + 8ee4b58
commit 8934efa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,6 +3,8 @@ project(ufs_util VERSION 1.1.1)
 set(${PROJECT_NAME}_VERSION ${PROJECT_VERSION} CACHE INTERNAL "${PROJECT_NAME} version number")
 enable_language (Fortran)
 
+option(OPENMP "use OpenMP threading" OFF)
+
 if (NOT CMAKE_BUILD_TYPE)
   set (CMAKE_BUILD_TYPE RELEASE CACHE STRING
     "Choose the type of build, options are: PRODUCTION Debug Release."
@@ -34,7 +36,9 @@ endif()
 
 find_package(HDF5 COMPONENTS C HL Fortran_HL REQUIRED)
 find_package(NetCDF REQUIRED)
-find_package(OpenMP)
+if(OPENMP)
+  find_package(OpenMP)
+endif()
 find_package(MPI REQUIRED)
 find_package(Jasper REQUIRED)
 find_package(PNG REQUIRED)

diff --git a/cmake b/cmake
+0 −0		Modules/Findbacio.cmake
+0 −0		Modules/Findbufr.cmake
+1 −1		Modules/Findcrtm.cmake
+0 −0		Modules/Findg2.cmake
+0 −0		Modules/Findg2tmpl.cmake
+0 −0		Modules/Findgfsio.cmake
+0 −0		Modules/Findip.cmake
+0 −0		Modules/Findlandsfcutil.cmake
+0 −0		Modules/Findnemsio.cmake
+0 −0		Modules/Findnemsiogfs.cmake
+0 −0		Modules/Findpost.cmake
+0 −0		Modules/Findsfcio.cmake
+0 −0		Modules/Findsigio.cmake
+0 −0		Modules/Findsp.cmake
+0 −0		Modules/Findw3emc.cmake
+0 −0		Modules/Findw3nco.cmake