OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 02:30:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2060 from akva2/decouple-libecl-final

Browse Source 
remove libecl dependency
This commit is contained in:
Bård Skaflestad 2019-10-16 22:18:42 -05:00 committed by GitHub
commit 7296e7fe82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -205,12 +205,9 @@ endif()
# the research oriented general-purpose ECL simulator ("ebos" == &ecl
# &black-&oil &simulator)
get_target_property(ecl_INCLUDE_DIRS ecl INTERFACE_INCLUDE_DIRECTORIES)
set(MEBOS_TARGETS "")
foreach(OBJ blackoil solvent polymer foam gasoil oilwater thermal)
add_library(ebos_lib${OBJ} OBJECT EXCLUDE_FROM_ALL ebos/ebos_${OBJ}.cc)
target_include_directories(ebos_lib${OBJ} PRIVATE ${ecl_INCLUDE_DIRS})
list(APPEND MEBOS_TARGETS $<TARGET_OBJECTS:ebos_lib${OBJ}>)
endforeach()

2
debian/control vendored
View File

@ -5,7 +5,7 @@ Build-Depends: build-essential, debhelper (>= 9), libboost-filesystem-dev,
libboost-system-dev, libboost-date-time-dev, libboost-test-dev,
libsuperlu3-dev (>= 3.0) | libsuperlu-dev (>= 4.3), gfortran, libsuitesparse-dev, pkg-config,
libdune-common-dev, libdune-istl-dev, cmake, libtinyxml-dev, bc,
libecl-dev, git, zlib1g-dev, libtool, doxygen,
git, zlib1g-dev, libtool, doxygen,
texlive-latex-extra, texlive-latex-recommended, ghostscript,
libopm-material-dev,
libboost-iostreams-dev, libopm-common-dev,

4
jenkins/build.sh
View File

@ -4,14 +4,12 @@
#set -x
declare -a upstreams
upstreams=(libecl
opm-common
upstreams=(opm-common
opm-material
opm-grid
opm-models)
declare -A upstreamRev
upstreamRev[libecl]=master
upstreamRev[opm-common]=master
upstreamRev[opm-material]=master
upstreamRev[opm-grid]=master

1
opm-simulators-prereqs.cmake
View File

@ -3,7 +3,6 @@ set (opm-simulators_CONFIG_VAR
HAVE_OPM_GRID
HAVE_PTHREAD
HAVE_EWOMS
HAVE_ERT
HAVE_MPI
HAVE_PETSC
HAVE_SUITESPARSE_UMFPACK_H

2
redhat/opm-simulators.spec
View File

@ -18,7 +18,7 @@ BuildRequires: git suitesparse-devel doxygen bc devtoolset-6-toolchain
BuildRequires: opm-grid-devel opm-grid-openmpi-devel opm-grid-mpich-devel
BuildRequires: opm-models-devel opm-models-openmpi-devel opm-models-mpich-devel
BuildRequires: opm-material-devel opm-material-openmpi-devel opm-material-mpich-devel
BuildRequires: tinyxml-devel dune-istl-devel ecl-devel zlib-devel
BuildRequires: tinyxml-devel dune-istl-devel zlib-devel
BuildRequires: openmpi-devel trilinos-openmpi-devel ptscotch-openmpi-devel scotch-devel
BuildRequires: mpich-devel trilinos-mpich-devel ptscotch-mpich-devel
BuildRequires: opm-common-devel opm-common-openmpi-devel opm-common-mpich-devel

2
tests/update_reference_data.sh
View File

@ -112,7 +112,7 @@ then
else
echo -e "Reason: $REASON\n" >> /tmp/cmsg
fi
for dep in libecl opm-common opm-grid opm-material opm-models
for dep in opm-common opm-grid opm-material opm-models
do
pushd $WORKSPACE/deps/$dep > /dev/null
name=`printf "%-14s" $dep`