[cig-commits] r1382 - in trunk/aspect: include/aspect source/simulator

[gassmoeller at dealii.org]

Author: gassmoeller
Date: 2012-11-21 07:33:29 -0700 (Wed, 21 Nov 2012)
New Revision: 1382

Modified:
   trunk/aspect/include/aspect/simulator.h
   trunk/aspect/source/simulator/assembly.cc
Log:
Code cleanup and minor bugfix in compute_advection_system_residual.

Modified: trunk/aspect/include/aspect/simulator.h
===================================================================
--- trunk/aspect/include/aspect/simulator.h	2012-11-21 14:28:38 UTC (rev 1381)
+++ trunk/aspect/include/aspect/simulator.h	2012-11-21 14:33:29 UTC (rev 1382)
@@ -1179,7 +1179,6 @@
                         const double                        global_T_variation,
                         const double                        average_temperature,
                         const double                        global_entropy_variation,
-                        const std::vector<Point<dim> >     &evaluation_points,
                         const double                        cell_diameter,
                         const unsigned int                  index) const;
 

Modified: trunk/aspect/source/simulator/assembly.cc
===================================================================
--- trunk/aspect/source/simulator/assembly.cc	2012-11-21 14:28:38 UTC (rev 1381)
+++ trunk/aspect/source/simulator/assembly.cc	2012-11-21 14:33:29 UTC (rev 1382)
@@ -558,7 +558,7 @@
                                          scratch.old_old_field_grads[q]) / 2;
 
         const double density              = (index == 0) ? scratch.explicit_material_model_outputs.densities[q] : 1.0;
-        const double conductivity = (index == 0) ? scratch.material_model_outputs.thermal_conductivities[q] : 0.0;
+        const double conductivity = (index == 0) ? scratch.explicit_material_model_outputs.thermal_conductivities[q] : 0.0;
         const double c_P                  = (index == 0) ? scratch.explicit_material_model_outputs.specific_heat[q] : 1.0;
         const double k_Delta_field = conductivity
                                      * (scratch.old_field_laplacians[q] +
@@ -590,7 +590,6 @@
                      const double                        global_field_variation,
                      const double                        average_field,
                      const double                        global_entropy_variation,
-                     const std::vector<Point<dim> >     &evaluation_points,
                      const double                        cell_diameter,
                      const unsigned int                  index) const
   {