]> https://gitweb.dealii.org/ - dealii.git/commitdiff
RCM: Update mesh_worker
authorMatthias Maier <tamiko@43-1.org>
Sat, 26 May 2018 02:24:38 +0000 (21:24 -0500)
committerMatthias Maier <tamiko@43-1.org>
Wed, 6 Jun 2018 15:19:38 +0000 (10:19 -0500)
include/deal.II/meshworker/assembler.h
include/deal.II/meshworker/simple.h

index 33c8b22406b272954b85ef6ce4153baaf94512b4..18cff981fbcb5b6fcf9252b0157f0d5c4f293b1e 100644 (file)
@@ -111,16 +111,19 @@ namespace MeshWorker
     class ResidualLocalBlocksToGlobalBlocks
     {
     public:
+
       /**
        * Copy the BlockInfo and the matrix pointers into local variables.
        */
       void
       initialize(const BlockInfo *block_info, AnyData &residuals);
+
       /**
        * Initialize the constraints.
        */
       void
-      initialize(const ConstraintMatrix &constraints);
+      initialize(const AffineConstraints<typename VectorType::value_type> &constraints);
+
       /**
        * Initialize the local data in the DoFInfo object used later for
        * assembling.
@@ -167,10 +170,11 @@ namespace MeshWorker
       SmartPointer<const BlockInfo,
                    ResidualLocalBlocksToGlobalBlocks<VectorType>>
         block_info;
+
       /**
        * A pointer to the object containing constraints.
        */
-      SmartPointer<const ConstraintMatrix,
+      SmartPointer<const AffineConstraints<typename VectorType::value_type>,
                    ResidualLocalBlocksToGlobalBlocks<VectorType>>
         constraints;
     };
@@ -225,7 +229,9 @@ namespace MeshWorker
        * Initialize the constraints.
        */
       void
-      initialize(const ConstraintMatrix &constraints);
+      initialize(
+        const AffineConstraints<typename MatrixType::value_type> &constraints);
+
       /**
        * Initialize the local data in the DoFInfo object used later for
        * assembling.
@@ -280,7 +286,8 @@ namespace MeshWorker
       /**
        * A pointer to the object containing constraints.
        */
-      SmartPointer<const ConstraintMatrix,
+
+      SmartPointer<const AffineConstraints<typename MatrixType::value_type>,
                    MatrixLocalBlocksToGlobalBlocks<MatrixType, number>>
         constraints;
 
@@ -534,7 +541,7 @@ namespace MeshWorker
     template <typename VectorType>
     inline void
     ResidualLocalBlocksToGlobalBlocks<VectorType>::initialize(
-      const ConstraintMatrix &c)
+      const AffineConstraints<typename VectorType::value_type> &c)
     {
       constraints = &c;
     }
@@ -632,7 +639,7 @@ namespace MeshWorker
     template <typename MatrixType, typename number>
     inline void
     MatrixLocalBlocksToGlobalBlocks<MatrixType, number>::initialize(
-      const ConstraintMatrix &c)
+      const AffineConstraints<typename MatrixType::value_type> &c)
     {
       constraints = &c;
     }
index b78e3ae1f84f19b1aba1e8008f6c1805de2d69e1..5521666d2c77285365e35b15072faa081ae17be3 100644 (file)
@@ -71,7 +71,8 @@ namespace MeshWorker
        * Initialize the constraints.
        */
       void
-      initialize(const ConstraintMatrix &constraints);
+      initialize(
+        const AffineConstraints<typename VectorType::value_type> &constraints);
 
       /**
        * @deprecated This function is of no effect. Only the block info
@@ -104,7 +105,7 @@ namespace MeshWorker
        * Assemble the local residuals into the global residuals.
        *
        * Values are added to the previous contents. If constraints are active,
-       * ConstraintMatrix::distribute_local_to_global() is used.
+       * AffineConstraints::distribute_local_to_global() is used.
        */
       template <class DOFINFO>
       void
@@ -126,7 +127,8 @@ namespace MeshWorker
       /**
        * A pointer to the object containing constraints.
        */
-      SmartPointer<const ConstraintMatrix, ResidualSimple<VectorType>>
+      SmartPointer<const AffineConstraints<typename VectorType::value_type>,
+                   ResidualSimple<VectorType>>
         constraints;
     };
 
@@ -142,8 +144,8 @@ namespace MeshWorker
      * such, this class can be used in a MeshWorker::loop() to assemble the
      * cell and face matrices into the global matrix.
      *
-     * If a ConstraintMatrix has been provided during initialization, this
-     * matrix will be used (ConstraintMatrix::distribute_local_to_global(), to
+     * If a AffineConstraints has been provided during initialization, this
+     * matrix will be used (AffineConstraints::distribute_local_to_global(), to
      * be precise) to enter the local matrix into the global sparse matrix.
      *
      * The assembler can handle two different types of local data. First, by
@@ -186,13 +188,14 @@ namespace MeshWorker
 
       /**
        * Initialize the constraints. After this function has been called with
-       * a valid ConstraintMatrix, the function
-       * ConstraintMatrix::distribute_local_to_global() will be used by
+       * a valid AffineConstraints object, the function
+       * AffineConstraints::distribute_local_to_global() will be used by
        * assemble() to distribute the cell and face matrices into a global
        * sparse matrix.
        */
       void
-      initialize(const ConstraintMatrix &constraints);
+      initialize(
+        const AffineConstraints<typename MatrixType::value_type> &constraints);
 
       /**
        * Initialize the local data in the DoFInfo object used later for
@@ -248,7 +251,8 @@ namespace MeshWorker
       /**
        * A pointer to the object containing constraints.
        */
-      SmartPointer<const ConstraintMatrix, MatrixSimple<MatrixType>>
+      SmartPointer<const AffineConstraints<typename MatrixType::value_type>,
+                   MatrixSimple<MatrixType>>
         constraints;
     };
 
@@ -465,13 +469,14 @@ namespace MeshWorker
 
       /**
        * Initialize the constraints. After this function has been called with
-       * a valid ConstraintMatrix, the function
-       * ConstraintMatrix::distribute_local_to_global() will be used by
+       * a valid AffineConstraints object, the function
+       * AffineConstraints::distribute_local_to_global() will be used by
        * assemble() to distribute the cell and face matrices into a global
        * sparse matrix.
        */
       void
-      initialize(const ConstraintMatrix &constraints);
+      initialize(
+        const AffineConstraints<typename VectorType::value_type> &constraints);
 
       /**
        * Initialize the local data in the DoFInfo object used later for
@@ -530,7 +535,8 @@ namespace MeshWorker
 
     template <typename VectorType>
     inline void
-    ResidualSimple<VectorType>::initialize(const ConstraintMatrix &c)
+    ResidualSimple<VectorType>::initialize(
+      const AffineConstraints<typename VectorType::value_type> &c)
     {
       constraints = &c;
     }
@@ -614,7 +620,8 @@ namespace MeshWorker
 
     template <typename MatrixType>
     inline void
-    MatrixSimple<MatrixType>::initialize(const ConstraintMatrix &c)
+    MatrixSimple<MatrixType>::initialize(
+      const AffineConstraints<typename MatrixType::value_type> &c)
     {
       constraints = &c;
     }
@@ -1232,7 +1239,8 @@ namespace MeshWorker
 
     template <typename MatrixType, typename VectorType>
     inline void
-    SystemSimple<MatrixType, VectorType>::initialize(const ConstraintMatrix &c)
+    SystemSimple<MatrixType, VectorType>::initialize(
+      const AffineConstraints<typename VectorType::value_type> &c)
     {
       ResidualSimple<VectorType>::initialize(c);
     }

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.