[cig-commits] r1295 - in branches/active_compositions: include/aspect/compositional_initial_conditions source/compositional_initial_conditions source/simulator

dannberg at dealii.org dannberg at dealii.org
Thu Oct 18 16:05:05 PDT 2012


Author: dannberg
Date: 2012-10-18 17:05:04 -0600 (Thu, 18 Oct 2012)
New Revision: 1295

Modified:
   branches/active_compositions/include/aspect/compositional_initial_conditions/interface.h
   branches/active_compositions/source/compositional_initial_conditions/interface.cc
   branches/active_compositions/source/simulator/core.cc
Log:
Remove boundary_temperature variable from compositional_initial_conditions

Modified: branches/active_compositions/include/aspect/compositional_initial_conditions/interface.h
===================================================================
--- branches/active_compositions/include/aspect/compositional_initial_conditions/interface.h	2012-10-18 22:46:52 UTC (rev 1294)
+++ branches/active_compositions/include/aspect/compositional_initial_conditions/interface.h	2012-10-18 23:05:04 UTC (rev 1295)
@@ -63,8 +63,7 @@
          * adiabatic conditions and store them so that derived classes can access them.
          */
         void
-        initialize (const GeometryModel::Interface<dim>       &geometry_model,
-                    const BoundaryTemperature::Interface<dim> &boundary_temperature);
+        initialize (const GeometryModel::Interface<dim>       &geometry_model);
 
         /**
          * Return the initial temperature as a function of position.
@@ -99,12 +98,6 @@
          */
         const GeometryModel::Interface<dim>       *geometry_model;
 
-        /**
-         * Pointer to an object that described the boundary values
-         * for the temperature field.
-         */
-        const BoundaryTemperature::Interface<dim> *boundary_temperature;
-
     };
 
 
@@ -144,8 +137,7 @@
     template <int dim>
     Interface<dim> *
     create_initial_conditions (ParameterHandler &prm,
-                               const GeometryModel::Interface<dim> &geometry_model,
-                               const BoundaryTemperature::Interface<dim> &boundary_temperature);
+                               const GeometryModel::Interface<dim> &geometry_model);
 
 
     /**

Modified: branches/active_compositions/source/compositional_initial_conditions/interface.cc
===================================================================
--- branches/active_compositions/source/compositional_initial_conditions/interface.cc	2012-10-18 22:46:52 UTC (rev 1294)
+++ branches/active_compositions/source/compositional_initial_conditions/interface.cc	2012-10-18 23:05:04 UTC (rev 1295)
@@ -40,12 +40,9 @@
 
     template <int dim>
     void
-    Interface<dim>::initialize (const GeometryModel::Interface<dim>       &geometry_model_,
-                                const BoundaryTemperature::Interface<dim> &boundary_temperature_)
-                                // TODO check why we need boundary temperature. is this boundary composition?
+    Interface<dim>::initialize (const GeometryModel::Interface<dim>       &geometry_model_)
     {
       geometry_model       = &geometry_model_;
-      boundary_temperature = &boundary_temperature_;
     }
 
 
@@ -93,8 +90,7 @@
     template <int dim>
     Interface<dim> *
     create_initial_conditions (ParameterHandler &prm,
-                               const GeometryModel::Interface<dim> &geometry_model,
-                               const BoundaryTemperature::Interface<dim> &boundary_temperature)
+                               const GeometryModel::Interface<dim> &geometry_model)
     {
       // we need to get at the number of compositional fields here to
       // know whether we need to generate something at all.
@@ -114,8 +110,7 @@
           prm.leave_subsection ();
 
 	  Interface<dim> *plugin = std_cxx1x::get<dim>(registered_plugins).create_plugin (model_name, prm);
-	  plugin->initialize (geometry_model,
-			      boundary_temperature);
+	  plugin->initialize (geometry_model);
 	  return plugin;
 	}
     }
@@ -179,8 +174,7 @@
   template \
   Interface<dim> * \
   create_initial_conditions<dim> (ParameterHandler &prm, \
-                                  const GeometryModel::Interface<dim> &geometry_model, \
-                                  const BoundaryTemperature::Interface<dim> &boundary_temperature);
+                                  const GeometryModel::Interface<dim> &geometry_model);
 
     ASPECT_INSTANTIATE(INSTANTIATE)
   }

Modified: branches/active_compositions/source/simulator/core.cc
===================================================================
--- branches/active_compositions/source/simulator/core.cc	2012-10-18 22:46:52 UTC (rev 1294)
+++ branches/active_compositions/source/simulator/core.cc	2012-10-18 23:05:04 UTC (rev 1295)
@@ -103,8 +103,7 @@
                                                                       *boundary_temperature,
                                                                       *adiabatic_conditions)),
     compositional_initial_conditions (CompositionalInitialConditions::create_initial_conditions (prm,
-                                      *geometry_model,
-                                      *boundary_temperature)),
+                                      *geometry_model)),
 
     time (std::numeric_limits<double>::quiet_NaN()),
     time_step (0),



More information about the CIG-COMMITS mailing list