diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a1c96cce..0d83dce1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/debian/control b/debian/control index 0a15b72d5..f396af217 100644 --- a/debian/control +++ b/debian/control @@ -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 diff --git a/dune.module b/dune.module index 961f4d614..4f2ee4fc9 100644 --- a/dune.module +++ b/dune.module @@ -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 diff --git a/jenkins/build.sh b/jenkins/build.sh index 70eef40b3..bfa522973 100755 --- a/jenkins/build.sh +++ b/jenkins/build.sh @@ -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 diff --git a/opm-simulators-prereqs.cmake b/opm-simulators-prereqs.cmake index d2bb1557e..fb86fad81 100644 --- a/opm-simulators-prereqs.cmake +++ b/opm-simulators-prereqs.cmake @@ -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) diff --git a/redhat/opm-simulators.spec b/redhat/opm-simulators.spec index f8719bd52..b7939137d 100644 --- a/redhat/opm-simulators.spec +++ b/redhat/opm-simulators.spec @@ -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 diff --git a/tests/update_reference_data.sh b/tests/update_reference_data.sh index 7d08038ac..171de6e37 100755 --- a/tests/update_reference_data.sh +++ b/tests/update_reference_data.sh @@ -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`