Merge branch 'master' into eschnett/dgfe

Conflicts:
	Tools/CodeGen/Jacobian.m

Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h

@@ -6,6 +6,7 @@
 #ifdef KRANC_C
 #  define Abs(x)        (fabs(x))
 #  define Min(x, y)     (fmin(x,y))
+#  define Min3(x, y, z) (fmin(fmin((x), (y)), (z)))
 #  define Max(x, y)     (fmax(x,y))
 #  define IfThen(x,y,z) ((x) ? (y) : (z))
 #else

Doc/KrancDoc.tex

@@ -968,6 +968,12 @@ \subsubsection{Named Arguments}
 
   KeywordParameters & list of KeywordParameterDefinition structures & A list of parameter definition structures for all the keyword parameters which this thorn will define and use.  (optional) & \{\} \\
 
+  ParameterConditions & list of parameter conditions & Each condition
+  is of the form \{\textit{condition}, \textit{message}\}, where
+  \textit{condition} is a boolean expression in parameter names, and
+  \textit{message} is the message for a fatal error which is generated
+  when the thorn starts if \textit{condition} is not satisfied & \{\} \\
+
   InheritedImplementations & list of strings & A list of all the implementations which this thorn
                                                will inherit from.  This is necessary to use grid functions
                                                provided by these implementations.  (optional) & \{\} \\

Examples/Advect/configuration.ccl

@@ -1,3 +1,6 @@
 # File produced by Kranc
 
 REQUIRES GenericFD
+OPTIONAL LoopControl
+{
+}

Examples/Advect/interface.ccl

@@ -10,6 +10,7 @@ USES INCLUDE: GenericFD.h
 USES INCLUDE: Symmetry.h
 USES INCLUDE: sbp_calc_coeffs.h
 USES INCLUDE: Boundary.h
+USES INCLUDE: loopcontrol.h
 
 CCTK_INT FUNCTION MoLRegisterEvolved(CCTK_INT IN EvolvedIndex, CCTK_INT IN RHSIndex)
 USES FUNCTION MoLRegisterEvolved

Examples/Advect/param.ccl

@@ -8,6 +8,7 @@ shares: GenericFD
 shares: MethodOfLines
 
 USES CCTK_INT MoL_Num_Evolved_Vars
+USES CCTK_INT MoL_Num_ArrayEvolved_Vars
 
 restricted:
 CCTK_INT verbose "verbose" STEERABLE=ALWAYS
@@ -33,12 +34,6 @@ CCTK_REAL amp "amp"
   "*:*" :: ""
 } 0
 
-restricted:
-CCTK_REAL hlleAlpha "hlleAlpha"
-{
-  "*:*" :: ""
-} 0
-
 private:
 KEYWORD initial_data "initial_data"
 {
@@ -52,6 +47,12 @@ CCTK_INT Advect_MaxNumEvolvedVars "Number of evolved variables used by this thor
   1:1 :: "Number of evolved variables used by this thorn"
 } 1
 
+restricted:
+CCTK_INT Advect_MaxNumArrayEvolvedVars "Number of Array evolved variables used by this thorn" ACCUMULATOR-BASE=MethodofLines::MoL_Num_ArrayEvolved_Vars STEERABLE=RECOVER
+{
+  0:0 :: "Number of Array evolved variables used by this thorn"
+} 0
+
 restricted:
 CCTK_INT timelevels "Number of active timelevels" STEERABLE=RECOVER
 {
@@ -64,6 +65,12 @@ CCTK_INT rhs_timelevels "Number of active RHS timelevels" STEERABLE=RECOVER
   0:3 :: ""
 } 1
 
+restricted:
+CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid functions" STEERABLE=RECOVER
+{
+  0:3 :: ""
+} 1
+
 restricted:
 CCTK_INT advect_initial_sine_calc_every "advect_initial_sine_calc_every" STEERABLE=ALWAYS
 {

Examples/Advect/schedule.ccl

@@ -1,11 +1,20 @@
 # File produced by Kranc
 
 
-STORAGE: F2rho_group[1]
+if (other_timelevels == 1)
+{
+  STORAGE: F2rho_group[1]
+}
 
-STORAGE: Frho_group[1]
+if (other_timelevels == 1)
+{
+  STORAGE: Frho_group[1]
+}
 
-STORAGE: v_group[1]
+if (other_timelevels == 1)
+{
+  STORAGE: v_group[1]
+}
 
 if (timelevels == 1)
 {
@@ -39,12 +48,6 @@ schedule Advect_Startup at STARTUP
   OPTIONS: meta
 } "create banner"
 
-schedule Advect_RegisterVars in MoL_Register
-{
-  LANG: C
-  OPTIONS: meta
-} "Register Variables for MoL"
-
 schedule Advect_RegisterSymmetries in SymmetryRegister
 {
   LANG: C
@@ -57,6 +60,11 @@ if (CCTK_EQUALS(initial_data, "sine"))
   schedule advect_initial_sine at CCTK_INITIAL as advect_initial
   {
     LANG: C
+    READS:    grid::x
+    WRITES:   Advect::rho
+    WRITES:   Advect::v1
+    WRITES:   Advect::v2
+    WRITES:   Advect::v3
   } "advect_initial_sine"
 }
 
@@ -66,17 +74,33 @@ if (CCTK_EQUALS(initial_data, "shock"))
   schedule advect_initial_shock at CCTK_INITIAL as advect_initial
   {
     LANG: C
+    READS:    grid::x
+    WRITES:   Advect::rho
+    WRITES:   Advect::v1
+    WRITES:   Advect::v2
+    WRITES:   Advect::v3
   } "advect_initial_shock"
 }
 
 schedule advect_evol in MoL_CalcRHS
 {
   LANG: C
+  READS:    Advect::Frho1
+  READS:    Advect::Frho2
+  READS:    Advect::Frho3
+  WRITES:   Advect::rhorhs
 } "advect_evol"
 
 schedule advect_flux in MoL_PostStep after Advect_ApplyBCs
 {
   LANG: C
+  READS:    Advect::rho
+  READS:    Advect::v1
+  READS:    Advect::v2
+  READS:    Advect::v3
+  WRITES:   Advect::Frho1
+  WRITES:   Advect::Frho2
+  WRITES:   Advect::Frho3
 } "advect_flux"
 
 schedule Advect_SelectBoundConds in MoL_PostStep
@@ -92,6 +116,12 @@ schedule Advect_CheckBoundaries at BASEGRID
   OPTIONS: meta
 } "check boundaries treatment"
 
+schedule Advect_RegisterVars in MoL_Register
+{
+  LANG: C
+  OPTIONS: meta
+} "Register Variables for MoL"
+
 schedule group ApplyBCs as Advect_ApplyBCs in MoL_PostStep after Advect_SelectBoundConds
 {
   # no language specified