[cig-commits] (no subject)

[dealii.demon at gmail.com]

-e To: cig-commits at geodynamics.org
Subject: commit by buerg to /var/svn/dealii/aspect

Revision 1820

Change composition equations.

U   trunk/aspire/source/simulator/assembly.cc


http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=1820&peg=1820

Diff:
Modified: trunk/aspire/source/simulator/assembly.cc
===================================================================
--- trunk/aspire/source/simulator/assembly.cc	2013-07-24 20:14:34 UTC (rev 1819)
+++ trunk/aspire/source/simulator/assembly.cc	2013-07-30 17:17:53 UTC (rev 1820)
@@ -943,10 +943,10 @@
     DoFTools::extract_constant_modes (dof_handler_velocity,
                                       introspection.component_masks.velocities,
                                       constant_modes);
-
+    
     LinearAlgebra::PreconditionILU * prec_Mp = new LinearAlgebra::PreconditionILU();
     Mp_preconditioner.reset (prec_Mp);
-    TrilinosWrappers::PreconditionBlockwiseDirect * prec_A = new TrilinosWrappers::PreconditionBlockwiseDirect();
+    TrilinosWrappers::PreconditionBlockwiseDirect * prec_A = new TrilinosWrappers::PreconditionBlockwiseDirect ();
     Amg_preconditioner.reset (prec_A);
     
     TrilinosWrappers::PreconditionBlockwiseDirect::AdditionalData Amg_data;
@@ -1314,10 +1314,9 @@
             scratch.phi_field[i]      = scratch.fe_values_composition.shape_value (i, q);
           }
 
-        const double c_P = scratch.material_model_outputs.specific_heat[q];
-        const double lambda = scratch.material_model_outputs.thermal_conductivities[q];
         const double old_value = scratch.old_composition_values[q];
         const double rho = scratch.material_model_outputs.densities[q];
+        const double diffusivity = rho * scratch.material_model_outputs.diffusivities[q];
         const double source_term = scratch.material_model_outputs.compositional_sources[q][c];
         const Tensor<1, dim> current_u = scratch.current_velocity_values[q];
 
@@ -1326,8 +1325,8 @@
             for (unsigned int j = 0; j < dofs_per_cell; ++j)
               {
                 data.local_matrix (i, j)
-                += (time_step * (lambda * (scratch.grad_phi_field[i] * scratch.grad_phi_field[j]) / c_P
-                                        + rho * scratch.phi_field[i] * (current_u * scratch.grad_phi_field[j]))
+                += (time_step * (diffusivity * (scratch.grad_phi_field[i] * scratch.grad_phi_field[j])
+                                   + rho * scratch.phi_field[i] * (current_u * scratch.grad_phi_field[j]))
                     + scratch.phi_field[i] * scratch.phi_field[j])
                    * scratch.fe_values_composition.JxW (q)
                    * (axisymmetric_terms ?