Merge remote-tracking branch 'upstream/release/2013.03' into make-io-subdir
This commit is contained in:
Atgeirr Flø Rasmussen
commit
2f99316d01
@ -51,7 +51,6 @@ list (APPEND MAIN_SOURCE_FILES
|
||||
opm/core/grid/cornerpoint_grid.c
|
||||
opm/core/grid/cpgpreprocess/facetopology.c
|
||||
opm/core/grid/cpgpreprocess/geometry.c
|
||||
opm/core/grid/cpgpreprocess/mxgrdecl.c
|
||||
opm/core/grid/cpgpreprocess/preprocess.c
|
||||
opm/core/grid/cpgpreprocess/processgrid.c
|
||||
opm/core/grid/cpgpreprocess/uniquepoints.c
|
||||
@ -263,7 +262,6 @@ list (APPEND PUBLIC_HEADER_FILES
|
||||
opm/core/grid/cornerpoint_grid.h
|
||||
opm/core/grid/cpgpreprocess/geometry.h
|
||||
opm/core/grid/cpgpreprocess/uniquepoints.h
|
||||
opm/core/grid/cpgpreprocess/mxgrdecl.h
|
||||
opm/core/grid/cpgpreprocess/preprocess.h
|
||||
opm/core/grid/cpgpreprocess/grdecl.h
|
||||
opm/core/grid/cpgpreprocess/facetopology.h
|
||||
|
||||
@ -10,18 +10,14 @@ macro (opm_defaults opm)
|
||||
|
||||
# default to building a static library, but let user override
|
||||
if (DEFINED BUILD_SHARED_LIBS)
|
||||
set (_shared_def ${BUILD_SHARED_LIBS})
|
||||
if (BUILD_SHARED_LIBS)
|
||||
set (${opm}_LIBRARY_TYPE SHARED)
|
||||
else (BUILD_SHARED_LIBS)
|
||||
set (${opm}_LIBRARY_TYPE STATIC)
|
||||
endif (BUILD_SHARED_LIBS)
|
||||
else (DEFINED BUILD_SHARED_LIBS)
|
||||
set (_shared_def OFF)
|
||||
endif (DEFINED BUILD_SHARED_LIBS)
|
||||
string (TOUPPER "${${opm}_NAME}" opm_UPPER)
|
||||
string (REPLACE "-" "_" opm_UPPER "${opm_UPPER}")
|
||||
option (BUILD_${opm_UPPER}_SHARED "Build ${${opm}_NAME} as a shared library" ${_shared_def})
|
||||
if (BUILD_${opm_UPPER}_SHARED)
|
||||
set (${opm}_LIBRARY_TYPE SHARED)
|
||||
else (BUILD_${opm_UPPER}_SHARED)
|
||||
set (${opm}_LIBRARY_TYPE STATIC)
|
||||
endif (BUILD_${opm_UPPER}_SHARED)
|
||||
endif (DEFINED BUILD_SHARED_LIBS)
|
||||
|
||||
# precompile standard headers to speed up compilation
|
||||
# unfortunately, this functionality is buggy and tends to segfault at
|
||||
|
||||
9
configure
vendored
9
configure
vendored
@ -3,9 +3,6 @@
|
||||
# where is the source tree located
|
||||
srcdir=$(dirname "$0")
|
||||
|
||||
# name of the project
|
||||
project=$(sed -n "s,^Module:[\ \t]*\([^\ \t]*\),\1,p" "${srcdir}/dune.module")
|
||||
|
||||
# display help text
|
||||
usage () {
|
||||
cat <<EOF
|
||||
@ -279,10 +276,8 @@ for OPT in "$@"; do
|
||||
shared=""
|
||||
;;
|
||||
esac
|
||||
projuppr=${project^^}
|
||||
projuppr=${projuppr/-/_}
|
||||
test -n "${shared}" && \
|
||||
FEATURES="${FEATURES} -DBUILD_${projuppr}_SHARED:BOOL=${shared}"
|
||||
FEATURES="${FEATURES} -DBUILD_SHARED_LIBS:BOOL=${shared}"
|
||||
;;
|
||||
*)
|
||||
# remove everything *after* the equal sign
|
||||
@ -314,6 +309,6 @@ done
|
||||
|
||||
# pass everything on to CMake
|
||||
CMDLINE="env ${ENVVARS} ${CMAKE_COMMAND} \"${srcdir}\" \"-DCMAKE_INSTALL_PREFIX=$prefix\" -DCMAKE_BUILD_TYPE=${buildtype}${pch_use}${silent_rules}${debug_loc}${use_openmp} ${FEATURES}"
|
||||
echo --- calling CMake for ${project} ---
|
||||
echo --- calling CMake ---
|
||||
echo ${CMDLINE}
|
||||
eval exec ${CMDLINE}
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
Module: opm-core
|
||||
Version: 1.0
|
||||
Maintainer: atgeirr@sintef.no
|
||||
Depends: dune-common (>= 2.2) dune-istl (>= 2.2)
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
/*
|
||||
/*!
|
||||
\cond SKIP
|
||||
Copyright 2012 SINTEF ICT, Applied Mathematics.
|
||||
|
||||
This file is part of the Open Porous Media project (OPM).
|
||||
@ -15,9 +16,8 @@
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OPM. If not, see <http://www.gnu.org/licenses/>.
|
||||
\endcond
|
||||
*/
|
||||
|
||||
|
||||
#if HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif // HAVE_CONFIG_H
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
/*
|
||||
/*!
|
||||
\cond SKIP
|
||||
Copyright 2012 SINTEF ICT, Applied Mathematics.
|
||||
|
||||
This file is part of the Open Porous Media project (OPM).
|
||||
@ -15,9 +16,8 @@
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OPM. If not, see <http://www.gnu.org/licenses/>.
|
||||
\endcond
|
||||
*/
|
||||
|
||||
|
||||
/// \page tutorial2 Flow Solver for a single phase
|
||||
/// \details The flow equations consist of the mass conservation equation
|
||||
/// \f[\nabla\cdot {\bf u}=q\f] and the Darcy law \f[{\bf u} =- \frac{1}{\mu}K\nabla p.\f] Here,
|
||||
@ -27,8 +27,6 @@
|
||||
/// We solve the flow equations for a Cartesian grid and we set the source term
|
||||
/// \f$q\f$ be zero except at the left-lower and right-upper corner, where it is equal
|
||||
/// with opposite sign (inflow equal to outflow).
|
||||
|
||||
|
||||
#if HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif // HAVE_CONFIG_H
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
/*
|
||||
/*!
|
||||
\cond SKIP
|
||||
Copyright 2012 SINTEF ICT, Applied Mathematics.
|
||||
|
||||
This file is part of the Open Porous Media project (OPM).
|
||||
@ -15,9 +16,8 @@
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OPM. If not, see <http://www.gnu.org/licenses/>.
|
||||
\endcond
|
||||
*/
|
||||
|
||||
|
||||
#if HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif // HAVE_CONFIG_H
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
/*
|
||||
/*!
|
||||
\cond SKIP
|
||||
Copyright 2012 SINTEF ICT, Applied Mathematics.
|
||||
|
||||
This file is part of the Open Porous Media project (OPM).
|
||||
@ -15,9 +16,8 @@
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OPM. If not, see <http://www.gnu.org/licenses/>.
|
||||
\endcond
|
||||
*/
|
||||
|
||||
|
||||
#if HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif // HAVE_CONFIG_H
|
||||
|
||||
Loading…
Reference in New Issue
Block a user