[cig-commits] [commit] master: Merge PR #235 'Changed the box geometry to allow you to specify an origin' (1a6b773)

[cig_noreply at geodynamics.org]

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

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

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

commit 1a6b7735396a24c6b2d09b93f5acbcbe86bc2e64
Merge: c1465eb 7b5ce1a
Author: Timo Heister <timo.heister at gmail.com>
Date:   Thu Dec 18 02:23:50 2014 -0500

    Merge PR #235 'Changed the box geometry to allow you to specify an origin'
    
    Conflicts:
    	doc/modules/changes.h



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

1a6b7735396a24c6b2d09b93f5acbcbe86bc2e64
 doc/modules/changes.h                              |   10 +-
 include/aspect/geometry_model/box.h                |   13 +-
 source/geometry_model/box.cc                       |   33 +-
 source/initial_conditions/box.cc                   |   14 +-
 .../{vis_velocity_in_years.prm => box-origin.prm}  |   17 +-
 .../screen-output                                  |   32 +-
 tests/box-origin/solution-00000.0000.gnuplot       | 7175 ++++++++++++++++++++
 tests/{simpler-box => box-origin}/statistics       |    2 +-
 8 files changed, 7254 insertions(+), 42 deletions(-)

diff --cc doc/modules/changes.h
index 0feedbf,2ece0d5..b8cf279
--- a/doc/modules/changes.h
+++ b/doc/modules/changes.h
@@@ -6,19 -6,12 +6,24 @@@
   *
   *
   * <ol>
+  *<li> New:  There is now the option to specify an origin when using the box
+  * goemetry model.
+  * <br>
+  * (Ryan Grove, 2014/12/09)
+  *
 - *<li> New: There is now the possibility to interpolate the visualization
 + * <li> Changed: The behaviour when one changed the visualization
 + * output_interval during a checkpoint restart was previously undefined, 
 + * and working in slightly unexpected ways like never writing output for 
 + * the first timestep after the restart. This now works as one would expect,
 + * e.g. every timestep that ends more than output_interval after the last 
 + * output time step will produce output. Old checkpoint files will continue
 + * to work, only with a possible short gap in visualization output right
 + * after restart.
 + * 
 + * <br>
 + * (Rene Gassmoeller, 2014/12/03)
 + *
 + * <li> New: There is now the possibility to interpolate the visualization
   * output to a refined output mesh. This accounts for the fact that most
   * visualization software only offers linear interpolation between grid points
   * and therefore the output file is a very coarse representation of the actual