[cig-commits] [commit] master: Changed the box geometry to allow you to specify an origin. (2ce551b)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/c1465eb80ac07139659936dd80414c93d876e518...1a6b7735396a24c6b2d09b93f5acbcbe86bc2e64

>---------------------------------------------------------------

commit 2ce551b3e09e3e7d8ea9f1de757eed0bbdf8c09c
Author: Ryan Grove <rgrove at clemson.edu>
Date:   Mon Dec 1 13:37:28 2014 -0500

    Changed the box geometry to allow you to specify an origin.


>---------------------------------------------------------------

2ce551b3e09e3e7d8ea9f1de757eed0bbdf8c09c
 include/aspect/geometry_model/box.h |  5 +++++
 source/geometry_model/box.cc        | 25 ++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/include/aspect/geometry_model/box.h b/include/aspect/geometry_model/box.h
index ff9c5ae..22b52c5 100644
--- a/include/aspect/geometry_model/box.h
+++ b/include/aspect/geometry_model/box.h
@@ -128,6 +128,11 @@ namespace aspect
         Point<dim> extents;
 
         /**
+         * Origin of the box in x, y, and z (in 3d) coordinates.
+         */
+        Point<dim> box_origin;
+
+        /**
          * Flag whether the box is periodic in the x-, y-, and z-direction.
          */
         bool periodic[dim];
diff --git a/source/geometry_model/box.cc b/source/geometry_model/box.cc
index 6a8b336..252b054 100644
--- a/source/geometry_model/box.cc
+++ b/source/geometry_model/box.cc
@@ -39,8 +39,8 @@ namespace aspect
       std::vector<unsigned int> rep_vec(repetitions, repetitions+dim);
       GridGenerator::subdivided_hyper_rectangle (coarse_grid,
                                                  rep_vec,
-                                                 Point<dim>(),
-                                                 extents,
+                                                 box_origin,
+                                                 box_origin+extents,
                                                  true);
 
       //Tell p4est about the periodicity of the mesh.
@@ -155,7 +155,7 @@ namespace aspect
     double
     Box<dim>::depth(const Point<dim> &position) const
     {
-      const double d = maximal_depth()-position(dim-1);
+      const double d = maximal_depth()-(position(dim-1)-box_origin[dim-1]);
 
       // if we violate the bounds, check that we do so only very slightly and
       // then just return maximal or minimal depth
@@ -184,8 +184,9 @@ namespace aspect
               ExcMessage ("Given depth must be less than or equal to the maximal depth of this geometry."));
 
       // choose a point on the center axis of the domain
-      Point<dim> p = extents/2;
-      p[dim-1] = maximal_depth() - depth;
+      Point<dim> p = extents/2+box_origin;
+      p[dim-1] = extents[dim-1]+box_origin[dim-1]-depth;
+
       return p;
     }
 
@@ -218,6 +219,17 @@ namespace aspect
                              "Extent of the box in z-direction. This value is ignored "
                              "if the simulation is in 2d Units: m.");
 
+          prm.declare_entry ("Box origin X coordinate", "0",
+                             Patterns::Double (),
+                             "X coordinate of box origin.");
+          prm.declare_entry ("Box origin Y coordinate", "0",
+                             Patterns::Double (),
+                             "Y coordinate of box origin.");
+          prm.declare_entry ("Box origin Z coordinate", "0",
+                             Patterns::Double (),
+                             "Z coordinate of box origin. This value is ignored "
+                             "if the simulation is in 2d Units: m.");
+
           prm.declare_entry ("X repetitions", "1",
                              Patterns::Integer (1),
                              "Number of cells in X direction.");
@@ -254,12 +266,14 @@ namespace aspect
       {
         prm.enter_subsection("Box");
         {
+          box_origin[0] = prm.get_double ("Box origin X coordinate");
           extents[0] = prm.get_double ("X extent");
           periodic[0] = prm.get_bool ("X periodic");
           repetitions[0] = prm.get_integer ("X repetitions");
 
           if (dim >= 2)
             {
+              box_origin[1] = prm.get_double ("Box origin Y coordinate");
               extents[1] = prm.get_double ("Y extent");
               periodic[1] = prm.get_bool ("Y periodic");
               repetitions[1] = prm.get_integer ("Y repetitions");
@@ -267,6 +281,7 @@ namespace aspect
 
           if (dim >= 3)
             {
+              box_origin[2] = prm.get_double ("Box origin Z coordinate");
               extents[2] = prm.get_double ("Z extent");
               periodic[2] = prm.get_bool ("Z periodic");
               repetitions[2] = prm.get_integer ("Z repetitions");