Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
iwr
dune-vtk
Commits
edc93310
Commit
edc93310
authored
Dec 12, 2020
by
Praetorius, Simon
Browse files
reduce module dependencies
parent
3cb6b196
Changes
12
Hide whitespace changes
Inline
Side-by-side
dune.module
View file @
edc93310
...
...
@@ -7,5 +7,5 @@ Module: dune-vtk
Version
:
0.2
Maintainer
:
simon
.
praetorius
@
tu
-
dresden
.
de
#depending on
Depends
:
dune
-
common
(
>=
2.6
)
dune
-
geometry
(
>=
2.6
)
dune
-
grid
dune
-
uggrid
Suggests
:
dune
-
functions
dune
-
spgrid
dune
-
polygongrid
dune
-
alugrid
dune
-
foamgrid
Depends
:
dune
-
grid
(
>=
2.6
)
Suggests
:
dune
-
functions
dune
-
spgrid
dune
-
polygongrid
dune
-
alugrid
dune
-
foamgrid
dune
-
uggrid
dune/vtk/datacollectors/test/test-lagrangedatacollector.cc
View file @
edc93310
...
...
@@ -10,7 +10,7 @@
#include
<dune/common/test/testsuite.hh>
#include
<dune/grid/yaspgrid.hh>
#if HAVE_
UG
#if HAVE_
DUNE_UGGRID
#include
<dune/grid/uggrid.hh>
#endif
...
...
@@ -107,7 +107,7 @@ int main(int argc, char** argv)
testGrid
(
"yaspgrid_2d"
,
testSuite
,
yaspGrid2
);
testGrid
(
"yaspgrid_3d"
,
testSuite
,
yaspGrid3
);
#if HAVE_
UG
#if HAVE_
DUNE_UGGRID
auto
ugGrid2
=
StructuredGridFactory
<
UGGrid
<
2
>>::
createSimplexGrid
({
0.0
,
0.0
},
{
1.0
,
1.0
},
{
1u
,
1u
});
auto
ugGrid3
=
StructuredGridFactory
<
UGGrid
<
3
>>::
createSimplexGrid
({
0.0
,
0.0
,
0.0
},
{
1.0
,
1.0
,
1.0
},
{
1u
,
1u
,
1u
});
...
...
dune/vtk/test/test-typededuction.cc
View file @
edc93310
...
...
@@ -8,7 +8,7 @@
#include
<dune/vtk/vtkreader.hh>
#include
<dune/vtk/vtkwriter.hh>
#if HAVE_
UG
#if HAVE_
DUNE_UGGRID
#include
<dune/grid/uggrid.hh>
using
GridType
=
Dune
::
UGGrid
<
2
>
;
#else
...
...
dune/vtk/test/test-vtkwriter.cc
View file @
edc93310
...
...
@@ -16,7 +16,7 @@
#include
<dune/common/parallel/mpihelper.hh>
#include
<dune/functions/gridfunctions/analyticgridviewfunction.hh>
#include
<dune/grid/yaspgrid.hh>
#if HAVE_
UG
#if HAVE_
DUNE_UGGRID
#include
<dune/grid/uggrid.hh>
#include
<dune/grid/utility/structuredgridfactory.hh>
#endif
...
...
@@ -116,7 +116,7 @@ int main (int argc, char** argv)
acc
(
result
,
testGrid
(
"yaspgrid_2d"
,
vtkChecker
,
yaspGrid2
));
acc
(
result
,
testGrid
(
"yaspgrid_3d"
,
vtkChecker
,
yaspGrid3
));
#if HAVE_
UG
#if HAVE_
DUNE_UGGRID
auto
ugGrid2a
=
StructuredGridFactory
<
UGGrid
<
2
>>::
createSimplexGrid
({
0.0
,
0.0
},
{
1.0
,
2.0
},
{
2u
,
4u
});
auto
ugGrid3a
=
StructuredGridFactory
<
UGGrid
<
3
>>::
createSimplexGrid
({
0.0
,
0.0
,
0.0
},
{
1.0
,
2.0
,
3.0
},
{
2u
,
4u
,
6u
});
...
...
src/benchmark.cc
View file @
edc93310
...
...
@@ -13,7 +13,10 @@
#include
<dune/common/filledarray.hh>
#include
<dune/common/timer.hh>
#if HAVE_DUNE_UGGRID
#include
<dune/grid/uggrid.hh>
#endif
#include
<dune/grid/yaspgrid.hh>
#include
<dune/grid/io/file/vtk.hh>
#include
<dune/grid/utility/structuredgridfactory.hh>
...
...
src/datacollector.cc
View file @
edc93310
...
...
@@ -19,7 +19,7 @@
#include
<dune/functions/gridfunctions/analyticgridviewfunction.hh>
#include
<dune/functions/gridfunctions/discreteglobalbasisfunction.hh>
#if HAVE_
UG
#if HAVE_
DUNE_UGGRID
#include
<dune/grid/uggrid.hh>
#endif
...
...
@@ -98,7 +98,7 @@ int main(int argc, char** argv)
write
(
"datacollector_yasp"
,
grid
.
leafGridView
());
});
#if HAVE_
UG
#if HAVE_
DUNE_UGGRID
Hybrid
::
forEach
(
StaticIntegralRange
<
int
,
4
,
2
>
{},
[](
auto
dim
)
{
using
GridType
=
UGGrid
<
dim
.
value
>
;
...
...
src/legacyvtkwriter.cc
View file @
edc93310
...
...
@@ -12,7 +12,6 @@
#include
<dune/common/exceptions.hh>
// We use exceptions
#include
<dune/common/filledarray.hh>
#include
<dune/grid/uggrid.hh>
#include
<dune/grid/yaspgrid.hh>
#include
<dune/vtk/writers/vtkunstructuredgridwriter.hh>
...
...
src/structuredgridwriter.cc
View file @
edc93310
...
...
@@ -17,7 +17,6 @@
#include
<dune/functions/functionspacebases/interpolate.hh>
#include
<dune/functions/gridfunctions/analyticgridviewfunction.hh>
#include
<dune/functions/gridfunctions/discreteglobalbasisfunction.hh>
#include
<dune/grid/uggrid.hh>
#include
<dune/grid/yaspgrid.hh>
#include
<dune/vtk/writers/vtkimagedatawriter.hh>
...
...
src/test/mixed_element_test.cc
View file @
edc93310
...
...
@@ -13,7 +13,7 @@
#include
<dune/common/filledarray.hh>
#include
<dune/common/test/testsuite.hh>
#if HAVE_
UG
#if HAVE_
DUNE_UGGRID
#include
<dune/grid/uggrid.hh>
#endif
...
...
src/test/parallel_reader_writer_test.cc
View file @
edc93310
...
...
@@ -14,7 +14,7 @@
#include
<dune/common/std/type_traits.hh>
#include
<dune/common/test/testsuite.hh>
#if HAVE_
UG
#if HAVE_
DUNE_UGGRID
#include
<dune/grid/uggrid.hh>
#endif
...
...
@@ -181,7 +181,7 @@ int main (int argc, char** argv)
TestSuite
test
{};
#if HAVE_
UG
#if HAVE_
DUNE_UGGRID
reader_writer_test
<
UGGrid
<
2
>
,
Vtk
::
SerialGridCreator
<
UGGrid
<
2
>>>
(
mpi
,
test
,
"UGGrid<2>"
);
reader_writer_test
<
UGGrid
<
3
>
,
Vtk
::
SerialGridCreator
<
UGGrid
<
3
>>>
(
mpi
,
test
,
"UGGrid<3>"
);
#endif
...
...
src/test/reader_writer_test.cc
View file @
edc93310
...
...
@@ -14,7 +14,7 @@
#include
<dune/common/filledarray.hh>
#include
<dune/common/test/testsuite.hh>
#if HAVE_
UG
#if HAVE_
DUNE_UGGRID
#include
<dune/grid/uggrid.hh>
#endif
...
...
@@ -142,7 +142,7 @@ int main (int argc, char** argv)
TestSuite
test
{};
#if HAVE_
UG
#if HAVE_
DUNE_UGGRID
// Test VtkWriter for UGGrid
Hybrid
::
forEach
(
std
::
make_tuple
(
int_
<
2
>
{},
int_
<
3
>
{}),
[
&
test
,
&
mpi
](
auto
dim
)
{
...
...
src/vtkwriter.cc
View file @
edc93310
...
...
@@ -17,7 +17,9 @@
#include
<dune/functions/functionspacebases/interpolate.hh>
#include
<dune/functions/gridfunctions/analyticgridviewfunction.hh>
#include
<dune/functions/gridfunctions/discreteglobalbasisfunction.hh>
#if HAVE_DUNE_UGGRID
#include
<dune/grid/uggrid.hh>
#endif
#include
<dune/grid/yaspgrid.hh>
#include
<dune/vtk/vtkwriter.hh>
...
...
@@ -77,7 +79,7 @@ int main (int argc, char** argv)
{
Dune
::
MPIHelper
::
instance
(
argc
,
argv
);
#if HAVE_
UG
#if HAVE_
DUNE_UGGRID
// Test VtkWriter for UGGrid
Hybrid
::
forEach
(
std
::
make_tuple
(
int_
<
2
>
{},
int_
<
3
>
{}),
[](
auto
dim
)
{
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment