remote the factor epsdisp from the slopes. This means that you have to change

the slope values in your old parameter files by dividing by the slope value used
to get the old behaviour.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/Dissipation/trunk@11 850bcc8b-0e4f-0410-8c26-8d28fbf1eda9

4 files changed, 13 insertions, 13 deletions

diff --git a/param.ccl b/param.ccl
index 3b4725f..30578a0 100644
--- a/param.ccl
+++ b/param.ccl
@@ -1,4 +1,4 @@
-# Parameter definitions for thorn Dissipation
+#: Parameter definitions for thorn Dissipation
 # $Header$
 
 BOOLEAN verbose "produce log output" STEERABLE=always
@@ -34,7 +34,7 @@ INT update_ah_every "how often to update the AH information for dissipation" STE
   0:* :: "positive iteration number"
 } 1
 
-REAL ah_slope "Slope (epsdis / distance) inside AH" STEERABLE=always
+REAL ah_slope "Slope inside AH" STEERABLE=always
 {
   *:* :: "0 for no dissipation.  Unstable when total epsdis<0 or total epsdis>1/3"
 } 0.2
@@ -64,7 +64,7 @@ INT outer_bound_npoints "number of points in which dissipation should be increas
   0:* :: "positive number"
 } 3
 
-REAL ob_slope "slope (epsdis / distance) at outer boundary" STEERABLE=always
+REAL ob_slope "slope at outer boundary" STEERABLE=always
 {
   0:* :: "increase dissipation"
 } 5
diff --git a/src/setup_epsdis.c b/src/setup_epsdis.c
index 9a3b2cf..5acb649 100644
--- a/src/setup_epsdis.c
+++ b/src/setup_epsdis.c
@@ -66,7 +66,7 @@ setup_epsdis (CCTK_ARGUMENTS)
           for (i=0;i<outer_bound_npoints;i++) {
             index = CCTK_GFINDEX3D(cctkGH,i,j,k);
             indexP= CCTK_GFINDEX3D(cctkGH,outer_bound_npoints,j,k); 
-            epsdisA[index]=epsdis+epsdis*ob_slope*abs(x[index]-x[indexP]);
+            epsdisA[index]=epsdis+ob_slope*abs(x[index]-x[indexP]);
           }
         }
       }
@@ -77,7 +77,7 @@ setup_epsdis (CCTK_ARGUMENTS)
           for (i=ni;i>ni-outer_bound_npoints;i--) {
             index = CCTK_GFINDEX3D(cctkGH,i,j,k);
             indexP= CCTK_GFINDEX3D(cctkGH,ni-outer_bound_npoints,j,k); 
-            epsdisA[index]=epsdis+epsdis*ob_slope*abs(x[index]-x[indexP]);
+            epsdisA[index]=epsdis+ob_slope*abs(x[index]-x[indexP]);
           }
         }
       }
@@ -89,7 +89,7 @@ setup_epsdis (CCTK_ARGUMENTS)
           for (i=0;i<ni;i++) {
             index = CCTK_GFINDEX3D(cctkGH,i,j,k);
             indexP= CCTK_GFINDEX3D(cctkGH,i,outer_bound_npoints,k); 
-            epsdisA[index]=epsdis+epsdis*ob_slope*abs(y[index]-y[indexP]);
+            epsdisA[index]=epsdis+ob_slope*abs(y[index]-y[indexP]);
           }
         }
       }
@@ -100,7 +100,7 @@ setup_epsdis (CCTK_ARGUMENTS)
           for (i=0;i<ni;i++) {
             index = CCTK_GFINDEX3D(cctkGH,i,j,k);
             indexP= CCTK_GFINDEX3D(cctkGH,i,nj-outer_bound_npoints,k); 
-            epsdisA[index]=epsdis+epsdis*ob_slope*abs(y[index]-y[indexP]);
+            epsdisA[index]=epsdis+ob_slope*abs(y[index]-y[indexP]);
           }
         }
       }
@@ -112,7 +112,7 @@ setup_epsdis (CCTK_ARGUMENTS)
           for (i=0;i<ni;i++) {
             index = CCTK_GFINDEX3D(cctkGH,i,j,k);
             indexP= CCTK_GFINDEX3D(cctkGH,i,j,outer_bound_npoints); 
-            epsdisA[index]=epsdis+epsdis*ob_slope*abs(z[index]-z[indexP]);
+            epsdisA[index]=epsdis+ob_slope*abs(z[index]-z[indexP]);
           }
         }
       }
@@ -123,7 +123,7 @@ setup_epsdis (CCTK_ARGUMENTS)
           for (i=0;i<ni;i++) {
             index = CCTK_GFINDEX3D(cctkGH,i,j,k);
             indexP= CCTK_GFINDEX3D(cctkGH,i,j,nk-outer_bound_npoints); 
-            epsdisA[index]=epsdis+epsdis*ob_slope*abs(z[index]-z[indexP]);
+            epsdisA[index]=epsdis+ob_slope*abs(z[index]-z[indexP]);
           }
         }
       }
@@ -219,7 +219,7 @@ setup_epsdis (CCTK_ARGUMENTS)
       for (i=0;i<npts;i++) {
         radp=sqrt(xa[i]*xa[i]+ya[i]*ya[i]+za[i]*za[i]);
         if (radp<=rads[i]) {
-          epsdisA[inds[i]]=epsdis+ ah_slope*(rads[i]-radp)*epsdis;
+          epsdisA[inds[i]]=epsdis+ ah_slope*(rads[i]-radp);
         }
       }
 
diff --git a/test/test_ah.par b/test/test_ah.par
index 46805cd..15c9835 100644
--- a/test/test_ah.par
+++ b/test/test_ah.par
@@ -121,7 +121,7 @@ ahfinderdirect::which_surface_to_store_info          [1] = 0
 
 
 #--- dissipation
-dissipation::ah_slope = 10.0
+dissipation::ah_slope = 2.0
 dissipation::epsdis   = 0.2
 dissipation::verbose = "no"
 dissipation::extra_dissipation_in_horizons = "yes"
diff --git a/test/test_ob.par b/test/test_ob.par
index f3ddfea..a2872c3 100644
--- a/test/test_ob.par
+++ b/test/test_ob.par
@@ -121,7 +121,7 @@ ahfinderdirect::which_surface_to_store_info          [1] = 0
 
 
 #--- dissipation
-dissipation::ah_slope = 10.0
+dissipation::ah_slope = 2.0
 dissipation::epsdis   = 0.2
 dissipation::verbose = "no"
 dissipation::extra_dissipation_in_horizons = "yes"
@@ -130,7 +130,7 @@ dissipation::surface_number[0] = 0
 dissipation::horizon_number[0] = 1
 dissipation::extra_dissipation_at_outerbound = "yes"
 dissipation::outer_bound_npoints = 5
-dissipation::ob_slope = 5
+dissipation::ob_slope = 1
 Dissipation::vars = "
         ADM_BSSN::ADM_BSSN_phi
         ADM_BSSN::ADM_BSSN_metric