[cig-commits] commit 1878 by dannberg to /var/svn/dealii/aspect
dealii.demon at gmail.com
dealii.demon at gmail.com
Wed Sep 11 07:45:55 PDT 2013
Revision 1878
add the numer of compositional fields as a new parameter to the initial composition functions
U branches/j-dannberg/include/aspect/boundary_composition/box.h
U branches/j-dannberg/include/aspect/boundary_composition/initial_composition.h
U branches/j-dannberg/include/aspect/boundary_composition/interface.h
U branches/j-dannberg/include/aspect/boundary_composition/spherical_constant.h
U branches/j-dannberg/include/aspect/boundary_composition/tan_gurnis.h
U branches/j-dannberg/source/boundary_composition/box.cc
U branches/j-dannberg/source/boundary_composition/initial_composition.cc
U branches/j-dannberg/source/boundary_composition/spherical_constant.cc
U branches/j-dannberg/source/boundary_composition/tan_gurnis.cc
U branches/j-dannberg/source/simulator/core.cc
http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=1878&peg=1878
Diff:
Modified: branches/j-dannberg/include/aspect/boundary_composition/box.h
===================================================================
--- branches/j-dannberg/include/aspect/boundary_composition/box.h 2013-09-11 14:35:09 UTC (rev 1877)
+++ branches/j-dannberg/include/aspect/boundary_composition/box.h 2013-09-11 14:44:03 UTC (rev 1878)
@@ -56,7 +56,8 @@
virtual
double composition (const GeometryModel::Interface<dim> &geometry_model,
const unsigned int boundary_indicator,
- const Point<dim> &location) const;
+ const Point<dim> &location,
+ const unsigned int compositional_field) const;
/**
* Return the minimal composition on that part of the boundary
Modified: branches/j-dannberg/include/aspect/boundary_composition/initial_composition.h
===================================================================
--- branches/j-dannberg/include/aspect/boundary_composition/initial_composition.h 2013-09-11 14:35:09 UTC (rev 1877)
+++ branches/j-dannberg/include/aspect/boundary_composition/initial_composition.h 2013-09-11 14:44:03 UTC (rev 1878)
@@ -59,7 +59,8 @@
virtual
double composition (const GeometryModel::Interface<dim> &geometry_model,
const unsigned int boundary_indicator,
- const Point<dim> &location) const;
+ const Point<dim> &location,
+ const unsigned int compositional_field) const;
/**
* Return the minimal composition on that part of the boundary
Modified: branches/j-dannberg/include/aspect/boundary_composition/interface.h
===================================================================
--- branches/j-dannberg/include/aspect/boundary_composition/interface.h 2013-09-11 14:35:09 UTC (rev 1877)
+++ branches/j-dannberg/include/aspect/boundary_composition/interface.h 2013-09-11 14:44:03 UTC (rev 1878)
@@ -68,11 +68,14 @@
* of the domain on which the point is located at which we are requesting the
* composition.
* @param location The location of the point at which we ask for the composition.
+ * @param compositional_field The number of the compositional field for which we
+ * are requesting the composition.
**/
virtual
double composition (const GeometryModel::Interface<dim> &geometry_model,
const unsigned int boundary_indicator,
- const Point<dim> &location) const = 0;
+ const Point<dim> &location,
+ const unsigned int compositional_field) const = 0;
/**
* Return the minimal composition on that part of the boundary
Modified: branches/j-dannberg/include/aspect/boundary_composition/spherical_constant.h
===================================================================
--- branches/j-dannberg/include/aspect/boundary_composition/spherical_constant.h 2013-09-11 14:35:09 UTC (rev 1877)
+++ branches/j-dannberg/include/aspect/boundary_composition/spherical_constant.h 2013-09-11 14:44:03 UTC (rev 1878)
@@ -58,7 +58,8 @@
virtual
double composition (const GeometryModel::Interface<dim> &geometry_model,
const unsigned int boundary_indicator,
- const Point<dim> &location) const;
+ const Point<dim> &location,
+ const unsigned int compositional_field) const;
/**
* Return the minimal composition on that part of the boundary
Modified: branches/j-dannberg/include/aspect/boundary_composition/tan_gurnis.h
===================================================================
--- branches/j-dannberg/include/aspect/boundary_composition/tan_gurnis.h 2013-09-11 14:35:09 UTC (rev 1877)
+++ branches/j-dannberg/include/aspect/boundary_composition/tan_gurnis.h 2013-09-11 14:44:03 UTC (rev 1878)
@@ -56,7 +56,8 @@
virtual
double composition (const GeometryModel::Interface<dim> &geometry_model,
const unsigned int boundary_indicator,
- const Point<dim> &location) const;
+ const Point<dim> &location,
+ const unsigned int compositional_field) const;
/**
* Return the minimal composition on that part of the boundary
Modified: branches/j-dannberg/source/boundary_composition/box.cc
===================================================================
--- branches/j-dannberg/source/boundary_composition/box.cc 2013-09-11 14:35:09 UTC (rev 1877)
+++ branches/j-dannberg/source/boundary_composition/box.cc 2013-09-11 14:44:03 UTC (rev 1878)
@@ -38,7 +38,8 @@
Box<dim>::
composition (const GeometryModel::Interface<dim> &geometry_model,
const unsigned int boundary_indicator,
- const Point<dim> &location) const
+ const Point<dim> &location,
+ const unsigned int compositional_field) const
{
// verify that the geometry is in fact a box since only
// for this geometry do we know for sure what boundary indicators it
Modified: branches/j-dannberg/source/boundary_composition/initial_composition.cc
===================================================================
--- branches/j-dannberg/source/boundary_composition/initial_composition.cc 2013-09-11 14:35:09 UTC (rev 1877)
+++ branches/j-dannberg/source/boundary_composition/initial_composition.cc 2013-09-11 14:44:03 UTC (rev 1878)
@@ -35,9 +35,10 @@
InitialComposition<dim>::
composition (const GeometryModel::Interface<dim> &geometry_model,
const unsigned int boundary_indicator,
- const Point<dim> &location) const
+ const Point<dim> &location,
+ const unsigned int compositional_field) const
{
- return this->get_compositional_initial_conditions().initial_composition(location, 0);
+ return this->get_compositional_initial_conditions().initial_composition(location, compositional_field);
}
Modified: branches/j-dannberg/source/boundary_composition/spherical_constant.cc
===================================================================
--- branches/j-dannberg/source/boundary_composition/spherical_constant.cc 2013-09-11 14:35:09 UTC (rev 1877)
+++ branches/j-dannberg/source/boundary_composition/spherical_constant.cc 2013-09-11 14:44:03 UTC (rev 1878)
@@ -38,7 +38,8 @@
SphericalConstant<dim>::
composition (const GeometryModel::Interface<dim> &geometry_model,
const unsigned int boundary_indicator,
- const Point<dim> &location) const
+ const Point<dim> &location,
+ const unsigned int compositional_field) const
{
// verify that the geometry is in fact a spherical shell since only
// for this geometry do we know for sure what boundary indicators it
Modified: branches/j-dannberg/source/boundary_composition/tan_gurnis.cc
===================================================================
--- branches/j-dannberg/source/boundary_composition/tan_gurnis.cc 2013-09-11 14:35:09 UTC (rev 1877)
+++ branches/j-dannberg/source/boundary_composition/tan_gurnis.cc 2013-09-11 14:44:03 UTC (rev 1878)
@@ -38,7 +38,8 @@
TanGurnis<dim>::
composition (const GeometryModel::Interface<dim> &geometry_model,
const unsigned int boundary_indicator,
- const Point<dim> &location) const
+ const Point<dim> &location,
+ const unsigned int compositional_field) const
{
// verify that the geometry is in fact a box since only
// for this geometry do we know for sure what boundary indicators it
Modified: branches/j-dannberg/source/simulator/core.cc
===================================================================
--- branches/j-dannberg/source/simulator/core.cc 2013-09-11 14:35:09 UTC (rev 1877)
+++ branches/j-dannberg/source/simulator/core.cc 2013-09-11 14:44:03 UTC (rev 1878)
@@ -690,7 +690,8 @@
std_cxx1x::cref(*boundary_composition),
std_cxx1x::cref(*geometry_model),
*p,
- std_cxx1x::_1),
+ std_cxx1x::_1,
+ c),
introspection.component_masks.compositional_fields[c].first_selected_component(),
introspection.n_components),
constraints,
More information about the CIG-COMMITS
mailing list