Got approximate reparametrization to work again. Also allows mixing of

pde and approximate reparametrization. Initial tests seem to indicate that
pde works better than approximate re-parametrization but is slower.


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/EHFinder/trunk@27 2a26948c-0e4f-0410-aee8-f1d3e353619c

1 files changed, 13 insertions, 7 deletions

diff --git a/param.ccl b/param.ccl
index 33629ab..d947d14 100644
--- a/param.ccl
+++ b/param.ccl
@@ -62,14 +62,15 @@ KEYWORD mode "Mode of operation"
 KEYWORD re_param_method "Integration method in re-parametrization"
 {
   "approx"  :: "Approximate re-parametrization scheme"
-  "pde"    :: "Re-parametrize by solving an pde"
-} "approx"
+  "pde"     :: "Re-parametrize by solving an pde"
+  "mixed"   :: "Use both schemes interchangably"
+} "pde"
 
 KEYWORD re_param_int_method "Integration method in pde re-parametrization"
 {
   "euler"  :: "Standard euler scheme"
   "rk2"    :: "Second order Runge-Kutta scheme"
-} "rk2"
+} "euler"
 
 INT re_param_max_iter "maximum number of iteration in the re-parametrization"
 {
@@ -81,12 +82,17 @@ KEYWORD pde_differences "Type of finite diffencing used in pde re-parametrizatio
   "centered" :: "Use 2nd order centered differences except at the boundaries"
   "upwind"   :: "Use 1st order upwinded differences everywhere"
   "upwind2"  :: "Use 2nd order upwinded differences everywhere"
-} "upwind"
+} "upwind2"
 
-INT reparametrize_every "Re-parametrize every"
+INT reparametrize_every_pde "Re-parametrize every using pde method"
 {
-0:               :: "If 0 don't re-parametrize"
-} 40
+0:               :: "If 0 don't re-parametrize using pde method"
+} 100
+
+INT reparametrize_every_approx "Re-parametrize every using approx method"
+{
+0:               :: "If 0 don't re-parametrize using approx method"
+} 10
 
 shares: grid