]> https://gitweb.dealii.org/ - dealii.git/log
dealii.git
7 years agoMerge pull request #4902 from davydden/fix_zeor_const_functions
Bruno Turcksin [Mon, 21 Aug 2017 00:33:01 +0000 (20:33 -0400)]
Merge pull request #4902 from davydden/fix_zeor_const_functions

move ConstantFunction and ZeroFunction to Functions:: namespace

7 years agoMerge pull request #4915 from drwells/fix-gsl-compilation
Daniel Arndt [Sun, 20 Aug 2017 20:54:56 +0000 (22:54 +0200)]
Merge pull request #4915 from drwells/fix-gsl-compilation

Fix compilation with GSL.

7 years agoremove redundant destructors 4902/head
Denis Davydov [Sun, 20 Aug 2017 20:28:25 +0000 (22:28 +0200)]
remove redundant destructors

7 years agoMerge pull request #4911 from drwells/remove-have-sys-types
Wolfgang Bangerth [Sun, 20 Aug 2017 20:24:48 +0000 (14:24 -0600)]
Merge pull request #4911 from drwells/remove-have-sys-types

Remove the check for sys/types.h.

7 years agoFix compilation with GSL. 4915/head
David Wells [Sun, 20 Aug 2017 19:40:26 +0000 (15:40 -0400)]
Fix compilation with GSL.

As of 2d311f0f48 the conversion constructor from Tensor to SymmetricTensor is
explicit.

7 years agoMerge pull request #4905 from drwells/timer-mpi-fixes
David Wells [Sun, 20 Aug 2017 19:35:43 +0000 (15:35 -0400)]
Merge pull request #4905 from drwells/timer-mpi-fixes

Timer mpi fixes

7 years agoMerge pull request #4913 from masterleinad/explicit_tensor
Wolfgang Bangerth [Sun, 20 Aug 2017 19:17:40 +0000 (13:17 -0600)]
Merge pull request #4913 from masterleinad/explicit_tensor

Mark conversion constructors of SymmetricTensor and Tensor as 'explicit'

7 years agoGive the MPI::MinMaxAvg members of Timer more descriptive names. 4905/head
David Wells [Thu, 17 Aug 2017 23:31:09 +0000 (19:31 -0400)]
Give the MPI::MinMaxAvg members of Timer more descriptive names.

7 years agoChangelog entry 4913/head
Daniel Arndt [Sun, 20 Aug 2017 15:29:12 +0000 (17:29 +0200)]
Changelog entry

7 years agoImprove error message for odd rank SymmetricTensor
Daniel Arndt [Sun, 20 Aug 2017 15:28:30 +0000 (17:28 +0200)]
Improve error message for odd rank SymmetricTensor

7 years agoMark conversion constructors of SymmetricTensor and Tensor as 'explicit'
Daniel Arndt [Sat, 19 Aug 2017 00:37:30 +0000 (02:37 +0200)]
Mark conversion constructors of SymmetricTensor and Tensor as 'explicit'

7 years agoMerge pull request #4912 from masterleinad/fix_include_adolc
Jean-Paul Pelteret [Sun, 20 Aug 2017 15:22:14 +0000 (17:22 +0200)]
Merge pull request #4912 from masterleinad/fix_include_adolc

Fix include directories for ADOLC

7 years agoMerge pull request #4676 from davydden/mg_block_transfer_simple
Martin Kronbichler [Sun, 20 Aug 2017 13:07:48 +0000 (15:07 +0200)]
Merge pull request #4676 from davydden/mg_block_transfer_simple

MGTransferBlockMatrixFree for LA::d::BlockVector (version 2)

7 years agoMerge pull request #4909 from masterleinad/improve_fe_collection
Martin Kronbichler [Sun, 20 Aug 2017 12:54:24 +0000 (14:54 +0200)]
Merge pull request #4909 from masterleinad/improve_fe_collection

Clean up hp::FECollection

7 years agoMerge pull request #4910 from Rombur/fix_cuda
Martin Kronbichler [Sun, 20 Aug 2017 12:52:46 +0000 (14:52 +0200)]
Merge pull request #4910 from Rombur/fix_cuda

Fix a bug in CUDA matix-free when there is no constraint

7 years agoFix include directories for ADOLC 4912/head
Daniel Arndt [Sun, 20 Aug 2017 12:05:13 +0000 (14:05 +0200)]
Fix include directories for ADOLC

7 years agoAdd a changelog entry summarizing the removed #defines. 4911/head
David Wells [Sun, 20 Aug 2017 02:18:41 +0000 (22:18 -0400)]
Add a changelog entry summarizing the removed #defines.

See also:

ac33ee15e72214783a6b3613c0e6cbbdf591cd4d
03fbd44b85d7a4671fa3acf27fb0e476e351eec5
846baab1096fcbb959e9c643718c3bacfa300738
e685824578583452a60df5633c2b3cef24a6a23f
c855d00809a6e2b4510f6021c53d526303674a6e
df68710ef257329aabd0c7eab57120a790a1384e
e5818a0071a5b1764b36293dff7be090030fc554

7 years agoRemove the check for sys/types.h.
David Wells [Sat, 19 Aug 2017 23:30:46 +0000 (19:30 -0400)]
Remove the check for sys/types.h.

This was added in 7b34010c81d but apparently never used.

7 years agoMerge pull request #4862 from masterleinad/nothrow_exception
David Wells [Sat, 19 Aug 2017 23:04:08 +0000 (19:04 -0400)]
Merge pull request #4862 from masterleinad/nothrow_exception

Make noexcept for AssertNoThrow more explicit

7 years agoFix a bug in CUDA matix-free when there is no constraint 4910/head
Bruno Turcksin [Sat, 19 Aug 2017 22:45:12 +0000 (18:45 -0400)]
Fix a bug in CUDA matix-free when there is no constraint

7 years agoAdd changelog entry 4909/head
Daniel Arndt [Sat, 19 Aug 2017 22:18:08 +0000 (00:18 +0200)]
Add changelog entry

7 years agoImprove hp::FECollection
Daniel Arndt [Sat, 19 Aug 2017 21:41:01 +0000 (23:41 +0200)]
Improve hp::FECollection

7 years agoMerge pull request #4906 from drwells/actually-remove-explicit-constructor-bug
Daniel Arndt [Sat, 19 Aug 2017 17:31:22 +0000 (19:31 +0200)]
Merge pull request #4906 from drwells/actually-remove-explicit-constructor-bug

Actually remove DEAL_II_EXPLICIT_CONSTRUCTOR_BUG.

7 years agochange inheritance structure of ZeroFunction and ConstantFunction
Denis Davydov [Sat, 19 Aug 2017 14:22:32 +0000 (16:22 +0200)]
change inheritance structure of ZeroFunction and ConstantFunction

7 years agoreplace occurances of ZeroFunction and ConstantFunction in all .cc
Denis Davydov [Sat, 19 Aug 2017 13:55:59 +0000 (15:55 +0200)]
replace occurances of ZeroFunction and ConstantFunction in all .cc

7 years agoMerge pull request #4907 from drwells/remove-wreturn-type-const-qualifier-bug
Timo Heister [Sat, 19 Aug 2017 12:23:29 +0000 (06:23 -0600)]
Merge pull request #4907 from drwells/remove-wreturn-type-const-qualifier-bug

Remove DEAL_II_WRETURN_TYPE_CONST_QUALIFIER_BUG.

7 years agofix typos
Denis Davydov [Fri, 18 Aug 2017 13:56:07 +0000 (15:56 +0200)]
fix typos

7 years agomove ConstantFunction and ZeroFunction to Functions:: namespace
Denis Davydov [Fri, 18 Aug 2017 13:44:35 +0000 (15:44 +0200)]
move ConstantFunction and ZeroFunction to Functions:: namespace

7 years agoRemove DEAL_II_WRETURN_TYPE_CONST_QUALIFIER_BUG. 4907/head
David Wells [Sat, 19 Aug 2017 03:43:24 +0000 (23:43 -0400)]
Remove DEAL_II_WRETURN_TYPE_CONST_QUALIFIER_BUG.

This was a workaround for a bug in gcc 4.3 that has long since been fixed.

7 years agoActually remove DEAL_II_EXPLICIT_CONSTRUCTOR_BUG. 4906/head
David Wells [Sat, 19 Aug 2017 02:51:03 +0000 (22:51 -0400)]
Actually remove DEAL_II_EXPLICIT_CONSTRUCTOR_BUG.

Follow-up to ac33ee15e72.

7 years agoMerge pull request #4904 from masterleinad/fix_mpi_tests
Matthias Maier [Sat, 19 Aug 2017 02:00:44 +0000 (21:00 -0500)]
Merge pull request #4904 from masterleinad/fix_mpi_tests

Fix failing MPI tests

7 years agoFix failing MPI tests 4904/head
Daniel Arndt [Fri, 18 Aug 2017 17:13:30 +0000 (19:13 +0200)]
Fix failing MPI tests

7 years agoWrite an '#error' message with a string.
David Wells [Thu, 17 Aug 2017 23:14:13 +0000 (19:14 -0400)]
Write an '#error' message with a string.

This looks nicer in my editor.

7 years agoAvoid mentioning a deprecated function in the docs.
David Wells [Thu, 17 Aug 2017 23:12:58 +0000 (19:12 -0400)]
Avoid mentioning a deprecated function in the docs.

7 years agoClean things up with a delegating constructor call.
David Wells [Thu, 17 Aug 2017 23:12:37 +0000 (19:12 -0400)]
Clean things up with a delegating constructor call.

7 years agoEnable MPI timer features when MPI is not present.
David Wells [Thu, 17 Aug 2017 23:11:53 +0000 (19:11 -0400)]
Enable MPI timer features when MPI is not present.

All of the relevant functions have redefinitions in the case that MPI is not
available.

7 years agoMerge pull request #4903 from masterleinad/fix_number_type
Wolfgang Bangerth [Fri, 18 Aug 2017 20:12:11 +0000 (14:12 -0600)]
Merge pull request #4903 from masterleinad/fix_number_type

Fix Assert with the correct number type

7 years agoMore vertex_dof_offset fixes 4903/head
Daniel Arndt [Fri, 18 Aug 2017 18:07:42 +0000 (20:07 +0200)]
More vertex_dof_offset fixes

7 years agoFix Assert with the correct number type
Daniel Arndt [Fri, 18 Aug 2017 16:34:06 +0000 (18:34 +0200)]
Fix Assert with the correct number type

7 years agoMerge pull request #4900 from davydden/mf_operator_fix
Martin Kronbichler [Fri, 18 Aug 2017 14:46:43 +0000 (16:46 +0200)]
Merge pull request #4900 from davydden/mf_operator_fix

fix a minor bug in MatrixFreeOperators::Base::vmult_interface_down()

7 years agoMerge pull request #4901 from davydden/la_parallel_vector/ghost_assertion2
Martin Kronbichler [Fri, 18 Aug 2017 14:43:38 +0000 (16:43 +0200)]
Merge pull request #4901 from davydden/la_parallel_vector/ghost_assertion2

make an Assert in LA::distributed::Vector::compress_finish() less rigid

7 years agoadd MGTransferBlockMatrixFree 4676/head
Denis Davydov [Fri, 4 Aug 2017 08:27:39 +0000 (10:27 +0200)]
add MGTransferBlockMatrixFree

7 years agomake an Assert in LA::distributed::Vector::compress_finish() less rigid 4901/head
Denis Davydov [Fri, 18 Aug 2017 11:42:11 +0000 (13:42 +0200)]
make an Assert in LA::distributed::Vector::compress_finish() less rigid

7 years agofix a minor bug in MatrixFreeOperators::Base::vmult_interface_down() 4900/head
Denis Davydov [Tue, 15 Aug 2017 15:05:39 +0000 (17:05 +0200)]
fix a minor bug in MatrixFreeOperators::Base::vmult_interface_down()

7 years agoMerge pull request #4892 from drwells/rename-timer-variables
Martin Kronbichler [Fri, 18 Aug 2017 10:04:16 +0000 (12:04 +0200)]
Merge pull request #4892 from drwells/rename-timer-variables

Rename timer variables

7 years agoMerge pull request #4897 from Rombur/tensor
Denis Davydov [Fri, 18 Aug 2017 05:46:40 +0000 (07:46 +0200)]
Merge pull request #4897 from Rombur/tensor

Fix a bug when using Tensor with CUDA.

7 years agoMerge pull request #4896 from Rombur/dim3
Wolfgang Bangerth [Fri, 18 Aug 2017 02:57:55 +0000 (20:57 -0600)]
Merge pull request #4896 from Rombur/dim3

Do not use dim3 for non-CUDA code

7 years agoFix a bug when using Tensor with CUDA. 4897/head
Bruno Turcksin [Fri, 18 Aug 2017 02:44:49 +0000 (22:44 -0400)]
Fix a bug when using Tensor with CUDA.

7 years agoMerge pull request #4895 from Rombur/underscores
Timo Heister [Fri, 18 Aug 2017 02:37:22 +0000 (20:37 -0600)]
Merge pull request #4895 from Rombur/underscores

Remove double underscores from include guards

7 years agoTreat the nothrow exception handling special 4862/head
Daniel Arndt [Sun, 13 Aug 2017 22:15:48 +0000 (00:15 +0200)]
Treat the nothrow exception handling special

7 years agoDo not use dim3 for non-CUDA code 4896/head
Bruno Turcksin [Thu, 17 Aug 2017 21:23:52 +0000 (17:23 -0400)]
Do not use dim3 for non-CUDA code

dim3 is an array of size 3 defined by CUDA. Remove non CUDA-related dim3
because it creates an error due to conflicting declaration.

7 years agoRemove double underscores from include guards 4895/head
Bruno Turcksin [Thu, 17 Aug 2017 21:13:48 +0000 (17:13 -0400)]
Remove double underscores from include guards

7 years agoMerge pull request #4870 from davydden/consecutive_control
Wolfgang Bangerth [Thu, 17 Aug 2017 20:17:18 +0000 (14:17 -0600)]
Merge pull request #4870 from davydden/consecutive_control

minor fix of ConsecutiveControl

7 years agoMerge pull request #4891 from tjhei/fix_distr_grid_tools_serialize
Matthias Maier [Thu, 17 Aug 2017 17:25:41 +0000 (12:25 -0500)]
Merge pull request #4891 from tjhei/fix_distr_grid_tools_serialize

fix distributed GridTools::exchange_cell_data_to_ghost serialization …

7 years agofix distributed GridTools::exchange_cell_data_to_ghost serialization call 4891/head
Timo Heister [Thu, 17 Aug 2017 17:22:25 +0000 (13:22 -0400)]
fix distributed GridTools::exchange_cell_data_to_ghost serialization call

7 years agoMerge pull request #4889 from masterleinad/fix_integrator_tests_fix
Wolfgang Bangerth [Thu, 17 Aug 2017 16:47:20 +0000 (10:47 -0600)]
Merge pull request #4889 from masterleinad/fix_integrator_tests_fix

Follow up to #4888 fix regex substitution error

7 years agoRename some private Timer variables. 4892/head
David Wells [Thu, 17 Aug 2017 16:46:11 +0000 (12:46 -0400)]
Rename some private Timer variables.

The new names are more descriptive, e.g., the CPU time variables did not mention
that they measured CPU time.

7 years agoImprove some of the Timer documentation.
David Wells [Thu, 17 Aug 2017 16:44:17 +0000 (12:44 -0400)]
Improve some of the Timer documentation.

This commit fixes a few small things:
1. The example at the top of the Timer class used a deprecated function; this
   example now uses the replacement function.
2. The MPI communicator documentation was written for a different variable.
3. A few sentences have been rewritten to improve clarity.

7 years agoFollow up to #4888 fix regex substitution error 4889/head
Daniel Arndt [Thu, 17 Aug 2017 16:43:31 +0000 (18:43 +0200)]
Follow up to #4888 fix regex substitution error

7 years agoMerge pull request #4888 from masterleinad/fix_integrator_tests
Wolfgang Bangerth [Thu, 17 Aug 2017 16:37:18 +0000 (10:37 -0600)]
Merge pull request #4888 from masterleinad/fix_integrator_tests

Fix test output for integrators tests

7 years agoFix test output for integrators tests 4888/head
Daniel Arndt [Thu, 17 Aug 2017 16:25:47 +0000 (18:25 +0200)]
Fix test output for integrators tests

7 years agoMerge pull request #4887 from kronbichler/fix_tensor_product_matrix_test_02
Wolfgang Bangerth [Thu, 17 Aug 2017 15:30:15 +0000 (09:30 -0600)]
Merge pull request #4887 from kronbichler/fix_tensor_product_matrix_test_02

Fix tensor product matrix test case in float mode.

7 years agoFix tensor product matrix test case in float mode. 4887/head
Martin Kronbichler [Thu, 17 Aug 2017 15:20:26 +0000 (17:20 +0200)]
Fix tensor product matrix test case in float mode.

7 years agoMerge pull request #4884 from drwells/remove-timer-child-measurement
Wolfgang Bangerth [Thu, 17 Aug 2017 13:22:50 +0000 (07:22 -0600)]
Merge pull request #4884 from drwells/remove-timer-child-measurement

Remove unused child (process) resource usage checks.

7 years agoMerge pull request #4885 from tamiko/lalala
Wolfgang Bangerth [Thu, 17 Aug 2017 13:11:51 +0000 (07:11 -0600)]
Merge pull request #4885 from tamiko/lalala

CMake: Bugfix: Use correct cmake variable in external projects

7 years agoAdd a test 4885/head
Matthias Maier [Thu, 17 Aug 2017 05:25:37 +0000 (00:25 -0500)]
Add a test

7 years agoCMake: Bugfix: Use correct cmake variable in external projects
Matthias Maier [Thu, 17 Aug 2017 05:15:00 +0000 (00:15 -0500)]
CMake: Bugfix: Use correct cmake variable in external projects

In macros for external projects we have to use
  DEAL_II_USER_DEFINITIONS
instead of
  DEAL_II_DEFINITIONS

7 years agoRemove unused child (process) resource usage checks. 4884/head
David Wells [Thu, 17 Aug 2017 04:56:49 +0000 (00:56 -0400)]
Remove unused child (process) resource usage checks.

The option RUSAGE_CHILDREN (see man 2 getrusage) returns resource usage
statistics for terminated children of the current process. Since we don't use
this type of multiprocessing these values are always zero and we never needed to
measure them.

Reverts 5592e89cfa8.

7 years agoMerge pull request #4874 from tamiko/fix_cuda_configuration
Bruno Turcksin [Thu, 17 Aug 2017 02:36:42 +0000 (22:36 -0400)]
Merge pull request #4874 from tamiko/fix_cuda_configuration

CMake: Second round of CUDA fixes

7 years agoMerge pull request #4882 from masterleinad/fix_boost_1_64_serialize_array
David Wells [Thu, 17 Aug 2017 02:20:48 +0000 (22:20 -0400)]
Merge pull request #4882 from masterleinad/fix_boost_1_64_serialize_array

Include correct headers for serialization of std::array

7 years agoInclude correct headers for serialization of std::array 4882/head
Daniel Arndt [Wed, 16 Aug 2017 22:38:54 +0000 (00:38 +0200)]
Include correct headers for serialization of std::array

7 years agoMerge pull request #4877 from tjhei/cmake_support_intel
Matthias Maier [Wed, 16 Aug 2017 20:07:14 +0000 (15:07 -0500)]
Merge pull request #4877 from tjhei/cmake_support_intel

cmake: fix intel compiler detection

7 years agoMerge pull request #4876 from bangerth/doc-update
Timo Heister [Wed, 16 Aug 2017 20:05:45 +0000 (14:05 -0600)]
Merge pull request #4876 from bangerth/doc-update

Fix formula in step-33.

7 years agocmake: fix intel compiler detection 4877/head
Timo Heister [Wed, 16 Aug 2017 19:58:51 +0000 (15:58 -0400)]
cmake: fix intel compiler detection

7 years agoMerge pull request #4873 from bangerth/branch-7
Timo Heister [Wed, 16 Aug 2017 16:53:21 +0000 (10:53 -0600)]
Merge pull request #4873 from bangerth/branch-7

Exchange active_fe_index information for p::d::Triangulation.

7 years agoFix formula in step-33. 4876/head
Wolfgang Bangerth [Wed, 16 Aug 2017 15:47:47 +0000 (09:47 -0600)]
Fix formula in step-33.

7 years agoMerge pull request #4875 from tamiko/add_lapack_guards
Wolfgang Bangerth [Wed, 16 Aug 2017 15:41:19 +0000 (09:41 -0600)]
Merge pull request #4875 from tamiko/add_lapack_guards

Tests: Guard a couple of tests with with_lapack=true

7 years agoTests: Guard a couple of tests with with_lapack=true 4875/head
Matthias Maier [Wed, 16 Aug 2017 15:35:16 +0000 (10:35 -0500)]
Tests: Guard a couple of tests with with_lapack=true

7 years agoExchange active_fe_index information for p::d::Triangulation. 4873/head
Wolfgang Bangerth [Sun, 13 Aug 2017 20:54:49 +0000 (14:54 -0600)]
Exchange active_fe_index information for p::d::Triangulation.

7 years agoCMake: mark a variable as advanced 4874/head
Matthias Maier [Wed, 16 Aug 2017 14:30:37 +0000 (09:30 -0500)]
CMake: mark a variable as advanced

7 years agoadd a changelog entry
Matthias Maier [Wed, 16 Aug 2017 14:25:55 +0000 (09:25 -0500)]
add a changelog entry

7 years agoCMake: Make CUDA detection more robust
Matthias Maier [Wed, 16 Aug 2017 14:23:00 +0000 (16:23 +0200)]
CMake: Make CUDA detection more robust

7 years agoCMake: Disable CUDA for incompatible C++ standards
Matthias Maier [Wed, 16 Aug 2017 14:13:55 +0000 (16:13 +0200)]
CMake: Disable CUDA for incompatible C++ standards

7 years agoMerge pull request #4872 from bangerth/branch-6
Timo Heister [Wed, 16 Aug 2017 14:21:16 +0000 (08:21 -0600)]
Merge pull request #4872 from bangerth/branch-6

Use optional exchange of ghost data in DoFHandler::distribute_dofs()

7 years agominor fix of ConsecutiveControl 4870/head
Denis Davydov [Wed, 16 Aug 2017 11:16:03 +0000 (13:16 +0200)]
minor fix of ConsecutiveControl

7 years agoAllow for an optional exchange of ghost data. 4872/head
Wolfgang Bangerth [Tue, 15 Aug 2017 15:37:20 +0000 (09:37 -0600)]
Allow for an optional exchange of ghost data.

Specifically, avoid it if possible.

7 years agoMerge pull request #4855 from bangerth/fix-5
Timo Heister [Wed, 16 Aug 2017 13:06:57 +0000 (07:06 -0600)]
Merge pull request #4855 from bangerth/fix-5

Express the ghost exchange of DoF indices using GridTools::exchange_cell_data_to_ghosts().

7 years agoMerge pull request #4869 from bangerth/doc-update
Timo Heister [Wed, 16 Aug 2017 13:03:56 +0000 (07:03 -0600)]
Merge pull request #4869 from bangerth/doc-update

Update documentation.

7 years agoMerge pull request #4866 from tjhei/fix_epetra_to_indexset
Daniel Arndt [Wed, 16 Aug 2017 12:37:43 +0000 (14:37 +0200)]
Merge pull request #4866 from tjhei/fix_epetra_to_indexset

Fix incorrect size in overlapping EPetra_Map to IndexSet

7 years agoMerge pull request #4846 from tamiko/fix_cuda_configuration
Bruno Turcksin [Wed, 16 Aug 2017 12:14:53 +0000 (08:14 -0400)]
Merge pull request #4846 from tamiko/fix_cuda_configuration

CMake: Refactor and fix CUDA configuration

7 years agoMerge pull request #4868 from drwells/fix-timer-1
Denis Davydov [Wed, 16 Aug 2017 07:13:16 +0000 (09:13 +0200)]
Merge pull request #4868 from drwells/fix-timer-1

Fix some #ifdef logic in the Timer class.

7 years agoUpdate documentation. 4869/head
Wolfgang Bangerth [Wed, 16 Aug 2017 03:20:35 +0000 (21:20 -0600)]
Update documentation.

7 years agoMerge pull request #4861 from bangerth/branch-3
Timo Heister [Wed, 16 Aug 2017 03:17:51 +0000 (21:17 -0600)]
Merge pull request #4861 from bangerth/branch-3

Update documentation of p::s::Triangulation.

7 years agoAdd a test. 4861/head
Wolfgang Bangerth [Tue, 15 Aug 2017 17:20:38 +0000 (11:20 -0600)]
Add a test.

7 years agoUpdate documentation in a couple of places.
Wolfgang Bangerth [Tue, 15 Aug 2017 17:19:31 +0000 (11:19 -0600)]
Update documentation in a couple of places.

7 years agoFix incorrect size in overlapping EPetra_Map to IndexSet 4866/head
Timo Heister [Tue, 15 Aug 2017 20:23:15 +0000 (14:23 -0600)]
Fix incorrect size in overlapping EPetra_Map to IndexSet

7 years agoFix some #ifdef logic in the Timer class. 4868/head
David Wells [Wed, 16 Aug 2017 02:18:12 +0000 (22:18 -0400)]
Fix some #ifdef logic in the Timer class.

This fixes a bug due to rewritting an else statement where the 'else' was in an
'ifdef' and the body of the else statement (one line) was outside of it. This
caused, after a rewrite, the body of the former else statement to be executed
twice.

Before 9ef67983fd the end of this function was:

#ifdef DEAL_II_WITH_MPI
      if (sync_wall_time && Utilities::MPI::job_supports_mpi())
        {
          this->mpi_data
            = Utilities::MPI::min_max_avg (last_lap_time, mpi_communicator);
          last_lap_time = this->mpi_data.max;
          cumulative_wall_time += last_lap_time;
        }
      else
#endif
        cumulative_wall_time += last_lap_time;
    }
  return cumulative_time;

where the 'else' statement was run unconditionally if MPI was not present. The
previous (prior to this patch) version was:

#ifdef DEAL_II_WITH_MPI
      this->mpi_data = Utilities::MPI::min_max_avg (last_lap_time,
                                                    mpi_communicator);
      if (sync_wall_time && Utilities::MPI::job_supports_mpi())
        {
          last_lap_time = this->mpi_data.max;
          last_lap_cpu_time = Utilities::MPI::min_max_avg (last_lap_cpu_time,
                                                           mpi_communicator).max;
        }
      cumulative_wall_time += last_lap_time;
      cumulative_time += last_lap_cpu_time;
      this->mpi_total_data = Utilities::MPI::min_max_avg (cumulative_wall_time,
                                                          mpi_communicator);
#endif
      cumulative_wall_time += last_lap_time;
      cumulative_time += last_lap_cpu_time;
    }
  return cumulative_time;

which will, if MPI is available, double count both the cumulative wall time and
cummulative time.

7 years agoExpress the ghost exchange of DoF indices using GridTools::exchange_cell_data_to_ghos... 4855/head
Wolfgang Bangerth [Sun, 13 Aug 2017 22:41:14 +0000 (16:41 -0600)]
Express the ghost exchange of DoF indices using GridTools::exchange_cell_data_to_ghosts().

7 years agoMerge pull request #4858 from bangerth/branch-1
Timo Heister [Wed, 16 Aug 2017 00:56:28 +0000 (18:56 -0600)]
Merge pull request #4858 from bangerth/branch-1

Generalize GridTools::exchange_cell_data_to_ghosts()

7 years agoMerge pull request #4860 from bangerth/branch-2
Daniel Arndt [Tue, 15 Aug 2017 23:47:00 +0000 (01:47 +0200)]
Merge pull request #4860 from bangerth/branch-2

Add an assertion.


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.