[cig-commits] [commit] kommu/aspect-citcom-benchmarks: Added the A2 and A4 benchmark config files; corrected A1,A3,A8 (9a8a520)

[cig_noreply at geodynamics.org]

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

On branch  : kommu/aspect-citcom-benchmarks
Link       : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd

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

commit 9a8a520cb077e080faa5eb17d4880b920d64bd30
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Fri May 2 13:31:14 2014 -0700

    Added the A2 and A4 benchmark config files; corrected A1,A3,A8


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

9a8a520cb077e080faa5eb17d4880b920d64bd30
 benchmarks/A1-benchmark                   |  7 ++++---
 benchmarks/{A3-benchmark => A2-benchmark} | 28 ++++++++++++++--------------
 benchmarks/A3-benchmark                   |  6 +++---
 benchmarks/{A3-benchmark => A4-benchmark} | 28 ++++++++++++++--------------
 benchmarks/A8-benchmark                   |  1 +
 5 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/benchmarks/A1-benchmark b/benchmarks/A1-benchmark
index 5e45a5b..5302637 100644
--- a/benchmarks/A1-benchmark
+++ b/benchmarks/A1-benchmark
@@ -1,6 +1,6 @@
 # CitcomS
 cpu_limits_in_seconds=360000000
-minstep=10000
+minstep=40001
 solver=full
 
 # CitcomS.controller
@@ -10,8 +10,7 @@ storage_spacing=100
 # CitcomS.solver
 datadir=A1-benchmark
 datafile=A1-benchmark
-#rayleigh=7.681755e4
-rayleigh=7e3
+rayleigh=7.681755e4
 
 # CitcomS.solver.mesher
 fi_max=1
@@ -54,12 +53,14 @@ tic_method=0
 # CitcomS.solver.output
 output_ll_max=40
 output_optional=geoid,surf,botm,horiz_avg,volume_avg
+output_format=vtk
 use_cbf_topo=on
 
 # CitcomS.solver.visc
 TDEPV=on
 VISC_UPDATE=on
 num_mat=4
+rheol=1
 visc0=1,1,1,1
 viscE=0.0,0.0,0.0,0.0
 viscT=0.5,0.5,0.5,0.5
diff --git a/benchmarks/A3-benchmark b/benchmarks/A2-benchmark
similarity index 86%
copy from benchmarks/A3-benchmark
copy to benchmarks/A2-benchmark
index 8c9f995..f33d0b0 100644
--- a/benchmarks/A3-benchmark
+++ b/benchmarks/A2-benchmark
@@ -1,6 +1,6 @@
 # CitcomS
 cpu_limits_in_seconds=360000000
-minstep=11000
+minstep=50001
 solver=full
 
 # CitcomS.controller
@@ -8,10 +8,9 @@ checkpointFrequency=5000
 storage_spacing=100
 
 # CitcomS.solver
-datadir=A3-benchmark
-datafile=A3-benchmark
-#rayleigh=7.681755e4
-rayleigh=7e3
+datadir=A2-benchmark
+datafile=A2-benchmark
+rayleigh=7.681755e4
 
 # CitcomS.solver.mesher
 fi_max=1
@@ -30,14 +29,6 @@ mgunitx=2
 mgunity=2
 mgunitz=2
 
-# CitcomS.solver.ic
-num_perturbations=1
-perturbl=3
-perturblayer=16
-perturbm=2
-perturbmag=0.01
-tic_method=0
-
 # CitcomS.solver.vsolver
 Solver=multigrid
 precond=on
@@ -51,9 +42,18 @@ vhighstep=3
 max_mg_cycles=200
 piterations=1500
 
+# CitcomS.solver.ic
+num_perturbations=1
+perturbl=3
+perturblayer=16
+perturbm=2
+perturbmag=0.01
+tic_method=0
+
 # CitcomS.solver.output
 output_ll_max=40
 output_optional=geoid,surf,botm,horiz_avg,volume_avg
+output_format=vtk
 use_cbf_topo=on
 
 # CitcomS.solver.visc
@@ -62,6 +62,6 @@ VISC_UPDATE=on
 num_mat=4
 rheol=1
 visc0=1,1,1,1
-viscE=3.0,3.0,3.0,3.0
+viscE=2.3026,2.3026,2.3026,2.3026
 viscT=0.5,0.5,0.5,0.5
 
diff --git a/benchmarks/A3-benchmark b/benchmarks/A3-benchmark
index 8c9f995..f1c0f16 100644
--- a/benchmarks/A3-benchmark
+++ b/benchmarks/A3-benchmark
@@ -1,6 +1,6 @@
 # CitcomS
 cpu_limits_in_seconds=360000000
-minstep=11000
+minstep=50001
 solver=full
 
 # CitcomS.controller
@@ -10,8 +10,7 @@ storage_spacing=100
 # CitcomS.solver
 datadir=A3-benchmark
 datafile=A3-benchmark
-#rayleigh=7.681755e4
-rayleigh=7e3
+rayleigh=7.681755e4
 
 # CitcomS.solver.mesher
 fi_max=1
@@ -54,6 +53,7 @@ piterations=1500
 # CitcomS.solver.output
 output_ll_max=40
 output_optional=geoid,surf,botm,horiz_avg,volume_avg
+output_format=vtk
 use_cbf_topo=on
 
 # CitcomS.solver.visc
diff --git a/benchmarks/A3-benchmark b/benchmarks/A4-benchmark
similarity index 86%
copy from benchmarks/A3-benchmark
copy to benchmarks/A4-benchmark
index 8c9f995..f7e23df 100644
--- a/benchmarks/A3-benchmark
+++ b/benchmarks/A4-benchmark
@@ -1,6 +1,6 @@
 # CitcomS
 cpu_limits_in_seconds=360000000
-minstep=11000
+minstep=75001
 solver=full
 
 # CitcomS.controller
@@ -8,10 +8,9 @@ checkpointFrequency=5000
 storage_spacing=100
 
 # CitcomS.solver
-datadir=A3-benchmark
-datafile=A3-benchmark
-#rayleigh=7.681755e4
-rayleigh=7e3
+datadir=A4-benchmark
+datafile=A4-benchmark
+rayleigh=7.681755e4
 
 # CitcomS.solver.mesher
 fi_max=1
@@ -30,14 +29,6 @@ mgunitx=2
 mgunity=2
 mgunitz=2
 
-# CitcomS.solver.ic
-num_perturbations=1
-perturbl=3
-perturblayer=16
-perturbm=2
-perturbmag=0.01
-tic_method=0
-
 # CitcomS.solver.vsolver
 Solver=multigrid
 precond=on
@@ -51,9 +42,18 @@ vhighstep=3
 max_mg_cycles=200
 piterations=1500
 
+# CitcomS.solver.ic
+num_perturbations=1
+perturbl=3
+perturblayer=16
+perturbm=2
+perturbmag=0.01
+tic_method=0
+
 # CitcomS.solver.output
 output_ll_max=40
 output_optional=geoid,surf,botm,horiz_avg,volume_avg
+output_format=vtk
 use_cbf_topo=on
 
 # CitcomS.solver.visc
@@ -62,6 +62,6 @@ VISC_UPDATE=on
 num_mat=4
 rheol=1
 visc0=1,1,1,1
-viscE=3.0,3.0,3.0,3.0
+viscE=4.6052,4.6052,4.6052,4.6052
 viscT=0.5,0.5,0.5,0.5
 
diff --git a/benchmarks/A8-benchmark b/benchmarks/A8-benchmark
index b7c890d..c6016db 100644
--- a/benchmarks/A8-benchmark
+++ b/benchmarks/A8-benchmark
@@ -54,6 +54,7 @@ piterations=1500
 # CitcomS.solver.output
 output_ll_max=40
 output_optional=geoid,surf,botm,horiz_avg,volume_avg
+output_format=vtk
 use_cbf_topo=on
 
 # CitcomS.solver.visc