Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dumux-repositories
dumux
Commits
c2625c1f
Commit
c2625c1f
authored
5 years ago
by
Martin Schneider
Browse files
Options
Downloads
Patches
Plain Diff
[scripts] Update opm installation and delete ecl dependency
parent
6df5f68b
No related branches found
No related tags found
1 merge request
!1936
Support newest version of opm-grid for cornerpoint grids
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bin/installexternal.sh
+8
-40
8 additions, 40 deletions
bin/installexternal.sh
cmake.opts
+0
-1
0 additions, 1 deletion
cmake.opts
with
8 additions
and
41 deletions
bin/installexternal.sh
+
8
−
40
View file @
c2625c1f
...
@@ -53,37 +53,6 @@ installAluGrid()
...
@@ -53,37 +53,6 @@ installAluGrid()
fi
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
()
installFoamGrid
()
{
{
cd
$TOPDIR
cd
$TOPDIR
...
@@ -288,11 +257,17 @@ installOPM()
...
@@ -288,11 +257,17 @@ installOPM()
fi
fi
if
[
!
-e
opm-common
]
;
then
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
fi
if
[
!
-e
opm-grid
]
;
then
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
fi
if
test
"
$DOWNLOAD_ONLY
"
==
"y"
;
then
if
test
"
$DOWNLOAD_ONLY
"
==
"y"
;
then
...
@@ -308,7 +283,6 @@ installOPM()
...
@@ -308,7 +283,6 @@ installOPM()
# show additional information
# show additional information
echo
"In addition, it might be necessary to set manually some"
echo
"In addition, it might be necessary to set manually some"
echo
"CMake variables in the CMAKE_FLAGS section of the .opts-file:"
echo
"CMake variables in the CMAKE_FLAGS section of the .opts-file:"
echo
" -Decl_DIR=
$TOPDIR
/libecl/build"
echo
" -DUSE_MPI=ON"
echo
" -DUSE_MPI=ON"
# show some opm prerequisites
# show some opm prerequisites
...
@@ -430,7 +404,6 @@ usage()
...
@@ -430,7 +404,6 @@ usage()
echo
"Where PACKAGES is one or more of the following"
echo
"Where PACKAGES is one or more of the following"
echo
" all Install everything and the kitchen sink."
echo
" all Install everything and the kitchen sink."
echo
" alugrid Download dune-alugrid."
echo
" alugrid Download dune-alugrid."
echo
" ecl Download and build ecl."
echo
" foamgrid Download dune-foamgrid."
echo
" foamgrid Download dune-foamgrid."
echo
" glpk Download and install glpk."
echo
" glpk Download and install glpk."
echo
" gstat Download and install gstat."
echo
" gstat Download and install gstat."
...
@@ -498,7 +471,6 @@ for TMP in "$@"; do
...
@@ -498,7 +471,6 @@ for TMP in "$@"; do
SOMETHING_DONE
=
"y"
SOMETHING_DONE
=
"y"
createExternalDirectory
createExternalDirectory
installAluGrid
installAluGrid
installEcl
installFoamGrid
installFoamGrid
installGLPK
installGLPK
installGStat
installGStat
...
@@ -515,10 +487,6 @@ for TMP in "$@"; do
...
@@ -515,10 +487,6 @@ for TMP in "$@"; do
SOMETHING_DONE
=
"y"
SOMETHING_DONE
=
"y"
installAluGrid
installAluGrid
;;
;;
ecl
)
SOMETHING_DONE
=
"y"
installEcl
;;
foamgrid|dune-foamgrid
)
foamgrid|dune-foamgrid
)
SOMETHING_DONE
=
"y"
SOMETHING_DONE
=
"y"
installFoamGrid
installFoamGrid
...
...
This diff is collapsed.
Click to expand it.
cmake.opts
+
0
−
1
View file @
c2625c1f
...
@@ -35,7 +35,6 @@ SPECIFIC_GENERATOR=""
...
@@ -35,7 +35,6 @@ SPECIFIC_GENERATOR=""
OPM_FLAGS=""
OPM_FLAGS=""
# to build opm it might be necessary to set manually the following variables (comment the above line)
# to build opm it might be necessary to set manually the following variables (comment the above line)
#OPM_FLAGS="
#OPM_FLAGS="
#-Decl_DIR=[/path/to]/libecl/build
#-DUSE_MPI=ON
#-DUSE_MPI=ON
#"
#"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment