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
Mpp
MLMC
Commits
255b9420
Commit
255b9420
authored
Dec 23, 2020
by
niklas.baumgarten
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature' of git.scc.kit.edu:mpp/mlmc into feature
parents
192ff7d9
91a53036
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
11 deletions
+11
-11
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
mlmc/src/generators/algorithms/CirculantEmbedding.hpp
mlmc/src/generators/algorithms/CirculantEmbedding.hpp
+2
-2
mlmc/src/generators/algorithms/HybridFluxGenerator.hpp
mlmc/src/generators/algorithms/HybridFluxGenerator.hpp
+2
-2
mlmc/src/pdesolver/PDESolver.cpp
mlmc/src/pdesolver/PDESolver.cpp
+4
-4
mlmc/tests/basics/TestPlotMap.cpp
mlmc/tests/basics/TestPlotMap.cpp
+1
-1
mpp
mpp
+1
-1
No files found.
.gitlab-ci.yml
View file @
255b9420
...
...
@@ -9,7 +9,7 @@ variables:
OS
:
"
ubuntu"
OS_VERSION_MLMC
:
"
20.04"
# hack
REGISTRY
:
"
ci.cluster.math.kit.edu"
IMAGE_NAME_MLMC
:
"
mlmc-${CI_COMMIT_SHORT_SHA}-${OS}${OS_VERSION_MLMC}"
IMAGE_NAME_MLMC
:
"
mlmc-${CI_COMMIT_SHORT_SHA}-${OS}${OS_VERSION_MLMC}
-${CI_PIPELINE_ID}
"
BENCHMARK
:
"
feature"
COMPARE_WITH
:
"
${}"
...
...
mlmc/src/generators/algorithms/CirculantEmbedding.hpp
View file @
255b9420
...
...
@@ -48,7 +48,7 @@ public:
explicit
CirculantEmbedding
(
Meshes
&
meshes
)
:
meshes
(
meshes
),
normalDist
(
meshes
),
cellMGraphs
(
meshes
,
dof
(
new
LagrangeDoF
(
0
))
)
{
cellMGraphs
(
meshes
,
new
LagrangeDoF
(
0
))
{
config
.
get
(
"evtol"
,
evtol
);
config
.
get
(
"StochasticField"
,
fieldType
);
...
...
@@ -220,4 +220,4 @@ public:
string
Name
()
const
override
{
return
"Circulant Embedding"
;
}
};
#endif //M_CIRCULANTEMBEDDING_H
\ No newline at end of file
#endif //M_CIRCULANTEMBEDDING_H
mlmc/src/generators/algorithms/HybridFluxGenerator.hpp
View file @
255b9420
...
...
@@ -67,8 +67,8 @@ public:
// MatrixGraphs cellMGraphs; cellMGraphs(MatrixGraphs(meshes,
dof(
new CellDoF(3)))
)
,
// MatrixGraphs faceMGraphs; faceMGraphs(MatrixGraphs(meshes,
dof(
new FaceDoF(1)))
)
,
// MatrixGraphs cellMGraphs; cellMGraphs(MatrixGraphs(meshes, new CellDoF(3))),
// MatrixGraphs faceMGraphs; faceMGraphs(MatrixGraphs(meshes, new FaceDoF(1))),
//
// Vector *faceFlux = nullptr;
// Vector *faceValues = nullptr;
...
...
mlmc/src/pdesolver/PDESolver.cpp
View file @
255b9420
...
...
@@ -12,7 +12,7 @@ MatrixGraphs *PDESolver::CreateSolutionMatrixGraphs(Meshes &meshes) {
auto
assemble
=
this
->
GetAssemble
();
auto
assembleType
=
typeid
(
*
assemble
).
name
();
if
(
assembleType
==
typeid
(
HybridEllipticAssemble
).
name
())
return
new
MatrixGraphs
(
meshes
,
dof
(
new
FaceDoF
(
1
))
)
;
return
new
MatrixGraphs
(
meshes
,
new
FaceDoF
(
1
));
if
(
assembleType
==
typeid
(
MixedEllipticAssemble
).
name
())
return
new
MatrixGraphs
(
meshes
,
*
disc
);
}
...
...
@@ -65,11 +65,11 @@ void EllipticPDESolver::plotSolution(SampleSolution &solution) {
void
EllipticPDESolver
::
createOtherMatrixGraphs
(
Meshes
&
meshes
)
{
if
(
plotting
)
{
fluxMGraphs
=
new
MatrixGraphs
(
meshes
,
dof
(
new
LagrangeDoF
(
0
,
3
))
)
;
fluxMGraphs
=
new
MatrixGraphs
(
meshes
,
new
LagrangeDoF
(
0
,
3
));
if
(
typeid
(
*
assemble
).
name
()
==
typeid
(
HybridEllipticAssemble
).
name
())
pressureMGraphs
=
new
MatrixGraphs
(
meshes
,
dof
(
new
LagrangeDoF
(
0
,
1
))
)
;
pressureMGraphs
=
new
MatrixGraphs
(
meshes
,
new
LagrangeDoF
(
0
,
1
));
else
pressureMGraphs
=
new
MatrixGraphs
(
meshes
,
dof
(
new
LagrangeDoF
(
1
,
1
))
)
;
pressureMGraphs
=
new
MatrixGraphs
(
meshes
,
new
LagrangeDoF
(
1
,
1
));
}
else
{
fluxMGraphs
=
nullptr
;
pressureMGraphs
=
nullptr
;
...
...
mlmc/tests/basics/TestPlotMap.cpp
View file @
255b9420
...
...
@@ -42,7 +42,7 @@ protected:
new
MatrixGraphs
(
*
meshes
,
*
(
new
LagrangeDiscretization
(
*
meshes
,
3
))),
new
MatrixGraphs
(
*
meshes
,
*
(
new
RTLagrangeDiscretization
(
*
meshes
,
0
,
0
))),
new
MatrixGraphs
(
*
meshes
,
dof
(
new
FaceDoF
(
1
))
)
,
new
MatrixGraphs
(
*
meshes
,
new
FaceDoF
(
1
)),
new
CellMatrixGraphs
(
*
meshes
,
*
(
new
DGDiscretization
(
*
meshes
,
0
))),
new
CellMatrixGraphs
(
*
meshes
,
*
(
new
DGDiscretization
(
*
meshes
,
1
))),
...
...
mpp
@
f00f5cd2
Compare
3ac2b791
...
f00f5cd2
Subproject commit
3ac2b791b1d6aeec33a7a7aebeef37bca53dc3d4
Subproject commit
f00f5cd2cfe71b80e2c87e377dc9c5f8f65df67a
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