[cig-commits] [commit] master: Workaround for is_contiguous() assertion failing in PETSc wrappers. (0e9e4c2)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/09cd1e0322ded4719e699729a269b602229b86b3...925399ce4de0e953aa20de00940677b11013e5bc

>---------------------------------------------------------------

commit 0e9e4c2f4dc20c3411fc307fe54fa305b37f577b
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Mon Jan 19 19:53:52 2015 -0800

    Workaround for is_contiguous() assertion failing in PETSc wrappers.


>---------------------------------------------------------------

0e9e4c2f4dc20c3411fc307fe54fa305b37f577b
 source/mesh_refinement/density.cc                  | 3 ++-
 source/mesh_refinement/nonadiabatic_temperature.cc | 3 ++-
 source/mesh_refinement/thermal_energy_density.cc   | 3 ++-
 source/mesh_refinement/viscosity.cc                | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/source/mesh_refinement/density.cc b/source/mesh_refinement/density.cc
index dc884b5..01b0115 100644
--- a/source/mesh_refinement/density.cc
+++ b/source/mesh_refinement/density.cc
@@ -114,7 +114,8 @@ namespace aspect
 
       // now create a vector with the requisite ghost elements
       // and use it for estimating the gradients
-      LinearAlgebra::BlockVector vec (this->introspection().index_sets.system_relevant_partitioning,
+      LinearAlgebra::BlockVector vec (this->introspection().index_sets.system_partitioning,
+                                      this->introspection().index_sets.system_relevant_partitioning,
                                       this->get_mpi_communicator());
       vec = vec_distributed;
 
diff --git a/source/mesh_refinement/nonadiabatic_temperature.cc b/source/mesh_refinement/nonadiabatic_temperature.cc
index 4a8f2a1..39c1940 100644
--- a/source/mesh_refinement/nonadiabatic_temperature.cc
+++ b/source/mesh_refinement/nonadiabatic_temperature.cc
@@ -92,7 +92,8 @@ namespace aspect
 
       // now create a vector with the requisite ghost elements
       // and use it for estimating the gradients
-      LinearAlgebra::BlockVector vec (this->introspection().index_sets.system_relevant_partitioning,
+      LinearAlgebra::BlockVector vec (this->introspection().index_sets.system_partitioning,
+                                      this->introspection().index_sets.system_relevant_partitioning,
                                       this->get_mpi_communicator());
       vec = vec_distributed;
 
diff --git a/source/mesh_refinement/thermal_energy_density.cc b/source/mesh_refinement/thermal_energy_density.cc
index 5d2e60f..7ebb9d4 100644
--- a/source/mesh_refinement/thermal_energy_density.cc
+++ b/source/mesh_refinement/thermal_energy_density.cc
@@ -114,7 +114,8 @@ namespace aspect
 
       // now create a vector with the requisite ghost elements
       // and use it for estimating the gradients
-      LinearAlgebra::BlockVector vec (this->introspection().index_sets.system_relevant_partitioning,
+      LinearAlgebra::BlockVector vec (this->introspection().index_sets.system_partitioning,
+                                      this->introspection().index_sets.system_relevant_partitioning,
                                       this->get_mpi_communicator());
       vec = vec_distributed;
 
diff --git a/source/mesh_refinement/viscosity.cc b/source/mesh_refinement/viscosity.cc
index 62caafc..056392b 100644
--- a/source/mesh_refinement/viscosity.cc
+++ b/source/mesh_refinement/viscosity.cc
@@ -116,7 +116,8 @@ namespace aspect
 
       // now create a vector with the requisite ghost elements
       // and use it for estimating the gradients
-      LinearAlgebra::BlockVector vec (this->introspection().index_sets.system_relevant_partitioning,
+      LinearAlgebra::BlockVector vec (this->introspection().index_sets.system_partitioning,
+                                      this->introspection().index_sets.system_relevant_partitioning,
                                       this->get_mpi_communicator());
       vec = vec_distributed;