Skip to content

Commit

Permalink
Merge pull request geodynamics#2704 from MFraters/add_two_merged_boxe…
Browse files Browse the repository at this point in the history
…s_to_initial_lithostatic_pressure

add two merged boxes to initial lithostatic pressure plugin.
  • Loading branch information
gassmoeller committed Dec 1, 2018
2 parents eca8ae7 + b1745f8 commit d1d1fa4
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion source/boundary_traction/initial_lithostatic_pressure.cc
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include <aspect/geometry_model/chunk.h>
#include <aspect/geometry_model/ellipsoidal_chunk.h>
#include <aspect/geometry_model/box.h>
#include <aspect/geometry_model/two_merged_boxes.h>

namespace aspect
{
Expand Down Expand Up @@ -125,7 +126,8 @@ namespace aspect

// Where to calculate the density
// for spherical domains
if (dynamic_cast<const GeometryModel::Box<dim>*> (&this->get_geometry_model()) == nullptr)
if (dynamic_cast<const GeometryModel::Box<dim>*> (&this->get_geometry_model()) == nullptr &&
dynamic_cast<const GeometryModel::TwoMergedBoxes<dim>*> (&this->get_geometry_model()) == nullptr)
in0.position[0] = Utilities::Coordinates::spherical_to_cartesian_coordinates<dim>(spherical_representative_point);
// and for cartesian domains
else
Expand Down

0 comments on commit d1d1fa4

Please sign in to comment.