[cig-commits] [commit] master: Added tests for the maximum refinement function. (bcc187d)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/b32ac5f8f385e349bb6bc11f421a0195296a179a...e9db016d5017ab6bacf537f5824c5b1b609de881

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

commit bcc187d663b3ddc68653a0f967482a9a1b0e4fb4
Author: Jonathan Perry-Houts <jperryh2 at uoregon.edu>
Date:   Fri Jul 4 12:19:54 2014 -0700

    Added tests for the maximum refinement function.


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

bcc187d663b3ddc68653a0f967482a9a1b0e4fb4
 ...nement_function.prm => maximum_refinement_function.prm} | 14 +++++++-------
 ...esian.prm => maximum_refinement_function_cartesian.prm} | 12 ++++++------
 ...rical.prm => maximum_refinement_function_spherical.prm} | 14 +++++++-------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/minimum_refinement_function.prm b/tests/maximum_refinement_function.prm
similarity index 93%
copy from tests/minimum_refinement_function.prm
copy to tests/maximum_refinement_function.prm
index 2325c05..888b183 100644
--- a/tests/minimum_refinement_function.prm
+++ b/tests/maximum_refinement_function.prm
@@ -141,10 +141,10 @@ subsection Mesh refinement
 
   set Additional refinement times              = 
 
-  set Coarsening fraction                      = 0.05
-  set Refinement fraction                      = 0.3
+  set Coarsening fraction                      = 0.2
+  set Refinement fraction                      = 0.5
 
-  set Initial adaptive refinement              = 3                    # default: 2
+  set Initial adaptive refinement              = 5                    # default: 2
   set Initial global refinement                = 3                    # default: 2
 
   set Normalize individual refinement criteria = true
@@ -152,12 +152,12 @@ subsection Mesh refinement
 
   set Run postprocessors on initial refinement = true
 
-  set Strategy                                 = temperature, minimum refinement function
+  set Strategy                                 = thermal energy density, maximum refinement function
 
   set Time steps between mesh refinement       = 1
-  subsection Minimum refinement function
+  subsection Maximum refinement function
     set Function constants  = 
-    set Function expression = 4 + 2*sin(depth*pi/250000)
+    set Function expression = 6 + 2*sin(depth*2*pi/250000)
     set Variable names      = depth
   end
 end
@@ -202,7 +202,7 @@ subsection Postprocess
     # value of zero indicates that output should be generated in each time
     # step. Units: years if the 'Use years in output instead of seconds'
     # parameter is set; seconds otherwise.
-    set Time between graphical output = 0                                                                                # default: 1e8
+    set Time between graphical output = 0   # default: 1e8
   end
 
 end
diff --git a/tests/minimum_refinement_function_cartesian.prm b/tests/maximum_refinement_function_cartesian.prm
similarity index 94%
copy from tests/minimum_refinement_function_cartesian.prm
copy to tests/maximum_refinement_function_cartesian.prm
index a7990f2..301cc5a 100644
--- a/tests/minimum_refinement_function_cartesian.prm
+++ b/tests/maximum_refinement_function_cartesian.prm
@@ -141,10 +141,10 @@ subsection Mesh refinement
 
   set Additional refinement times              = 
 
-  set Coarsening fraction                      = 0.05
-  set Refinement fraction                      = 0.3
+  set Coarsening fraction                      = 0.2
+  set Refinement fraction                      = 0.5
 
-  set Initial adaptive refinement              = 3                    # default: 2
+  set Initial adaptive refinement              = 5                    # default: 2
   set Initial global refinement                = 3                    # default: 2
 
   set Normalize individual refinement criteria = true
@@ -152,13 +152,13 @@ subsection Mesh refinement
 
   set Run postprocessors on initial refinement = true
 
-  set Strategy                                 = temperature, minimum refinement function
+  set Strategy                                 = thermal energy density, maximum refinement function
 
   set Time steps between mesh refinement       = 1
-  subsection Minimum refinement function
+  subsection Maximum refinement function
     set Coordinate system      = cartesian
     set Function constants     = 
-    set Function expression    = 4 + 2*sin(x*pi/250000)*sin(y*pi/250000)
+    set Function expression    = 6 + 2*sin(x*2*pi/250000)*sin(y*2*pi/250000)
     set Variable names         = x,y
   end
 end
diff --git a/tests/minimum_refinement_function_spherical.prm b/tests/maximum_refinement_function_spherical.prm
similarity index 93%
copy from tests/minimum_refinement_function_spherical.prm
copy to tests/maximum_refinement_function_spherical.prm
index 4cd3d46..f901ed0 100644
--- a/tests/minimum_refinement_function_spherical.prm
+++ b/tests/maximum_refinement_function_spherical.prm
@@ -133,24 +133,24 @@ subsection Mesh refinement
 
   set Additional refinement times              = 
 
-  set Coarsening fraction                      = 0.05
-  set Refinement fraction                      = 0.3
+  set Coarsening fraction                      = 0.2
+  set Refinement fraction                      = 0.5
 
-  set Initial adaptive refinement              = 3                    # default: 2
-  set Initial global refinement                = 2                    # default: 2
+  set Initial adaptive refinement              = 5                    # default: 2
+  set Initial global refinement                = 3                    # default: 2
 
   set Normalize individual refinement criteria = true
   set Refinement criteria merge operation      = max
 
   set Run postprocessors on initial refinement = true
 
-  set Strategy                                 = minimum refinement function
+  set Strategy                                 = thermal energy density, maximum refinement function
 
   set Time steps between mesh refinement       = 1
-  subsection Minimum refinement function
+  subsection Maximum refinement function
     set Coordinate system      = spherical
     set Function constants     = 
-    set Function expression    = 2 + 3*sin((r+250000)*pi/250000)*sin(6*phi)
+    set Function expression    = 6 + 2*sin((r+250000)*2*pi/250000)*sin(12*phi)
     set Variable names         = r,phi
   end
 end