[cig-commits] [commit] master: Merge branch 'gplates-1.4-patch' of https://github.com/gassmoeller/aspect (f68c1b5)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/e2d2428a203331b4832dbc4e5f4d716934c22694...f68c1b584dc0211691228ef830ea1d2538da258d

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

commit f68c1b584dc0211691228ef830ea1d2538da258d
Merge: e2d2428 d73c9ab
Author: Timo Heister <timo.heister at gmail.com>
Date:   Sat May 24 17:21:16 2014 -0400

    Merge branch 'gplates-1.4-patch' of https://github.com/gassmoeller/aspect
    
    Conflicts:
    	doc/modules/changes.h
    
    https://github.com/geodynamics/aspect/pull/73



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

f68c1b584dc0211691228ef830ea1d2538da258d
 ...{time_dependent.3.gpml => current_day_1.4.gpml} | 714 ++++++++++-----------
 doc/manual/manual.tex                              |  13 +-
 doc/modules/changes.h                              |  26 +
 .../aspect/velocity_boundary_conditions/gplates.h  |   8 +
 source/velocity_boundary_conditions/gplates.cc     |  54 +-
 cookbooks/gplates-2d.prm => tests/gplates-1-3.prm  |  22 +-
 tests/gplates-1-3/screen-output                    |  59 ++
 tests/gplates-1-3/statistics                       |  17 +
 cookbooks/gplates-2d.prm => tests/gplates-1-4.prm  |  27 +-
 tests/gplates-1-4/screen-output                    |  59 ++
 tests/gplates-1-4/statistics                       |  17 +
 11 files changed, 620 insertions(+), 396 deletions(-)

diff --cc doc/modules/changes.h
index 2e9d753,338ea3b..4db22f7
--- a/doc/modules/changes.h
+++ b/doc/modules/changes.h
@@@ -5,11 -5,12 +5,18 @@@
   * 1.0. All entries are signed with the names of the author. </p>
   *
   * <ol>
+  * <li> Fixed: The GPlates plugin now correctly handles meshes created by 
+  * GPlates 1.4 and later. Previous Aspect versions may only read in files
+  * created by GPlates 1.3.
+  * <br>
+  * (Rene Gassmoeller, 2014/05/23)
+  *
 + * <li> Add a find_postprocessor() function in Simulator_access class to pass a pointer 
 + * of a certain postprocessor, if it is not found, return a NULL pointer.
 + * <br>
 + * (Siqi Zhang, 2014/05/23)
 + *
++ *
   * <li> Mesh refinement plugins can now interact with initial global mesh
   * refinement and unflag certain cells if desired.
   * <br>