Merge pull request #1884 from HarryRLevinson/solcx_particles_fixed

Fixed bug preventing particles from working in Solcx benchmark
geodynamics · Aug 12, 2017 · d68a5ee · d68a5ee
2 parents d707d9c + df5f710
commit d68a5ee
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/benchmarks/solcx/compositional_fields/solcx_compositional_fields.h b/benchmarks/solcx/compositional_fields/solcx_compositional_fields.h
@@ -15,21 +15,19 @@ namespace aspect
     class SolCxCompositionalMaterial : public SolCxMaterial<dim>
     {
       public:
-        double density(const double temperature,
-                       const double pressure,
-                       const std::vector<double> &composition,
-                       const Point <dim> &position) const
+        virtual void evaluate(const MaterialModel::MaterialModelInputs<dim> &in,
+                              MaterialModel::MaterialModelOutputs<dim> &out) const
         {
-          return composition[0];
-        }
-
-        double viscosity(const double temperature,
-                         const double pressure,
-                         const std::vector<double> &composition,
-                         const SymmetricTensor<2, dim> &strain_rate,
-                         const Point <dim> &position) const
-        {
-          return composition[1];
+          for (unsigned int i=0; i < in.position.size(); ++i)
+            {
+              const Point<dim> &pos = in.position[i];
+              out.densities[i] = in.composition[i][0];
+              out.viscosities[i] = in.composition[i][1];
+              out.compressibilities[i] = 0;
+              out.specific_heat[i] = 0;
+              out.thermal_expansion_coefficients[i] = 0;
+              out.thermal_conductivities[i] = 0.0;
+            }
         }
     };
   }

diff --git a/benchmarks/solcx/compositional_fields/solcx_particles.prm b/benchmarks/solcx/compositional_fields/solcx_particles.prm
@@ -76,6 +76,12 @@ subsection Compositional fields
   set Number of fields = 2
   set Names of fields = density_comp, viscosity_comp
   set Compositional field methods = particles, particles
+
+  # In the source code, we assumed that density is being carried
+  # on compositional field 1 (at index 0) and viscosity is being
+  # carried on compositional field 2 (at index 1).  If this order
+  # is changed, then the evaluate() function in solcx_compositional_fields.h
+  # must also be changed.
   set Mapped particle properties = density_comp:function[0], viscosity_comp:function[1]
 end