]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
avoid deprecated functions
authorkanschat <kanschat@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 11 Jan 2014 15:07:41 +0000 (15:07 +0000)
committerkanschat <kanschat@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 11 Jan 2014 15:07:41 +0000 (15:07 +0000)
git-svn-id: https://svn.dealii.org/trunk@32194 0785d39b-7218-0410-832d-ea1e28bc413d

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

index 224729da485d29a235ddda1cf043a6efe7b5c08c..ed692c57f3db468243b0398f81d93f7ae8e3dd1a 100644 (file)
@@ -975,18 +975,13 @@ namespace MeshWorker
             if (mg_constrained_dofs->at_refinement_edge(level, i1[j]) &&
                 !mg_constrained_dofs->at_refinement_edge(level, i2[k]))
               {
-                if (mg_constrained_dofs->set_boundary_values())
-                  {
-                    if ((!mg_constrained_dofs->at_refinement_edge_boundary(level, i1[j]) &&
-                         !mg_constrained_dofs->at_refinement_edge_boundary(level, i2[k]))
-                        ||
-                        (mg_constrained_dofs->at_refinement_edge_boundary(level, i1[j]) &&
-                         mg_constrained_dofs->at_refinement_edge_boundary(level, i2[k]) &&
-                         i1[j] == i2[k]))
-                      G.add(i1[j], i2[k], M(j,k));
-                  }
-                else
-                  G.add(i1[j], i2[k], M(j,k));
+               if ((!mg_constrained_dofs->at_refinement_edge_boundary(level, i1[j]) &&
+                    !mg_constrained_dofs->at_refinement_edge_boundary(level, i2[k]))
+                   ||
+                   (mg_constrained_dofs->at_refinement_edge_boundary(level, i1[j]) &&
+                    mg_constrained_dofs->at_refinement_edge_boundary(level, i2[k]) &&
+                    i1[j] == i2[k]))
+                 G.add(i1[j], i2[k], M(j,k));
               }
     }
 
@@ -1010,18 +1005,13 @@ namespace MeshWorker
             if (mg_constrained_dofs->at_refinement_edge(level, i1[j]) &&
                 !mg_constrained_dofs->at_refinement_edge(level, i2[k]))
               {
-                if (mg_constrained_dofs->set_boundary_values())
-                  {
-                    if ((!mg_constrained_dofs->at_refinement_edge_boundary(level, i1[j]) &&
-                         !mg_constrained_dofs->at_refinement_edge_boundary(level, i2[k]))
-                        ||
-                        (mg_constrained_dofs->at_refinement_edge_boundary(level, i1[j]) &&
-                         mg_constrained_dofs->at_refinement_edge_boundary(level, i2[k]) &&
-                         i1[j] == i2[k]))
-                      G.add(i1[j], i2[k], M(k,j));
-                  }
-                else
-                  G.add(i1[j], i2[k], M(k,j));
+               if ((!mg_constrained_dofs->at_refinement_edge_boundary(level, i1[j]) &&
+                    !mg_constrained_dofs->at_refinement_edge_boundary(level, i2[k]))
+                   ||
+                   (mg_constrained_dofs->at_refinement_edge_boundary(level, i1[j]) &&
+                    mg_constrained_dofs->at_refinement_edge_boundary(level, i2[k]) &&
+                    i1[j] == i2[k]))
+                 G.add(i1[j], i2[k], M(k,j));
               }
     }
 

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.