From: Matthias Maier Date: Sat, 26 May 2018 02:24:38 +0000 (-0500) Subject: RCM: Update mesh_worker X-Git-Tag: v9.1.0-rc1~1067^2~18 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=772a20710a6381d3dfe3c93d73329d822429488b;p=dealii.git RCM: Update mesh_worker --- diff --git a/include/deal.II/meshworker/assembler.h b/include/deal.II/meshworker/assembler.h index 33c8b22406..18cff981fb 100644 --- a/include/deal.II/meshworker/assembler.h +++ b/include/deal.II/meshworker/assembler.h @@ -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 &constraints); + /** * Initialize the local data in the DoFInfo object used later for * assembling. @@ -167,10 +170,11 @@ namespace MeshWorker SmartPointer> block_info; + /** * A pointer to the object containing constraints. */ - SmartPointer, ResidualLocalBlocksToGlobalBlocks> constraints; }; @@ -225,7 +229,9 @@ namespace MeshWorker * Initialize the constraints. */ void - initialize(const ConstraintMatrix &constraints); + initialize( + const AffineConstraints &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, MatrixLocalBlocksToGlobalBlocks> constraints; @@ -534,7 +541,7 @@ namespace MeshWorker template inline void ResidualLocalBlocksToGlobalBlocks::initialize( - const ConstraintMatrix &c) + const AffineConstraints &c) { constraints = &c; } @@ -632,7 +639,7 @@ namespace MeshWorker template inline void MatrixLocalBlocksToGlobalBlocks::initialize( - const ConstraintMatrix &c) + const AffineConstraints &c) { constraints = &c; } diff --git a/include/deal.II/meshworker/simple.h b/include/deal.II/meshworker/simple.h index b78e3ae1f8..5521666d2c 100644 --- a/include/deal.II/meshworker/simple.h +++ b/include/deal.II/meshworker/simple.h @@ -71,7 +71,8 @@ namespace MeshWorker * Initialize the constraints. */ void - initialize(const ConstraintMatrix &constraints); + initialize( + const AffineConstraints &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 void @@ -126,7 +127,8 @@ namespace MeshWorker /** * A pointer to the object containing constraints. */ - SmartPointer> + SmartPointer, + ResidualSimple> 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 &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> + SmartPointer, + MatrixSimple> 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 &constraints); /** * Initialize the local data in the DoFInfo object used later for @@ -530,7 +535,8 @@ namespace MeshWorker template inline void - ResidualSimple::initialize(const ConstraintMatrix &c) + ResidualSimple::initialize( + const AffineConstraints &c) { constraints = &c; } @@ -614,7 +620,8 @@ namespace MeshWorker template inline void - MatrixSimple::initialize(const ConstraintMatrix &c) + MatrixSimple::initialize( + const AffineConstraints &c) { constraints = &c; } @@ -1232,7 +1239,8 @@ namespace MeshWorker template inline void - SystemSimple::initialize(const ConstraintMatrix &c) + SystemSimple::initialize( + const AffineConstraints &c) { ResidualSimple::initialize(c); }