[cig-commits] r21450 - short/3D/PyLith/benchmarks/trunk/static/performance/solvertest

[brad at geodynamics.org]

Author: brad
Date: 2013-03-05 18:40:42 -0800 (Tue, 05 Mar 2013)
New Revision: 21450

Added:
   short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/pc_fieldsplit_mult_gamg.cfg
Modified:
   short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/geometry.jou
   short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/pylithapp.cfg
   short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/run_pctests.py
Log:
Added options file for replacing ml with gamg.

Modified: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/geometry.jou
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/geometry.jou	2013-03-06 02:22:31 UTC (rev 21449)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/geometry.jou	2013-03-06 02:40:42 UTC (rev 21450)
@@ -21,14 +21,14 @@
 # Create block
 # ----------------------------------------------------------------------
 
-# Block is 72 km x 72 km x 36 km
+# Block is 72 km x 72 km x 72 km
 # -36 km <= x <= 36 km
 # -36 km <= y <= 36 km
-# -36 km <= z <= 0 km
+# -72 km <= z <= 0 km
 #
 #{blockWidth=72.0*km}
 #{blockLength=72.0*km}
-#{blockHeight=36.0*km}
+#{blockHeight=72.0*km}
 
 brick x {blockWidth} y {blockLength} z {blockHeight}
 
@@ -89,3 +89,4 @@
 merge all
 
 # End of file
+

Added: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/pc_fieldsplit_mult_gamg.cfg
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/pc_fieldsplit_mult_gamg.cfg	                        (rev 0)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/pc_fieldsplit_mult_gamg.cfg	2013-03-06 02:40:42 UTC (rev 21450)
@@ -0,0 +1,16 @@
+[pylithapp.timedependent.formulation]
+split_fields = True
+matrix_type = aij
+
+[pylithapp.petsc]
+ksp_gmres_restart = 100
+fs_pc_type = fieldsplit
+fs_pc_fieldsplit_real_diagonal = true
+fs_pc_fieldsplit_type = multiplicative
+fs_fieldsplit_0_pc_type = gamg
+fs_fieldsplit_1_pc_type = jacobi
+fs_fieldsplit_0_ksp_type = preonly
+fs_fieldsplit_1_ksp_type = preonly
+
+fs_fieldsplit_0_pc_gamg_agg_nsmooths = 1
+fs_fieldsplit_0_pc_gamg_verbose = 2

Modified: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/pylithapp.cfg
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/pylithapp.cfg	2013-03-06 02:22:31 UTC (rev 21449)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/pylithapp.cfg	2013-03-06 02:40:42 UTC (rev 21450)
@@ -3,15 +3,15 @@
 # ----------------------------------------------------------------------
 # journal
 # ----------------------------------------------------------------------
-#[pylithapp.journal.info]
-#timedependent = 1
-#implicit = 1
-#petsc = 1
-#solverlinear = 1
-#meshimporter = 1
-#meshiocubit = 1
-#elasticityimplicit = 1
-#faultcohesivekin = 1
+[pylithapp.journal.info]
+timedependent = 1
+implicit = 1
+petsc = 1
+solverlinear = 1
+meshimporter = 1
+meshiocubit = 1
+elasticityimplicit = 1
+faultcohesivekin = 1
 
 #[pylithapp.journal.debug]
 #pylithapp = 1

Modified: short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/run_pctests.py
===================================================================
--- short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/run_pctests.py	2013-03-06 02:22:31 UTC (rev 21449)
+++ short/3D/PyLith/benchmarks/trunk/static/performance/solvertest/run_pctests.py	2013-03-06 02:40:42 UTC (rev 21450)
@@ -14,6 +14,7 @@
 if not sim in ["all", 
                "asm", 
                "fieldsplit",
+               "fieldsplit_gamg",
                "schur",
                ]:
     raise ValueError("Unknown preconditioner (%s) requested." % sim)
@@ -57,6 +58,13 @@
   runPyLith("pc_fieldsplit_mult.cfg pc_custom.cfg", "fieldsplit_mult_custom")
 
 # ----------------------------------------------------------------------
+if sim == "all" or sim == "fieldsplit_gamg":
+
+  # field split, multiplicative w/custom fault preconditioner
+  print "field split, gamg, multiplicative w/custom pc"
+  runPyLith("pc_fieldsplit_mult_gamg.cfg pc_custom.cfg", "fieldsplit_mult_gamg_custom")
+
+# ----------------------------------------------------------------------
 if sim == "all" or sim == "schur":
 
   # Schur complement, full