Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
J
Jambhekar2015b
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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-pub
Jambhekar2015b
Commits
fd64809c
Commit
fd64809c
authored
8 years ago
by
Thomas Fetzer
Browse files
Options
Downloads
Patches
Plain Diff
[installJambhekar2015b.sh] Fix issues related to dune.grid (add patch), fix finding ug
parent
07ec3d34
Branches
master
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitignore
+1
-0
1 addition, 0 deletions
.gitignore
installJambhekar2015b.sh
+9
-1
9 additions, 1 deletion
installJambhekar2015b.sh
patches/dune-grid.patch
+12
-0
12 additions, 0 deletions
patches/dune-grid.patch
with
22 additions
and
1 deletion
.gitignore
+
1
−
0
View file @
fd64809c
...
...
@@ -18,6 +18,7 @@ missing
stamp-h1
config.*
configure
dunecontrol_used.opts
# auto-generated doxygen files
Doxyfile
...
...
This diff is collapsed.
Click to expand it.
installJambhekar2015b.sh
+
9
−
1
View file @
fd64809c
...
...
@@ -55,6 +55,9 @@ cd ug && git checkout -q v3.12.1 && cd ..
cd
dumux
&&
git checkout
-q
12dcfef8b71dbc8be815df7e8148d9eba7e45c74
&&
cd
..
### apply necessary patches
cd
dune-grid
&&
patch
-p1
< ../Jambhekar2015b/patches/dune-grid.patch
&&
cd
..
### build UG
cd
ug
autoreconf
-is
...
...
@@ -68,4 +71,9 @@ make install
cd
..
### run dunecontrol
UG_ROOT
=
$SCRIPTPATH
/../ug ./dune-common/bin/dunecontrol
--opts
=
Jambhekar2015b/dunecontrol.opts all
pwd
>
temp.txt
sed
-i
's/\//\\\//g'
temp.txt
EXTPATH
=
`
cat
temp.txt
`
/usr/bin/rm temp.txt
sed
"s/DUG_ROOT=.*/DUG_ROOT=
$EXTPATH
\/
ug/"
Jambhekar2015b/dunecontrol.opts
>
Jambhekar2015b/dunecontrol_used.opts
./dune-common/bin/dunecontrol
--opts
=
Jambhekar2015b/dunecontrol_used.opts all
This diff is collapsed.
Click to expand it.
patches/dune-grid.patch
0 → 100644
+
12
−
0
View file @
fd64809c
diff --git a/cmake/modules/FindGrape.cmake b/cmake/modules/FindGrape.cmake
index d622152..80d54a7 100644
--- a/cmake/modules/FindGrape.cmake
+++ b/cmake/modules/FindGrape.cmake
@@ -43,6 +43,7 @@
find_path(GRAPE_INCLUDE_DIR grape.h
# check header usability
include(CMakePushCheckState)
+include(CheckIncludeFiles)
cmake_push_check_state()
set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -DENABLE_GRAPE")
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENGL_INCLUDE_DIR} ${GRAPE_INCLUDE_DIR})
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