Merge master into vector

Fixed conflicts in:
	Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/GenericFD.h

1 files changed, 20 insertions, 19 deletions

diff --git a/Tools/CodeGen/Param.m b/Tools/CodeGen/Param.m
index 7821f40..90cbb7d 100644
--- a/Tools/CodeGen/Param.m
+++ b/Tools/CodeGen/Param.m
@@ -72,14 +72,16 @@ krancParamStructExtended[definition_, type_] :=
      AllowedValues -> Map[{Value -> #, Description -> ""} &, allowedValues]}];
 
 krancKeywordParamStruct[struct_] :=
-{
-  Name -> lookup[struct, Name],
-  Type -> "KEYWORD",
-  Default -> lookup[struct, Default],
-  Description -> lookupDefault[struct, Description, lookup[struct, Name]],
-  Visibility -> lookupDefault[struct, Visibility, "private"],
-  AllowedValues -> Map[{Value -> #, Description -> #} &, lookup[struct, AllowedValues]]
-};
+  Join[
+  {Name -> lookup[struct, Name],
+   Type -> "KEYWORD",
+   Default -> lookup[struct, Default],
+   Description -> lookupDefault[struct, Description, lookup[struct, Name]],
+   Visibility -> lookupDefault[struct, Visibility, "private"]},
+  If[mapContains[struct, Steerable],
+    {Steerable -> lookup[struct, Steerable]},
+    {}],
+  {AllowedValues -> Map[{Value -> #, Description -> #} &, lookup[struct, AllowedValues]]}];
 
 MakeFullParamDefs[params_] :=
   Module[{p},
@@ -146,7 +148,8 @@ CreateKrancParam[evolvedGroups_, nonevolvedGroups_, groups_, thornName_,
       Visibility -> "restricted",
       AccumulatorBase -> "MethodofLines::MoL_Num_Evolved_Vars",
       AllowedValues -> {{Value -> ToString[nEvolved] <> ":" <> ToString[nEvolved] , 
-                         Description -> "Number of evolved variables used by this thorn"}}
+                         Description -> "Number of evolved variables used by this thorn"}},
+      Steerable -> Recover
     };
 
     (*
@@ -171,7 +174,8 @@ CreateKrancParam[evolvedGroups_, nonevolvedGroups_, groups_, thornName_,
       Description -> "Number of active timelevels",
       Visibility -> "restricted",
       AllowedValues -> {{Value -> ToString[0] <> ":" <> ToString[evolutionTimelevels],
-                         Description -> ""}}
+                         Description -> ""}},
+      Steerable -> Recover
     };
 
     rhsTimelevelsParam =
@@ -182,25 +186,22 @@ CreateKrancParam[evolvedGroups_, nonevolvedGroups_, groups_, thornName_,
       Description -> "Number of active RHS timelevels",
       Visibility -> "restricted",
       AllowedValues -> {{Value -> ToString[0] <> ":" <> ToString[evolutionTimelevels],
-                         Description -> ""}}
+                         Description -> ""}},
+      Steerable -> Recover
     };
 
     genericfdStruct =
     {
       Name -> "GenericFD",
       UsedParameters -> 
-        {{Name -> "stencil_width",    Type -> "CCTK_INT"},
-         {Name -> "stencil_width_x",  Type -> "CCTK_INT"},
-         {Name -> "stencil_width_y",  Type -> "CCTK_INT"},
-         {Name -> "stencil_width_z",  Type -> "CCTK_INT"},
-         {Name -> "boundary_width",   Type -> "CCTK_INT"}}
+        {}
     };
 
     realStructs = Map[krancParamStruct[#, "CCTK_REAL", False] &, reals];
-    verboseStruct = krancParamStruct[{Name -> "verbose", Default -> 0}, "CCTK_INT", False];
+    verboseStruct = krancParamStruct[{Name -> "verbose", Default -> 0, Steerable -> Always}, "CCTK_INT", False];
     intStructs = Map[krancParamStruct[#, "CCTK_INT", False] &, ints];
-    calcEveryStructs = Map[krancParamStruct[{Name -> lookup[#, Name] <> "_calc_every", Default -> 1}, "CCTK_INT", False] &, calcs];
-    calcOffsetStructs = Map[krancParamStruct[{Name -> lookup[#, Name] <> "_calc_offset", Default -> 0}, "CCTK_INT", False] &, calcs];
+    calcEveryStructs = Map[krancParamStruct[{Name -> lookup[#, Name] <> "_calc_every", Default -> 1, Steerable -> Always}, "CCTK_INT", False] &, calcs];
+    calcOffsetStructs = Map[krancParamStruct[{Name -> lookup[#, Name] <> "_calc_offset", Default -> 0, Steerable -> Always}, "CCTK_INT", False] &, calcs];
     keywordStructs = Map[krancKeywordParamStruct, keywords];
 
     allInherited = Join[inheritedReals, inheritedInts, inheritedKeywords];