Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Praetorius, Simon
dune-multimesh
Commits
8ca9a701
Commit
8ca9a701
authored
Nov 28, 2018
by
Praetorius, Simon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
solved some more compiler problems
parent
d6f3e0e0
Pipeline
#1484
failed with stage
in 29 minutes and 46 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
20 deletions
+7
-20
dune/multimesh/mmhierarchiciterator.hh
dune/multimesh/mmhierarchiciterator.hh
+0
-1
src/CMakeLists.txt
src/CMakeLists.txt
+2
-17
src/interpolation.hh
src/interpolation.hh
+1
-1
test/CMakeLists.txt
test/CMakeLists.txt
+4
-1
No files found.
dune/multimesh/mmhierarchiciterator.hh
View file @
8ca9a701
...
...
@@ -5,7 +5,6 @@
#include <numeric>
#include <stack>
#include <variant>
#include <dune/common/iteratorfacades.hh>
#include <dune/common/iteratorrange.hh>
...
...
src/CMakeLists.txt
View file @
8ca9a701
...
...
@@ -40,27 +40,12 @@ if (dune-functions_FOUND AND dune-alugrid_FOUND AND HAVE_ALBERTA)
find_package
(
MTL QUIET PATHS /opt/development/mtl4
)
if
(
MTL_FOUND
)
set
(
CXX_ELEVEN_FEATURE_LIST
"MOVE"
"AUTO"
"RANGEDFOR"
"INITLIST"
"STATICASSERT"
"DEFAULTIMPL"
)
set
(
MTL_COMPILE_DEFINITIONS
""
)
foreach
(
feature
${
CXX_ELEVEN_FEATURE_LIST
}
)
list
(
APPEND MTL_COMPILE_DEFINITIONS
"MTL_WITH_
${
feature
}
"
)
endforeach
()
if
(
HAVE_UMFPACK OR ENABLE_SUITESPARSE OR SuiteSparse_FOUND
)
list
(
APPEND MTL_COMPILE_DEFINITIONS
"MTL_HAS_UMFPACK"
)
endif
()
set
(
MTL_TARGETS
""
)
list
(
APPEND MTL_TARGETS
"phasefield"
"phasefield2"
"phasefield3"
"phasefield4"
)
foreach
(
target
${
MTL_TARGETS
}
)
foreach
(
target
"phasefield"
"phasefield2"
"phasefield3"
"phasefield4"
)
add_executable
(
${
target
}
${
target
}
.cc
)
target_link_dune_default_libraries
(
${
target
}
)
add_dune_alberta_flags
(
GRIDDIM 2 WORLDDIM 2
${
target
}
)
target_include_directories
(
${
target
}
PRIVATE
${
MTL_INCLUDE_DIRS
}
)
target_compile_definitions
(
${
target
}
PRIVATE
${
MTL_COMPILE_DEFINITIONS
}
)
target_compile_options
(
${
target
}
PRIVATE -Wno-deprecated-declarations
)
endforeach
()
endif
()
endif
(
MTL_FOUND
)
endif
()
\ No newline at end of file
src/interpolation.hh
View file @
8ca9a701
...
...
@@ -57,7 +57,7 @@ namespace Dune
auto
oldSubLocalView
=
Dune
::
Functions
::
subspaceBasis
(
oldBasis
,
treePath
).
localView
();
auto
newSubLocalView
=
Dune
::
Functions
::
subspaceBasis
(
newBasis
,
treePath
).
localView
();
interpolate
(
oldCoeff
,
oldEntity
,
oldSubLocalView
,
newCoeff
,
newEntity
,
newSubLocalView
);
this
->
interpolate
(
oldCoeff
,
oldEntity
,
oldSubLocalView
,
newCoeff
,
newEntity
,
newSubLocalView
);
});
}
}
...
...
test/CMakeLists.txt
View file @
8ca9a701
dune_add_test
(
SOURCES testvolume.cc
)
dune_add_test
(
SOURCES testnumentities.cc
)
dune_add_test
(
SOURCES testtransform.cc
)
dune_add_test
(
SOURCES testgridviews.cc
)
\ No newline at end of file
if
(
DUNE_HAVE_CXX_VARIANT
)
dune_add_test
(
SOURCES testgridviews.cc
)
endif
(
DUNE_HAVE_CXX_VARIANT
)
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment