From: Guido Kanschat <dr.guido.kanschat@gmail.com>
Date: Sat, 11 Jan 2014 15:07:41 +0000 (+0000)
Subject: avoid deprecated functions
X-Git-Tag: v8.2.0-rc1~1045
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60b153040f405bf632939a5223f1d6f7a13caeb0;p=dealii.git

avoid deprecated functions

git-svn-id: https://svn.dealii.org/trunk@32194 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/include/deal.II/meshworker/simple.h b/deal.II/include/deal.II/meshworker/simple.h
index 224729da48..ed692c57f3 100644
--- a/deal.II/include/deal.II/meshworker/simple.h
+++ b/deal.II/include/deal.II/meshworker/simple.h
@@ -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));
               }
     }