From f36664a58594e8b4647785331fe8a4ee923304d0 Mon Sep 17 00:00:00 2001 From: bangerth Date: Wed, 14 Nov 2012 03:29:04 +0000 Subject: [PATCH] Convert a few files. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_3@27536 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/files | 12 +- .../include/deal.II/meshworker/assembler.h | 176 +++++++++--------- 2 files changed, 94 insertions(+), 94 deletions(-) diff --git a/deal.II/files b/deal.II/files index db520d86fd..b5e1beeb43 100644 --- a/deal.II/files +++ b/deal.II/files @@ -473,15 +473,15 @@ include/deal.II/matrix_free/matrix_free.h include/deal.II/matrix_free/matrix_free.templates.h include/deal.II/matrix_free/shape_info.h include/deal.II/matrix_free/shape_info.templates.h -include/deal.II/meshworker/assembler.h -include/deal.II/meshworker/dof_info.h -include/deal.II/meshworker/dof_info.templates.h -include/deal.II/meshworker/functional.h +WOLFGANG include/deal.II/meshworker/assembler.h +WOLFGANG include/deal.II/meshworker/dof_info.h +WOLFGANG include/deal.II/meshworker/dof_info.templates.h +WOLFGANG include/deal.II/meshworker/functional.h include/deal.II/meshworker/integration_info.h include/deal.II/meshworker/integration_info.templates.h include/deal.II/meshworker/local_results.h -include/deal.II/meshworker/loop.h -include/deal.II/meshworker/output.h +WOLFGANG include/deal.II/meshworker/loop.h +WOLFGANG include/deal.II/meshworker/output.h include/deal.II/meshworker/simple.h include/deal.II/meshworker/vector_selector.h include/deal.II/meshworker/vector_selector.templates.h diff --git a/deal.II/include/deal.II/meshworker/assembler.h b/deal.II/include/deal.II/meshworker/assembler.h index f143d4ea2f..424d09093e 100644 --- a/deal.II/include/deal.II/meshworker/assembler.h +++ b/deal.II/include/deal.II/meshworker/assembler.h @@ -154,7 +154,7 @@ namespace MeshWorker */ void assemble(VECTOR& global, const BlockVector& local, - const std::vector& dof); + const std::vector& dof); /** * The global matrices, @@ -270,10 +270,10 @@ namespace MeshWorker void assemble( MatrixBlock& global, const FullMatrix& local, - unsigned int block_row, - unsigned int block_col, - const std::vector& dof1, - const std::vector& dof2); + const unsigned int block_row, + const unsigned int block_col, + const std::vector& dof1, + const std::vector& dof2); /** * The global matrices, @@ -428,12 +428,12 @@ namespace MeshWorker void assemble( MATRIX& global, const FullMatrix& local, - unsigned int block_row, - unsigned int block_col, - const std::vector& dof1, - const std::vector& dof2, - unsigned int level1, - unsigned int level2, + const unsigned int block_row, + const unsigned int block_col, + const std::vector& dof1, + const std::vector& dof2, + const unsigned int level1, + const unsigned int level2, bool transpose = false); /** @@ -443,12 +443,12 @@ namespace MeshWorker void assemble_fluxes( MATRIX& global, const FullMatrix& local, - unsigned int block_row, - unsigned int block_col, - const std::vector& dof1, - const std::vector& dof2, - unsigned int level1, - unsigned int level2); + const unsigned int block_row, + const unsigned int block_col, + const std::vector& dof1, + const std::vector& dof2, + const unsigned int level1, + const unsigned int level2); /** * Assemble a single local @@ -457,12 +457,12 @@ namespace MeshWorker void assemble_up( MATRIX& global, const FullMatrix& local, - unsigned int block_row, - unsigned int block_col, - const std::vector& dof1, - const std::vector& dof2, - unsigned int level1, - unsigned int level2); + const unsigned int block_row, + const unsigned int block_col, + const std::vector& dof1, + const std::vector& dof2, + const unsigned int level1, + const unsigned int level2); /** * Assemble a single local @@ -471,12 +471,12 @@ namespace MeshWorker void assemble_down( MATRIX& global, const FullMatrix& local, - unsigned int block_row, - unsigned int block_col, - const std::vector& dof1, - const std::vector& dof2, - unsigned int level1, - unsigned int level2); + const unsigned int block_row, + const unsigned int block_col, + const std::vector& dof1, + const std::vector& dof2, + const unsigned int level1, + const unsigned int level2); /** * Assemble a single local @@ -485,12 +485,12 @@ namespace MeshWorker void assemble_in( MATRIX& global, const FullMatrix& local, - unsigned int block_row, - unsigned int block_col, - const std::vector& dof1, - const std::vector& dof2, - unsigned int level1, - unsigned int level2); + const unsigned int block_row, + const unsigned int block_col, + const std::vector& dof1, + const std::vector& dof2, + const unsigned int level1, + const unsigned int level2); /** * Assemble a single local @@ -499,12 +499,12 @@ namespace MeshWorker void assemble_out( MATRIX& global, const FullMatrix& local, - unsigned int block_row, - unsigned int block_col, - const std::vector& dof1, - const std::vector& dof2, - unsigned int level1, - unsigned int level2); + const unsigned int block_row, + const unsigned int block_col, + const std::vector& dof1, + const std::vector& dof2, + const unsigned int level1, + const unsigned int level2); /** * The level matrices, @@ -599,7 +599,7 @@ namespace MeshWorker ResidualLocalBlocksToGlobalBlocks::assemble( VECTOR& global, const BlockVector& local, - const std::vector& dof) + const std::vector& dof) { if(constraints == 0) { @@ -699,10 +699,10 @@ namespace MeshWorker MatrixLocalBlocksToGlobalBlocks::assemble( MatrixBlock& global, const FullMatrix& local, - unsigned int block_row, - unsigned int block_col, - const std::vector& dof1, - const std::vector& dof2) + const unsigned int block_row, + const unsigned int block_col, + const std::vector& dof1, + const std::vector& dof2) { if(constraints == 0) { @@ -727,11 +727,11 @@ namespace MeshWorker else { const BlockIndices &bi = this->block_info->local(); - std::vector sliced_row_indices (bi.block_size(block_row)); + std::vector sliced_row_indices (bi.block_size(block_row)); for(unsigned int i=0; i sliced_col_indices (bi.block_size(block_col)); + std::vector sliced_col_indices (bi.block_size(block_col)); for(unsigned int i=0; iblock(i).row; - const unsigned int col = matrices->block(i).column; + const types::global_dof_index row = matrices->block(i).row; + const types::global_dof_index col = matrices->block(i).column; assemble(matrices->block(i), info.matrix(i,false).matrix, row, col, info.indices, info.indices); } @@ -770,8 +770,8 @@ namespace MeshWorker { // Row and column index of // the block we are dealing with - const unsigned int row = matrices->block(i).row; - const unsigned int col = matrices->block(i).column; + const types::global_dof_index row = matrices->block(i).row; + const types::global_dof_index col = matrices->block(i).column; assemble(matrices->block(i), info1.matrix(i,false).matrix, row, col, info1.indices, info1.indices); assemble(matrices->block(i), info1.matrix(i,true).matrix, row, col, info1.indices, info2.indices); @@ -852,12 +852,12 @@ namespace MeshWorker MGMatrixLocalBlocksToGlobalBlocks::assemble( MATRIX& global, const FullMatrix& local, - unsigned int block_row, - unsigned int block_col, - const std::vector& dof1, - const std::vector& dof2, - unsigned int level1, - unsigned int level2, + const unsigned int block_row, + const unsigned int block_col, + const std::vector& dof1, + const std::vector& dof2, + const unsigned int level1, + const unsigned int level2, bool transpose) { for (unsigned int j=0;j::assemble_fluxes( MATRIX& global, const FullMatrix& local, - unsigned int block_row, - unsigned int block_col, - const std::vector& dof1, - const std::vector& dof2, - unsigned int level1, - unsigned int level2) + const unsigned int block_row, + const unsigned int block_col, + const std::vector& dof1, + const std::vector& dof2, + const unsigned int level1, + const unsigned int level2) { for (unsigned int j=0;j::assemble_up( MATRIX& global, const FullMatrix& local, - unsigned int block_row, - unsigned int block_col, - const std::vector& dof1, - const std::vector& dof2, - unsigned int level1, - unsigned int level2) + const unsigned int block_row, + const unsigned int block_col, + const std::vector& dof1, + const std::vector& dof2, + const unsigned int level1, + const unsigned int level2) { for (unsigned int j=0;j::assemble_down( MATRIX& global, const FullMatrix& local, - unsigned int block_row, - unsigned int block_col, - const std::vector& dof1, - const std::vector& dof2, - unsigned int level1, - unsigned int level2) + const unsigned int block_row, + const unsigned int block_col, + const std::vector& dof1, + const std::vector& dof2, + const unsigned int level1, + const unsigned int level2) { for (unsigned int j=0;j::assemble_in( MATRIX& global, const FullMatrix& local, - unsigned int block_row, - unsigned int block_col, - const std::vector& dof1, - const std::vector& dof2, - unsigned int level1, - unsigned int level2) + const unsigned int block_row, + const unsigned int block_col, + const std::vector& dof1, + const std::vector& dof2, + const unsigned int level1, + const unsigned int level2) { // AssertDimension(local.n(), dof1.size()); // AssertDimension(local.m(), dof2.size()); @@ -1155,12 +1155,12 @@ namespace MeshWorker MGMatrixLocalBlocksToGlobalBlocks::assemble_out( MATRIX& global, const FullMatrix& local, - unsigned int block_row, - unsigned int block_col, - const std::vector& dof1, - const std::vector& dof2, - unsigned int level1, - unsigned int level2) + const unsigned int block_row, + const unsigned int block_col, + const std::vector& dof1, + const std::vector& dof2, + const unsigned int level1, + const unsigned int level2) { // AssertDimension(local.n(), dof1.size()); // AssertDimension(local.m(), dof2.size()); -- 2.39.5