[cig-commits] commit 2012 by buerg to /var/svn/dealii/aspect

[dealii.demon at gmail.com]

Revision 2012

Make assembly of compositional fields simpler.

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


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

Diff:
Modified: trunk/aspire/source/simulator/assembly.cc
===================================================================
--- trunk/aspire/source/simulator/assembly.cc	2013-11-14 18:49:44 UTC (rev 2011)
+++ trunk/aspire/source/simulator/assembly.cc	2013-11-18 18:22:35 UTC (rev 2012)
@@ -1236,12 +1236,11 @@
             scratch.phi_field[i]      = scratch.fe_values_advection.shape_value (i, q);
           }
         
-        const double rho = scratch.material_model_outputs.densities[q];
         const Tensor<1, dim> current_u = scratch.current_velocity_values[q];
         
         for (unsigned int c = 0; c < parameters.n_compositional_fields; ++c)
         {
-          const double diffusivity = rho * scratch.material_model_outputs.diffusivities[q];
+          const double diffusivity = scratch.material_model_outputs.diffusivities[q];
           const double old_value = scratch.old_composition_values[c][q];
 
           for (unsigned int i = 0; i < dofs_per_cell; ++i)
@@ -1250,7 +1249,7 @@
                 {
                   data.local_matrices[c] (i, 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] * (current_u * scratch.grad_phi_field[j]))
                       + scratch.phi_field[i] * scratch.phi_field[j])
                      * scratch.fe_values_advection.JxW (q)
                      * (axisymmetric_terms ?