Regenerate Wave example with master branch commit eca6928

ianhinder · Mar 7, 2014 · e4a501e · e4a501e
1 parent ded7a7d
commit e4a501e
Show file tree

Hide file tree

Showing 18 changed files with 1,152 additions and 828 deletions.
diff --git a/Examples/Wave/interface.ccl b/Examples/Wave/interface.ccl
@@ -2,15 +2,14 @@
 
 implements: Wave
 
-inherits:   Grid GenericFD Boundary
+inherits:   Boundary GenericFD Grid
 
 
 
 USES INCLUDE: GenericFD.h
+USES INCLUDE: loopcontrol.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
@@ -28,11 +27,11 @@ CCTK_INT FUNCTION Boundary_SelectVarForBC(CCTK_POINTER_TO_CONST IN GH, CCTK_INT
 USES FUNCTION Boundary_SelectVarForBC
 
 public:
-CCTK_REAL errors type=GF timelevels=3 tags=''
+CCTK_REAL evolved type=GF timelevels=3 tags=''
 {
-  phiError,
-  piError
-} "errors"
+  phi,
+  pi
+} "evolved"
 
 public:
 CCTK_REAL exact type=GF timelevels=3 tags=''
@@ -41,6 +40,13 @@ CCTK_REAL exact type=GF timelevels=3 tags=''
   piExact
 } "exact"
 
+public:
+CCTK_REAL errors type=GF timelevels=3 tags=''
+{
+  phiError,
+  piError
+} "errors"
+
 public:
 CCTK_REAL norms type=GF timelevels=3 tags=''
 {
@@ -49,13 +55,6 @@ CCTK_REAL norms type=GF timelevels=3 tags=''
   EL2
 } "norms"
 
-public:
-CCTK_REAL evolved type=GF timelevels=3 tags=''
-{
-  phi,
-  pi
-} "evolved"
-
 public:
 CCTK_REAL evolvedrhs type=GF timelevels=3 tags='Prolongation="None"'
 {

diff --git a/Examples/Wave/param.ccl b/Examples/Wave/param.ccl
@@ -3,6 +3,7 @@
 
 shares: GenericFD
 
+USES CCTK_INT assume_stress_energy_state
 
 
 shares: MethodOfLines
@@ -16,6 +17,12 @@ CCTK_INT verbose "verbose" STEERABLE=ALWAYS
   *:* :: ""
 } 0
 
+restricted:
+CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid functions" STEERABLE=RECOVER
+{
+  0:3 :: ""
+} 1
+
 restricted:
 CCTK_REAL periodicity "periodicity"
 {
@@ -79,21 +86,28 @@ CCTK_REAL diss "diss"
 restricted:
 CCTK_INT fdOrder "fdOrder"
 {
-  *:* :: ""
+  2 :: ""
+  4 :: ""
 } 2
 
+restricted:
+CCTK_INT tile_size "Loop tile size"
+{
+  *:* :: ""
+} -1
+
 private:
 KEYWORD initial_data "initial_data"
 {
-  "gaussian" :: "gaussian"
-  "sine" :: "sine"
+  "gaussian" :: ""
+  "sine" :: ""
 } "gaussian"
 
 private:
 KEYWORD boundary_condition "boundary_condition"
 {
-  "none" :: "none"
-  "radiative" :: "radiative"
+  "none" :: ""
+  "radiative" :: ""
 } "radiative"
 
 restricted:
@@ -120,12 +134,6 @@ 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 wave_exact_sine_calc_every "wave_exact_sine_calc_every" STEERABLE=ALWAYS
 {

diff --git a/Examples/Wave/schedule.ccl b/Examples/Wave/schedule.ccl
@@ -1,70 +1,15 @@
 # File produced by Kranc
 
 
-if (timelevels == 1)
-{
-  STORAGE: errors[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: errors[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: errors[3]
-}
+STORAGE: evolved[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: exact[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: exact[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: exact[3]
-}
+STORAGE: exact[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: norms[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: norms[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: norms[3]
-}
+STORAGE: errors[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: evolved[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: evolved[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: evolved[3]
-}
+STORAGE: norms[timelevels]
 
-if (rhs_timelevels == 1)
-{
-  STORAGE: evolvedrhs[1]
-}
-if (rhs_timelevels == 2)
-{
-  STORAGE: evolvedrhs[2]
-}
-if (rhs_timelevels == 3)
-{
-  STORAGE: evolvedrhs[3]
-}
+STORAGE: evolvedrhs[rhs_timelevels]
 
 schedule Wave_Startup at STARTUP
 {
@@ -84,11 +29,11 @@ if (CCTK_EQUALS(initial_data, "sine"))
   schedule wave_exact_sine AT INITIAL before import_exact before import_exact
   {
     LANG: C
-    READS:    grid::x(Everywhere)
-    READS:    grid::y(Everywhere)
-    READS:    grid::z(Everywhere)
-    WRITES:   Wave::phiExact(Everywhere)
-    WRITES:   Wave::piExact(Everywhere)
+    READS: grid::x(Everywhere)
+    READS: grid::y(Everywhere)
+    READS: grid::z(Everywhere)
+    WRITES: Wave::phiExact(Everywhere)
+    WRITES: Wave::piExact(Everywhere)
   } "wave_exact_sine"
 }
 
@@ -98,11 +43,11 @@ if (CCTK_EQUALS(initial_data, "sine"))
   schedule wave_exact_sine AT POSTSTEP before calc_errors before import_exact
   {
     LANG: C
-    READS:    grid::x(Everywhere)
-    READS:    grid::y(Everywhere)
-    READS:    grid::z(Everywhere)
-    WRITES:   Wave::phiExact(Everywhere)
-    WRITES:   Wave::piExact(Everywhere)
+    READS: grid::x(Everywhere)
+    READS: grid::y(Everywhere)
+    READS: grid::z(Everywhere)
+    WRITES: Wave::phiExact(Everywhere)
+    WRITES: Wave::piExact(Everywhere)
   } "wave_exact_sine"
 }
 
@@ -112,9 +57,9 @@ if (CCTK_EQUALS(initial_data, "gaussian"))
   schedule wave_exact_gaussian AT INITIAL before import_exact before import_exact
   {
     LANG: C
-    READS:    grid::r(Everywhere)
-    WRITES:   Wave::phiExact(Everywhere)
-    WRITES:   Wave::piExact(Everywhere)
+    READS: grid::r(Everywhere)
+    WRITES: Wave::phiExact(Everywhere)
+    WRITES: Wave::piExact(Everywhere)
   } "wave_exact_gaussian"
 }
 
@@ -124,52 +69,52 @@ if (CCTK_EQUALS(initial_data, "gaussian"))
   schedule wave_exact_gaussian AT POSTSTEP before calc_errors before import_exact
   {
     LANG: C
-    READS:    grid::r(Everywhere)
-    WRITES:   Wave::phiExact(Everywhere)
-    WRITES:   Wave::piExact(Everywhere)
+    READS: grid::r(Everywhere)
+    WRITES: Wave::phiExact(Everywhere)
+    WRITES: Wave::piExact(Everywhere)
   } "wave_exact_gaussian"
 }
 
 schedule wave_import_exact at INITIAL as import_exact
 {
   LANG: C
-  READS:    Wave::phiExact(Everywhere)
-  READS:    Wave::piExact(Everywhere)
-  WRITES:   Wave::phi(Everywhere)
-  WRITES:   Wave::pi(Everywhere)
+  READS: Wave::phiExact(Everywhere)
+  READS: Wave::piExact(Everywhere)
+  WRITES: Wave::phi(Everywhere)
+  WRITES: Wave::pi(Everywhere)
 } "wave_import_exact"
 
 schedule wave_evolve in MoL_CalcRHS as evolve
 {
   LANG: C
-  READS:    Wave::phi(Everywhere)
-  READS:    Wave::pi(Everywhere)
-  WRITES:   Wave::phirhs(Interior)
-  WRITES:   Wave::pirhs(Interior)
+  READS: Wave::phi(Everywhere)
+  READS: Wave::pi(Everywhere)
+  WRITES: Wave::phirhs(Interior)
+  WRITES: Wave::pirhs(Interior)
 } "wave_evolve"
 
 schedule wave_calc_errors at ANALYSIS as calc_errors
 {
   LANG: C
-  READS:    Wave::phi(Everywhere)
-  READS:    Wave::pi(Everywhere)
-  READS:    Wave::phiExact(Everywhere)
-  READS:    Wave::piExact(Everywhere)
-  WRITES:   Wave::phiError(Everywhere)
-  WRITES:   Wave::piError(Everywhere)
+  READS: Wave::phi(Everywhere)
+  READS: Wave::pi(Everywhere)
+  READS: Wave::phiExact(Everywhere)
+  READS: Wave::piExact(Everywhere)
+  WRITES: Wave::phiError(Everywhere)
+  WRITES: Wave::piError(Everywhere)
 } "wave_calc_errors"
 
 schedule wave_calc_norm at ANALYSIS as calc_norm
 {
   LANG: C
   SYNC: norms
-  READS:    Wave::phiError(Everywhere)
-  READS:    Wave::piError(Everywhere)
-  READS:    Wave::phi(Everywhere)
-  READS:    Wave::pi(Everywhere)
-  WRITES:   Wave::EL2(Interior)
-  WRITES:   Wave::VDP(Interior)
-  WRITES:   Wave::VL2(Interior)
+  READS: Wave::phiError(Everywhere)
+  READS: Wave::piError(Everywhere)
+  READS: Wave::phi(Everywhere)
+  READS: Wave::pi(Everywhere)
+  WRITES: Wave::EL2(Interior)
+  WRITES: Wave::VDP(Interior)
+  WRITES: Wave::VL2(Interior)
 } "wave_calc_norm"
 
 
@@ -178,14 +123,14 @@ if (CCTK_EQUALS(boundary_condition, "radiative"))
   schedule wave_boundary in MoL_RHSBoundaries
   {
     LANG: C
-    READS:    grid::x(Everywhere)
-    READS:    grid::y(Everywhere)
-    READS:    grid::z(Everywhere)
-    READS:    grid::r(Everywhere)
-    READS:    Wave::phi(Everywhere)
-    READS:    Wave::pi(Everywhere)
-    WRITES:   Wave::phirhs(Boundary)
-    WRITES:   Wave::pirhs(Boundary)
+    READS: grid::x(Everywhere)
+    READS: grid::y(Everywhere)
+    READS: grid::z(Everywhere)
+    READS: grid::r(Everywhere)
+    READS: Wave::phi(Everywhere)
+    READS: Wave::pi(Everywhere)
+    WRITES: Wave::phirhs(Boundary)
+    WRITES: Wave::pirhs(Boundary)
   } "wave_boundary"
 }