[cig-commits] commit: Simplify sinker and sinker3D for parallel tests

[Mercurial]

changeset:   188:3855931f7410
user:        Walter Landry <wlandry at caltech.edu>
date:        Fri Apr 22 14:53:20 2011 -0700
files:       input/sinker.input input/sinker3D.input
description:
Simplify sinker and sinker3D for parallel tests


diff -r 6995d49a0645 -r 3855931f7410 input/sinker.input
--- a/input/sinker.input	Fri Apr 22 14:03:46 2011 -0700
+++ b/input/sinker.input	Fri Apr 22 14:53:20 2011 -0700
@@ -32,18 +32,18 @@ FACStokes {
         // This is the input for the cell-centered Stokes FAC solver
         // class in the SAMRAI library.
         enable_logging = TRUE   // Bool flag to switch logging on/off
-        max_cycles = 100         // Max number of FAC cycles to use
+        max_cycles = 3         // Max number of FAC cycles to use
         residual_tol = 1e-3     // Residual tolerance to solve for
-        num_pre_sweeps = 50      // Number of presmoothing sweeps to use
-        num_post_sweeps = 50     // Number of postsmoothing sweeps to use
+        num_pre_sweeps = 3      // Number of presmoothing sweeps to use
+        num_post_sweeps = 3     // Number of postsmoothing sweeps to use
         smoothing_choice = "Tackley"
         coarse_solver_choice = "Tackley"
         // smoothing_choice = "Gerya"
         // coarse_solver_choice = "Gerya"
-        coarse_solver_max_iterations = 2500
+        coarse_solver_max_iterations = 3
         coarse_solver_tolerance = 1e-5
-        p_prolongation_method = "P_MDPI_REFINE"
-        // p_prolongation_method = "P_REFINE"
+        // p_prolongation_method = "P_MDPI_REFINE"
+        p_prolongation_method = "P_REFINE"
         v_prolongation_method = "V_REFINE"
     }
     bc_coefs {
@@ -118,7 +118,7 @@ PatchHierarchy {
     //              [level 0 entry]
     //   etc....                       
     // }
-    max_levels = 6
+    max_levels = 3
     proper_nesting_buffer = 2, 2, 2, 2, 2, 2
     ratio_to_coarser {
         level_1            = 2, 2
diff -r 6995d49a0645 -r 3855931f7410 input/sinker3D.input
--- a/input/sinker3D.input	Fri Apr 22 14:03:46 2011 -0700
+++ b/input/sinker3D.input	Fri Apr 22 14:53:20 2011 -0700
@@ -32,18 +32,18 @@ FACStokes {
         // This is the input for the cell-centered Stokes FAC solver
         // class in the SAMRAI library.
         enable_logging = TRUE   // Bool flag to switch logging on/off
-        max_cycles = 100         // Max number of FAC cycles to use
-        residual_tol = 1e-5     // Residual tolerance to solve for
-        num_pre_sweeps = 0      // Number of presmoothing sweeps to use
-        num_post_sweeps = 0     // Number of postsmoothing sweeps to use
+        max_cycles = 3         // Max number of FAC cycles to use
+        residual_tol = 1e-3     // Residual tolerance to solve for
+        num_pre_sweeps = 3      // Number of presmoothing sweeps to use
+        num_post_sweeps = 3     // Number of postsmoothing sweeps to use
         smoothing_choice = "Tackley"
         coarse_solver_choice = "Tackley"
         // smoothing_choice = "Gerya"
         // coarse_solver_choice = "Gerya"
-        coarse_solver_max_iterations = 250
-        coarse_solver_tolerance = 1e-8
-        // p_prolongation_method = "P_MDPI_REFINE"
-        p_prolongation_method = "P_REFINE"
+        coarse_solver_max_iterations = 3
+        coarse_solver_tolerance = 1e-5
+        p_prolongation_method = "P_MDPI_REFINE"
+        // p_prolongation_method = "P_REFINE"
         v_prolongation_method = "V_REFINE"
     }
     bc_coefs {
@@ -118,7 +118,7 @@ PatchHierarchy {
     //              [level 0 entry]
     //   etc....                       
     // }
-    max_levels = 5
+    max_levels = 3
     proper_nesting_buffer = 2, 2, 2, 2, 2, 2
     ratio_to_coarser {
         level_1            = 2, 2, 2