Skip to content
Snippets Groups Projects
Commit 7b1dfa20 authored by Elias Pipping's avatar Elias Pipping Committed by Elias Pipping
Browse files

Cleanup

parent 0c5b82ee
No related branches found
No related tags found
No related merge requests found
...@@ -283,22 +283,15 @@ class MyBlockProblem<MyConvexProblemTypeTEMPLATE>::IterateObject { ...@@ -283,22 +283,15 @@ class MyBlockProblem<MyConvexProblemTypeTEMPLATE>::IterateObject {
LocalVectorType &ui, int m, LocalVectorType &ui, int m,
typename Dune::BitSetVector<block_size>::const_reference ignore) { typename Dune::BitSetVector<block_size>::const_reference ignore) {
{ {
int ignore_component = block_size; int ic =
// Special value that indicates nothing should be ignored block_size; // Special value that indicates nothing should be ignored
switch (ignore.count()) { switch (ignore.count()) {
case 0: // Full problem case 0: // Full problem
break; break;
case 1: // 1 Dimension is fixed case 1:
// Only the X and Y components are allowed to be fixed in this manner for (ic = 0; ic < block_size; ++ic)
if (ignore[0]) { if (ignore[ic])
ignore_component = 0; break;
break;
}
if (ignore[1]) {
ignore_component = 1;
break;
}
assert(false);
break; break;
case block_size: // Ignore the whole node case block_size: // Ignore the whole node
return; return;
...@@ -320,8 +313,7 @@ class MyBlockProblem<MyConvexProblemTypeTEMPLATE>::IterateObject { ...@@ -320,8 +313,7 @@ class MyBlockProblem<MyConvexProblemTypeTEMPLATE>::IterateObject {
assert(localA != nullptr); assert(localA != nullptr);
auto const phi = problem.phi.restriction(m); auto const phi = problem.phi.restriction(m);
Dune::EllipticEnergy<block_size> localJ(*localA, localb, phi, Dune::EllipticEnergy<block_size> localJ(*localA, localb, phi, ic);
ignore_component);
Dune::minimise(localJ, ui, localsteps, bisection); Dune::minimise(localJ, ui, localsteps, bisection);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment