Merge pull request #1985 from akva2/rename_ewoms

changed: rename ewoms to opm-models
This commit is contained in:
Atgeirr Flø Rasmussen 2019-08-23 16:20:53 +02:00 committed by GitHub
commit f3aedc4f3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 8 deletions

View File

@ -79,7 +79,7 @@ include (CMakeLists_files.cmake)
macro (config_hook)
opm_need_version_of ("dune-common")
opm_need_version_of ("dune-istl")
opm_need_version_of ("ewoms")
opm_need_version_of ("opm-models")
endmacro (config_hook)
macro (prereqs_hook)

2
debian/control vendored
View File

@ -10,7 +10,7 @@ Build-Depends: build-essential, debhelper (>= 9), libboost-filesystem-dev,
libopm-material-dev,
libboost-iostreams-dev, libopm-common-dev,
libopm-grid-dev, libdune-grid-dev,
libtrilinos-zoltan-dev, libopenmpi-dev, mpi-default-bin, libewoms-dev
libtrilinos-zoltan-dev, libopenmpi-dev, mpi-default-bin, libopm-models-dev
Standards-Version: 3.9.2
Section: libs
Homepage: http://opm-project.org

View File

@ -10,4 +10,4 @@ Label: 2019.10-pre
Maintainer: atgeirr@sintef.no
MaintainerName: Atgeirr F. Rasmussen
Url: http://opm-project.org
Depends: dune-istl (>= 2.4) opm-common opm-material opm-grid ewoms
Depends: dune-istl (>= 2.4) opm-common opm-material opm-grid opm-models

View File

@ -8,14 +8,14 @@ upstreams=(libecl
opm-common
opm-material
opm-grid
ewoms)
opm-models)
declare -A upstreamRev
upstreamRev[libecl]=master
upstreamRev[opm-common]=master
upstreamRev[opm-material]=master
upstreamRev[opm-grid]=master
upstreamRev[ewoms]=master
upstreamRev[opm-models]=master
if grep -q "opm-common=" <<< $ghprbCommentBody
then

View File

@ -39,7 +39,7 @@ set (opm-simulators_DEPS
"opm-common REQUIRED"
"opm-material REQUIRED"
"opm-grid REQUIRED"
"ewoms REQUIRED"
"opm-models REQUIRED"
)
find_package_deps(opm-simulators)

View File

@ -16,7 +16,7 @@ BuildRequires: blas-devel lapack-devel
BuildRequires: dune-common-devel dune-geometry-devel dune-grid-devel dune-localfunctions-devel
BuildRequires: git suitesparse-devel doxygen bc devtoolset-6-toolchain
BuildRequires: opm-grid-devel opm-grid-openmpi-devel opm-grid-mpich-devel
BuildRequires: ewoms-devel ewoms-openmpi-devel ewoms-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: openmpi-devel trilinos-openmpi-devel ptscotch-openmpi-devel scotch-devel

View File

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