[cig-commits] r1291 - in branches/active_compositions/source: . initial_conditions postprocess simulator

[dannberg at dealii.org]

Author: dannberg
Date: 2012-10-18 15:49:31 -0600 (Thu, 18 Oct 2012)
New Revision: 1291

Modified:
   branches/active_compositions/source/adiabatic_conditions.cc
   branches/active_compositions/source/initial_conditions/box.cc
   branches/active_compositions/source/postprocess/table_velocity_statistics.cc
   branches/active_compositions/source/postprocess/velocity_statistics.cc
   branches/active_compositions/source/simulator/helper_functions.cc
Log:
Leave some TODOs and comments

Modified: branches/active_compositions/source/adiabatic_conditions.cc
===================================================================
--- branches/active_compositions/source/adiabatic_conditions.cc	2012-10-18 21:49:00 UTC (rev 1290)
+++ branches/active_compositions/source/adiabatic_conditions.cc	2012-10-18 21:49:31 UTC (rev 1291)
@@ -63,6 +63,8 @@
 
         const Point<dim> representative_point = geometry_model.representative_point (z);
 
+        //TODO: we look up the composition at the representative point, but we should
+        // use averaged compositional values here. Right?
         std::vector<double> initial_composition(n_compositional_fields);
         for (unsigned int k=0;k<n_compositional_fields;++k)
           initial_composition[k] = compositional_initial_conditions.initial_composition(representative_point, k);

Modified: branches/active_compositions/source/initial_conditions/box.cc
===================================================================
--- branches/active_compositions/source/initial_conditions/box.cc	2012-10-18 21:49:00 UTC (rev 1290)
+++ branches/active_compositions/source/initial_conditions/box.cc	2012-10-18 21:49:31 UTC (rev 1291)
@@ -45,7 +45,6 @@
       for (unsigned int d=0; d<dim; ++d)
         perturbation *= std::sin(numbers::PI*position[d]/geometry->get_extents()[d]);
       return 1 + perturbation/10;
-//      return 293;
     }
   }
 }

Modified: branches/active_compositions/source/postprocess/table_velocity_statistics.cc
===================================================================
--- branches/active_compositions/source/postprocess/table_velocity_statistics.cc	2012-10-18 21:49:00 UTC (rev 1290)
+++ branches/active_compositions/source/postprocess/table_velocity_statistics.cc	2012-10-18 21:49:31 UTC (rev 1291)
@@ -165,6 +165,7 @@
       if (this->get_time() == 0e0)
         {
           double dT = this->get_boundary_temperature().maximal_temperature() - this->get_boundary_temperature().minimal_temperature();
+          // we do not compute the compositions but give the functions below the value 0.0 instead
           std::vector<double> composition_values(this->n_compositional_fields(),0.0);
 
           Point<dim> representative_point = Point<dim>::unit_vector(dim-1);
@@ -202,13 +203,13 @@
                            << Ra
                            << std::endl;
           this->get_pcout()<< "     k_value:                                       "
-                           << material_model.thermal_conductivity(dT, dT, composition_values, representative_point)
+                           << material_model.thermal_conductivity(dT, dT, composition_values, representative_point) //TODO: dT for the pressure is wrong
                            << std::endl;
           this->get_pcout()<< "     reference_cp:                                  "
                            << material_model.reference_cp()
                            << std::endl;
           this->get_pcout()<< "     reference_thermal_diffusivity:                 "
-                           << material_model.thermal_conductivity(dT, dT, composition_values, representative_point)/(material_model.reference_density()*material_model.reference_cp())
+                           << material_model.thermal_conductivity(dT, dT, composition_values, representative_point)/(material_model.reference_density()*material_model.reference_cp())  //TODO: dT for the pressure is wrong
                            << std::endl;
           this->get_pcout()<<  std::endl;
         }

Modified: branches/active_compositions/source/postprocess/velocity_statistics.cc
===================================================================
--- branches/active_compositions/source/postprocess/velocity_statistics.cc	2012-10-18 21:49:00 UTC (rev 1290)
+++ branches/active_compositions/source/postprocess/velocity_statistics.cc	2012-10-18 21:49:31 UTC (rev 1291)
@@ -148,6 +148,7 @@
               const double h = this->get_geometry_model().maximal_depth();
 
               const double dT = this->get_boundary_temperature().maximal_temperature() - this->get_boundary_temperature().minimal_temperature();
+              // we do not compute the compositions but give the functions below the value 0.0 instead
               std::vector<double> composition_values(this->n_compositional_fields(),0.0);
 
               Point<dim> representative_point = Point<dim>::unit_vector(dim-1);
@@ -185,13 +186,13 @@
                                << Ra
                                << std::endl;
               this->get_pcout()<< "     k_value:                                       "
-                               << material_model.thermal_conductivity(dT, dT, composition_values, representative_point)
+                               << material_model.thermal_conductivity(dT, dT, composition_values, representative_point) //TODO: dT for the pressure is wrong
                                << std::endl;
               this->get_pcout()<< "     reference_cp:                                  "
                                << material_model.reference_cp()
                                << std::endl;
               this->get_pcout()<< "     reference_thermal_diffusivity:                 "
-                               << material_model.thermal_conductivity(dT, dT, composition_values, representative_point)/(material_model.reference_density()*material_model.reference_cp())
+                               << material_model.thermal_conductivity(dT, dT, composition_values, representative_point)/(material_model.reference_density()*material_model.reference_cp()) //TODO: dT for the pressure is wrong
                                << std::endl;
               this->get_pcout()<<  std::endl;
             }

Modified: branches/active_compositions/source/simulator/helper_functions.cc
===================================================================
--- branches/active_compositions/source/simulator/helper_functions.cc	2012-10-18 21:49:00 UTC (rev 1290)
+++ branches/active_compositions/source/simulator/helper_functions.cc	2012-10-18 21:49:31 UTC (rev 1291)
@@ -669,6 +669,8 @@
                                                      q,
                                                      composition_values_at_q_point);
 
+              // TODO: we should use compute_parameters() instead. This should be done
+              // together with merging all the *_average() functions.
               const double viscosity = material_model->viscosity(temperature_values[q],
                                                                  pressure_values[q],
                                                                  composition_values_at_q_point,