From c7e21daae8c54b278820948d0b8313344d3f560e Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Tue, 21 Oct 2014 11:29:32 +0200
Subject: [PATCH] Minor change in cmake concerning to MPI option.
---
BaseLib/CPUTime.h | 2 +-
BaseLib/RunTime.h | 2 +-
CMakeLists.txt | 18 +++++++++---------
scripts/cmake/Find.cmake | 8 +++-----
4 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/BaseLib/CPUTime.h b/BaseLib/CPUTime.h
index fc72f563a2e..ba9a5b3b5ec 100644
--- a/BaseLib/CPUTime.h
+++ b/BaseLib/CPUTime.h
@@ -32,7 +32,7 @@ class CPUTime
}
/// Get the elapsed time after started.
- const double elapsed()
+ double elapsed() const
{
return (clock() - _start_time)/static_cast<double>(CLOCKS_PER_SEC);
}
diff --git a/BaseLib/RunTime.h b/BaseLib/RunTime.h
index cb67269a0b4..4a3a6476730 100644
--- a/BaseLib/RunTime.h
+++ b/BaseLib/RunTime.h
@@ -50,7 +50,7 @@ class RunTime
}
/// Get the elapsed time after started.
- const double elapsed()
+ double elapsed() const
{
#if defined(USE_MPI)
return MPI_Wtime() - _start_time;
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f63552715b..3ded1f940c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,15 +117,6 @@ INCLUDE_DIRECTORIES( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/gtest/include
INCLUDE_DIRECTORIES( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/quickcheck )
INCLUDE_DIRECTORIES( SYSTEM ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/zlib )
-# Use MPI
-IF(OGS_USE_MPI)
- IF(WIN32)
- ADD_DEFINITIONS(/DUSE_MPI)
- ELSE()
- ADD_DEFINITIONS(-DUSE_MPI)
- ENDIF()
-ENDIF()
-
IF(OGS_USE_LIS)
ADD_DEFINITIONS(-DUSE_LIS)
INCLUDE_DIRECTORIES(SYSTEM ${LIS_INCLUDE_DIR})
@@ -137,6 +128,15 @@ IF(OGS_USE_PETSC)
SET(OGS_USE_MPI ON)
ENDIF()
+# Use MPI
+IF(OGS_USE_MPI)
+ IF(WIN32)
+ ADD_DEFINITIONS(/DUSE_MPI)
+ ELSE()
+ ADD_DEFINITIONS(-DUSE_MPI)
+ ENDIF()
+ENDIF()
+
IF(OGS_USE_EIGEN)
# ADD_DEFINITIONS(-DEIGEN_DEFAULT_DENSE_INDEX_TYPE=std::size_t)
ADD_DEFINITIONS(-DEIGEN_INITIALIZE_MATRICES_BY_ZERO)
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index b6cd99a30eb..42b02d5ee40 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -116,11 +116,6 @@ IF(OGS_USE_LIS)
FIND_PACKAGE( LIS REQUIRED )
ENDIF()
-## Check MPI package
-IF(OGS_USE_MPI)
- FIND_PACKAGE(MPI REQUIRED)
-ENDIF()
-
IF(OGS_USE_PETSC)
MESSAGE (STATUS "Configuring for PETSc" )
@@ -147,6 +142,9 @@ IF(OGS_USE_PETSC)
ENDIF()
+## Check MPI package
IF(OGS_USE_MPI)
+ FIND_PACKAGE(MPI REQUIRED)
INCLUDE_DIRECTORIES(SYSTEM ${MPI_CXX_INCLUDE_PATH})
ENDIF()
+
--
GitLab