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

[dealii.demon at gmail.com]

Revision 2011

Use current fields.

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


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

Diff:
Modified: trunk/aspire/source/simulator/assembly.cc
===================================================================
--- trunk/aspire/source/simulator/assembly.cc	2013-11-08 20:57:28 UTC (rev 2010)
+++ trunk/aspire/source/simulator/assembly.cc	2013-11-14 18:49:44 UTC (rev 2011)
@@ -1141,7 +1141,7 @@
     std_cxx1x::get<1> (cell.iterators)->get_dof_indices (data.local_dof_indices);
     data.local_matrix = 0;
     data.local_rhs = 0;
-    scratch.fe_values_advection.get_function_values (old_solution_temperature,
+    scratch.fe_values_advection.get_function_values (current_linearization_point_temperature,
                                                      scratch.old_temperature_values);
     scratch.fe_values_velocity.reinit (std_cxx1x::get<0> (cell.iterators));
     scratch.fe_values_velocity[introspection.extractors.velocities].get_function_values (current_linearization_point_velocity,
@@ -1210,7 +1210,7 @@
     for (unsigned int c = 0; c < parameters.n_compositional_fields; ++c)
     {
       data.local_matrices[c] = 0;
-      scratch.fe_values_advection.get_function_values (old_solution_composition.block (c),
+      scratch.fe_values_advection.get_function_values (current_linearization_point_composition.block (c),
                                                        scratch.old_composition_values[c]);
     }
     

Modified: trunk/aspire/source/simulator/core.cc
===================================================================
--- trunk/aspire/source/simulator/core.cc	2013-11-08 20:57:28 UTC (rev 2010)
+++ trunk/aspire/source/simulator/core.cc	2013-11-14 18:49:44 UTC (rev 2011)
@@ -1052,11 +1052,11 @@
             = solution_velocity.block (introspection.block_indices.velocities);
           current_linearization_point_velocity.block (introspection.block_indices.pressure)
             = solution_velocity.block (introspection.block_indices.pressure);
+          advance_chemistry ();
           assemble_temperature_system ();
           build_temperature_preconditioner (T_preconditioner);
           solve_temperature ();
           current_linearization_point_temperature = solution_temperature;
-          advance_chemistry ();
           assemble_composition_systems ();
 
           for (unsigned int c = 0; c < parameters.n_compositional_fields; ++c)