[cig-commits] commit: Make smoothError call smooth_Tackley_3D

[Mercurial]

changeset:   144:cb8e50485149
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Sat Mar 19 20:15:50 2011 -0700
files:       StokesFACOps/smoothError.C
description:
Make smoothError call smooth_Tackley_3D


diff -r 7efb4c4ae4fc -r cb8e50485149 StokesFACOps/smoothError.C
--- a/StokesFACOps/smoothError.C	Sat Mar 19 15:51:11 2011 -0700
+++ b/StokesFACOps/smoothError.C	Sat Mar 19 20:15:50 2011 -0700
@@ -55,17 +55,15 @@ void SAMRAI::solv::StokesFACOps::smoothE
 
   checkInputPatchDataIndices();
   if (d_smoothing_choice == "Gerya") {
-    smooth_Gerya(data,
-                 residual,
-                 ln,
-                 num_sweeps,
+    smooth_Gerya(data,residual,ln,num_sweeps,
                  d_residual_tolerance_during_smoothing);
   } else if (d_smoothing_choice == "Tackley") {
-    smooth_Tackley_2D(data,
-                   residual,
-                   ln,
-                   num_sweeps,
-                   d_residual_tolerance_during_smoothing);
+    if(d_dim.getValue()==2)
+      smooth_Tackley_2D(data,residual,ln,num_sweeps,
+                        d_residual_tolerance_during_smoothing);
+    else if(d_dim.getValue()==3)
+      smooth_Tackley_3D(data,residual,ln,num_sweeps,
+                        d_residual_tolerance_during_smoothing);
   } else {
     TBOX_ERROR(d_object_name << ": Bad smoothing choice '"
                << d_smoothing_choice