[cig-commits] [commit] master: update inclusion benchmark again (818564a)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/c883fc069e0dcc93cce45e1d52c84c05c9c4385b...1f4ab820b0191d9a4058b78c91b629bc94c437ec

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

commit 818564a39c39ccd1ff2168051ed447bd0a08e447
Author: Timo Heister <timo.heister at gmail.com>
Date:   Tue May 20 16:40:01 2014 -0400

    update inclusion benchmark again


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

818564a39c39ccd1ff2168051ed447bd0a08e447
 benchmark/inclusion/adaptive.prm                  |  9 ++-
 benchmark/inclusion/{base.prm => global.prm.base} |  9 ++-
 benchmark/inclusion/run.sh                        |  2 +-
 benchmark/inclusion/test.prm                      | 95 -----------------------
 4 files changed, 13 insertions(+), 102 deletions(-)

diff --git a/benchmark/inclusion/adaptive.prm b/benchmark/inclusion/adaptive.prm
index ad95fb2..2553804 100644
--- a/benchmark/inclusion/adaptive.prm
+++ b/benchmark/inclusion/adaptive.prm
@@ -1,5 +1,8 @@
 ############### Global parameters
 
+set Additional shared libraries            = ./libplugin.so
+
+
 set Dimension                              = 2
 
 set Start time                             = 0
@@ -23,14 +26,14 @@ end
 
 
 subsection Model settings
-  set Prescribed velocity boundary indicators = 0:inclusion, 1:inclusion, 2:inclusion, 3:inclusion
+  set Prescribed velocity boundary indicators = 0:InclusionBoundary, 1:InclusionBoundary, 2:InclusionBoundary, 3:InclusionBoundary
   set Tangential velocity boundary indicators =
   set Zero velocity boundary indicators       =
 end
 
 
 subsection Material model
-  set Model name = Inclusion
+  set Model name = InclusionMaterial
 
   subsection Inclusion
     set Viscosity jump = 1e3
@@ -80,7 +83,7 @@ end
 ############### Parameters describing the what to do with the solution
 
 subsection Postprocess
-  set List of postprocessors = DuretzEtAl error, visualization
+  set List of postprocessors = InclusionPostprocessor, visualization
 
 
 
diff --git a/benchmark/inclusion/base.prm b/benchmark/inclusion/global.prm.base
similarity index 81%
rename from benchmark/inclusion/base.prm
rename to benchmark/inclusion/global.prm.base
index cdeeb62..4fa2ed4 100644
--- a/benchmark/inclusion/base.prm
+++ b/benchmark/inclusion/global.prm.base
@@ -1,5 +1,8 @@
 ############### Global parameters
 
+set Additional shared libraries            = ./libplugin.so
+
+
 set Dimension                              = 2
 
 set Start time                             = 0
@@ -23,14 +26,14 @@ end
 
 
 subsection Model settings
-  set Prescribed velocity boundary indicators = 0:inclusion, 1:inclusion, 2:inclusion, 3:inclusion
+  set Prescribed velocity boundary indicators = 0:InclusionBoundary, 1:InclusionBoundary, 2:InclusionBoundary, 3:InclusionBoundary
   set Tangential velocity boundary indicators =
   set Zero velocity boundary indicators       =
 end
 
 
 subsection Material model
-  set Model name = Inclusion
+  set Model name = InclusionMaterial
 
   subsection Inclusion
     set Viscosity jump = 1e3
@@ -73,5 +76,5 @@ end
 ############### Parameters describing the what to do with the solution
 
 subsection Postprocess
-  set List of postprocessors = DuretzEtAl error, visualization
+  set List of postprocessors = InclusionPostprocessor, visualization
 end
diff --git a/benchmark/inclusion/run.sh b/benchmark/inclusion/run.sh
index f007b62..7e42990 100755
--- a/benchmark/inclusion/run.sh
+++ b/benchmark/inclusion/run.sh
@@ -6,7 +6,7 @@ mkdir output
 for r in "3" "4" "5" "6" "7" "8"
 do
 echo "ref $r:"
-cp base.prm temp.prm
+cp global.prm.base temp.prm
 echo "subsection Mesh refinement" >>temp.prm
 echo "set Initial global refinement = $r" >> temp.prm
 echo "end" >> temp.prm
diff --git a/benchmark/inclusion/test.prm b/benchmark/inclusion/test.prm
deleted file mode 100644
index 2553804..0000000
--- a/benchmark/inclusion/test.prm
+++ /dev/null
@@ -1,95 +0,0 @@
-############### Global parameters
-
-set Additional shared libraries            = ./libplugin.so
-
-
-set Dimension                              = 2
-
-set Start time                             = 0
-set End time                               = 0
-
-set Output directory                       = output
-
-set Pressure normalization                 = volume
-
-
-############### Parameters describing the model
-
-subsection Geometry model
-  set Model name = box
-
-  subsection Box
-    set X extent = 2
-    set Y extent = 2
-  end
-end
-
-
-subsection Model settings
-  set Prescribed velocity boundary indicators = 0:InclusionBoundary, 1:InclusionBoundary, 2:InclusionBoundary, 3:InclusionBoundary
-  set Tangential velocity boundary indicators =
-  set Zero velocity boundary indicators       =
-end
-
-
-subsection Material model
-  set Model name = InclusionMaterial
-
-  subsection Inclusion
-    set Viscosity jump = 1e3
-  end
-end
-
-
-subsection Gravity model
-  set Model name = vertical
-end
-
-
-############### Parameters describing the temperature field
-
-subsection Boundary temperature model
-  set Model name = box
-end
-
-
-subsection Initial conditions
-  set Model name = perturbed box
-end
-
-
-
-############### Parameters describing the discretization
-
-subsection Discretization
-  set Stokes velocity polynomial degree       = 2
-  set Use locally conservative discretization = false
-end
-
-
-subsection Mesh refinement
-  set Initial adaptive refinement              = 13
-  set Initial global refinement                = 3
-
-  set Strategy = velocity#viscosity
-  set Run postprocessors on initial refinement = true
-  set Coarsening fraction                      = 0.0
-  set Refinement fraction                      = 0.5
-
-
-end
-
-
-############### Parameters describing the what to do with the solution
-
-subsection Postprocess
-  set List of postprocessors = InclusionPostprocessor, visualization
-
-
-
-  subsection Visualization
-    set List of output variables = viscosity
-    set Time between graphical output = 0
-  end
-
-end