diff --git a/bin/installexternal.sh b/bin/installexternal.sh index 0ec581dd2e80350a91b6ff11bdf13f7ca9230e5d..9ffdbcb6ffad3a942b12ebf44098f8afca7dbaaa 100755 --- a/bin/installexternal.sh +++ b/bin/installexternal.sh @@ -53,37 +53,6 @@ installAluGrid() fi } -installEcl() -{ - cd $TOPDIR - - if [ ! -e libecl ]; then - git clone -b 2018.10 https://github.com/Statoil/libecl.git - fi - - if test "$DOWNLOAD_ONLY" == "y"; then - return - fi - - if test "$CLEANUP" == "y"; then - rm -rf libecl - return - fi - - # building libecl - echo "Building libecl" - cd $TOPDIR/libecl - mkdir build - cd build - cmake .. - make - - # show additional information - echo "Ecl has been built in directory libecl/build." - - cd $TOPDIR -} - installFoamGrid() { cd $TOPDIR @@ -288,11 +257,17 @@ installOPM() fi if [ ! -e opm-common ]; then - git clone -b release/2018.10 https://github.com/OPM/opm-common + git clone https://github.com/OPM/opm-common + cd opm-common + git reset --hard d3817e2fc2f79014d3cb0c01325a6e8a5dcc0cf3 + cd $TOPDIR fi if [ ! -e opm-grid ]; then - git clone -b release/2018.10 https://github.com/OPM/opm-grid + git clone https://github.com/OPM/opm-grid + cd opm-grid + git reset --hard f3421419412dc326b2ffe566b0c405447f7bf1dc + cd $TOPDIR fi if test "$DOWNLOAD_ONLY" == "y"; then @@ -308,12 +283,11 @@ installOPM() # show additional information echo "In addition, it might be necessary to set manually some" echo "CMake variables in the CMAKE_FLAGS section of the .opts-file:" - echo " -Decl_DIR=$TOPDIR/libecl/build" echo " -DUSE_MPI=ON" # show some opm prerequisites echo "Maybe you also have to install the following packages (see the opm prerequisites at opm-project.org): " - echo " BLAS, LAPACK, Boost, SuperLU, SuiteSparse" + echo " BLAS, LAPACK, Boost, SuiteSparse, Zoltan" cd $TOPDIR } @@ -430,7 +404,6 @@ usage() echo "Where PACKAGES is one or more of the following" echo " all Install everything and the kitchen sink." echo " alugrid Download dune-alugrid." - echo " ecl Download and build ecl." echo " foamgrid Download dune-foamgrid." echo " glpk Download and install glpk." echo " gstat Download and install gstat." @@ -498,7 +471,6 @@ for TMP in "$@"; do SOMETHING_DONE="y" createExternalDirectory installAluGrid - installEcl installFoamGrid installGLPK installGStat @@ -515,10 +487,6 @@ for TMP in "$@"; do SOMETHING_DONE="y" installAluGrid ;; - ecl) - SOMETHING_DONE="y" - installEcl - ;; foamgrid|dune-foamgrid) SOMETHING_DONE="y" installFoamGrid diff --git a/cmake.opts b/cmake.opts index d75a486a8c32c362900dd82133f5423625fd514e..59c43ad1c232c9b0cc944f3cf1475b0e9feed079 100644 --- a/cmake.opts +++ b/cmake.opts @@ -35,7 +35,6 @@ SPECIFIC_GENERATOR="" OPM_FLAGS="" # to build opm it might be necessary to set manually the following variables (comment the above line) #OPM_FLAGS=" -#-Decl_DIR=[/path/to]/libecl/build #-DUSE_MPI=ON #" diff --git a/dumux/io/grid/cpgridmanager.hh b/dumux/io/grid/cpgridmanager.hh index 56b331a4ca3eb99f6553d88cb298de29de6e63e7..dbaf27a9f183af9e113f9ef6c0ce39292c3fd369 100644 --- a/dumux/io/grid/cpgridmanager.hh +++ b/dumux/io/grid/cpgridmanager.hh @@ -55,7 +55,7 @@ public: deck_ = std::make_shared<Opm::Deck>(Opm::Parser().parseFile(fileName)); Opm::EclipseGrid eclGrid(*deck_); grid_ = std::make_shared<Grid>(); - grid_->processEclipseFormat(eclGrid, false, false); + grid_->processEclipseFormat(&eclGrid, false, false, false); loadBalance(); }