[cig-commits] [commit] master: Avoid wasting a whole bunch of memory: we used to have certain fields only in the Assembly::StokesSystem scratch object, but they were later added to the StokesPreconditioner scratch object as well. Because the former derives from the latter, we do not need them in the former any more. (363ddce)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/e9145d894b6d7405772f2dea243492c927441b43...363ddcef7712efbdbad3b3c71c1798bad643ba11

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

commit 363ddcef7712efbdbad3b3c71c1798bad643ba11
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Fri May 23 10:42:09 2014 -0500

    Avoid wasting a whole bunch of memory: we used to have certain fields
    only in the Assembly::StokesSystem scratch object, but they were later
    added to the StokesPreconditioner scratch object as well. Because the
    former derives from the latter, we do not need them in the former any
    more.


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

363ddcef7712efbdbad3b3c71c1798bad643ba11
 source/simulator/assembly.cc | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/source/simulator/assembly.cc b/source/simulator/assembly.cc
index 493f7f4..8444fa2 100644
--- a/source/simulator/assembly.cc
+++ b/source/simulator/assembly.cc
@@ -139,10 +139,6 @@ namespace aspect
           std::vector<SymmetricTensor<2,dim> > grads_phi_u;
           std::vector<double>                  div_phi_u;
           std::vector<Tensor<1,dim> >          velocity_values;
-          std::vector<std::vector<double> >     composition_values;
-
-          typename MaterialModel::Interface<dim>::MaterialModelInputs material_model_inputs;
-          typename MaterialModel::Interface<dim>::MaterialModelOutputs material_model_outputs;
         };
 
 
@@ -161,11 +157,7 @@ namespace aspect
           phi_u (finite_element.dofs_per_cell),
           grads_phi_u (finite_element.dofs_per_cell),
           div_phi_u (finite_element.dofs_per_cell),
-          velocity_values (quadrature.size()),
-          composition_values(n_compositional_fields,
-                             std::vector<double>(quadrature.size())),
-          material_model_inputs(quadrature.size(), n_compositional_fields),
-          material_model_outputs(quadrature.size(), n_compositional_fields)
+          velocity_values (quadrature.size())
         {}
 
 
@@ -178,12 +170,11 @@ namespace aspect
           phi_u (scratch.phi_u),
           grads_phi_u (scratch.grads_phi_u),
           div_phi_u (scratch.div_phi_u),
-          velocity_values (scratch.velocity_values),
-          composition_values(scratch.composition_values),
-          material_model_inputs(scratch.material_model_inputs),
-          material_model_outputs(scratch.material_model_outputs)
+          velocity_values (scratch.velocity_values)
         {}
 
+
+
         template <int dim>
         struct AdvectionSystem
         {