]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
remove if with identical code in both branches
authorkanschat <kanschat@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 3 Jan 2014 17:48:41 +0000 (17:48 +0000)
committerkanschat <kanschat@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 3 Jan 2014 17:48:41 +0000 (17:48 +0000)
git-svn-id: https://svn.dealii.org/trunk@32160 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/include/deal.II/meshworker/simple.h

index 2cb8940f99076d8784c53ac5079b5f5e77c95804..ec8241b64fb93b1ef9dd27a2f312b94162786ef1 100644 (file)
@@ -1074,21 +1074,11 @@ namespace MeshWorker
         {
           if (level1 == level2)
             {
-              if (mg_constrained_dofs == 0)
-                {
-                  assemble((*matrix)[level1], info1.matrix(0,false).matrix, info1.indices, info1.indices, level1);
-                  assemble((*matrix)[level1], info1.matrix(0,true).matrix, info1.indices, info2.indices, level1);
-                  assemble((*matrix)[level1], info2.matrix(0,false).matrix, info2.indices, info2.indices, level1);
-                  assemble((*matrix)[level1], info2.matrix(0,true).matrix, info2.indices, info1.indices, level1);
-                }
-              else
-                {
-                  assemble((*matrix)[level1], info1.matrix(0,false).matrix, info1.indices, info1.indices, level1);
-                  assemble((*matrix)[level1], info1.matrix(0,true).matrix, info1.indices, info2.indices, level1);
-                  assemble((*matrix)[level1], info2.matrix(0,false).matrix, info2.indices, info2.indices, level1);
-                  assemble((*matrix)[level1], info2.matrix(0,true).matrix, info2.indices, info1.indices, level1);
-                }
-            }
+             assemble((*matrix)[level1], info1.matrix(0,false).matrix, info1.indices, info1.indices, level1);
+             assemble((*matrix)[level1], info1.matrix(0,true).matrix, info1.indices, info2.indices, level1);
+             assemble((*matrix)[level1], info2.matrix(0,false).matrix, info2.indices, info2.indices, level1);
+             assemble((*matrix)[level1], info2.matrix(0,true).matrix, info2.indices, info1.indices, level1);
+           }
           else
             {
               Assert(level1 > level2, ExcInternalError());

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.