Regenerate examples (except Advect)

Advect doesn't work at the moment due to a problem with TensorTools.

1 files changed, 86 insertions, 54 deletions

diff --git a/Examples/Wave/src/wave_exact_sine.cc b/Examples/Wave/src/wave_exact_sine.cc
index 96e788a..78c4251 100644
--- a/Examples/Wave/src/wave_exact_sine.cc
+++ b/Examples/Wave/src/wave_exact_sine.cc
@@ -12,6 +12,8 @@
 #include "cctk_Parameters.h"
 #include "GenericFD.h"
 #include "Differencing.h"
+#include "cctk_Loop.h"
+#include "loopcontrol.h"
 
 /* Define macros used in calculations */
 #define INITVALUE (42)
@@ -20,42 +22,28 @@
 #define SQR(x) ((x) * (x))
 #define CUB(x) ((x) * (x) * (x))
 
-static void wave_exact_sine_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+static void wave_exact_sine_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
   
   
-  /* Declare the variables used for looping over grid points */
-  CCTK_INT i, j, k;
-  // CCTK_INT index = INITVALUE;
-  
   /* Declare finite differencing variables */
   
-  if (verbose > 1)
-  {
-    CCTK_VInfo(CCTK_THORNSTRING,"Entering wave_exact_sine_Body");
-  }
-  
-  if (cctk_iteration % wave_exact_sine_calc_every != wave_exact_sine_calc_offset)
-  {
-    return;
-  }
-  
-  const char *groups[] = {"Wave::exact","grid::coordinates"};
-  GenericFD_AssertGroupStorage(cctkGH, "wave_exact_sine", 2, groups);
-  
-  
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
   ptrdiff_t const di = 1;
   ptrdiff_t const dj = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);
   ptrdiff_t const dk = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  ptrdiff_t const cdi = sizeof(CCTK_REAL) * di;
+  ptrdiff_t const cdj = sizeof(CCTK_REAL) * dj;
+  ptrdiff_t const cdk = sizeof(CCTK_REAL) * dk;
   CCTK_REAL const dx = ToReal(CCTK_DELTA_SPACE(0));
   CCTK_REAL const dy = ToReal(CCTK_DELTA_SPACE(1));
   CCTK_REAL const dz = ToReal(CCTK_DELTA_SPACE(2));
   CCTK_REAL const dt = ToReal(CCTK_DELTA_TIME);
+  CCTK_REAL const t = ToReal(cctk_time);
   CCTK_REAL const dxi = INV(dx);
   CCTK_REAL const dyi = INV(dy);
   CCTK_REAL const dzi = INV(dz);
@@ -99,46 +87,62 @@ static void wave_exact_sine_Body(cGH const * restrict const cctkGH, int const di
   CCTK_REAL const pm1o2dy = -0.5*INV(dy);
   CCTK_REAL const pm1o2dz = -0.5*INV(dz);
   
+  /* Assign local copies of arrays functions */
+  
+  
+  
+  /* Calculate temporaries and arrays functions */
+  
+  /* Copy local copies back to grid functions */
+  
   /* Loop over the grid points */
-  for (k = min[2]; k < max[2]; k++)
+  #pragma omp parallel
+  CCTK_LOOP3 (wave_exact_sine,
+    i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
+    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
-    for (j = min[1]; j < max[1]; j++)
+    ptrdiff_t const index = di*i + dj*j + dk*k;
+    
+    /* Assign local copies of grid functions */
+    
+    CCTK_REAL xL = x[index];
+    CCTK_REAL yL = y[index];
+    CCTK_REAL zL = z[index];
+    
+    
+    /* Include user supplied include files */
+    
+    /* Precompute derivatives */
+    
+    switch(fdOrder)
     {
-      for (i = min[0]; i < max[0]; i++)
-      {
-         int  const  index  =  CCTK_GFINDEX3D(cctkGH,i,j,k) ;
-        
-        /* Assign local copies of grid functions */
-        
-        CCTK_REAL xL = x[index];
-        CCTK_REAL yL = y[index];
-        CCTK_REAL zL = z[index];
-        
-        
-        /* Include user supplied include files */
-        
-        /* Precompute derivatives */
-        
-        /* Calculate temporaries and grid functions */
-        CCTK_REAL piconst = 3.1415926535897932385;
-        
-        CCTK_REAL phiExactL = 
-          Sin(2*piconst*INV(ToReal(periodicity))*(-(cctk_time*sqrt(SQR(ToReal(n1)) + 
-          SQR(ToReal(n2)) + SQR(ToReal(n3)))) + xL*ToReal(n1) + yL*ToReal(n2) + 
-          zL*ToReal(n3)))*ToReal(amplitude);
-        
-        CCTK_REAL piExactL = 
-          -2*piconst*Cos(2*piconst*INV(ToReal(periodicity))*(-(cctk_time*sqrt(SQR(ToReal(n1)) 
-          + SQR(ToReal(n2)) + SQR(ToReal(n3)))) + xL*ToReal(n1) + yL*ToReal(n2) + 
-          zL*ToReal(n3)))*INV(ToReal(periodicity))*sqrt(SQR(ToReal(n1)) + 
-          SQR(ToReal(n2)) + SQR(ToReal(n3)))*ToReal(amplitude);
-        
-        /* Copy local copies back to grid functions */
-        phiExact[index] = phiExactL;
-        piExact[index] = piExactL;
-      }
+      case 2:
+        break;
+      
+      case 4:
+        break;
     }
+    
+    /* Calculate temporaries and grid functions */
+    CCTK_REAL piconst = 3.1415926535897932385;
+    
+    CCTK_REAL phiExactL = 
+      Sin(2*piconst*INV(ToReal(periodicity))*(-(cctk_time*sqrt(SQR(ToReal(n1)) + 
+      SQR(ToReal(n2)) + SQR(ToReal(n3)))) + xL*ToReal(n1) + yL*ToReal(n2) 
+      + zL*ToReal(n3)))*ToReal(amplitude);
+    
+    CCTK_REAL piExactL = 
+      -2*piconst*Cos(2*piconst*INV(ToReal(periodicity))*(-(cctk_time*sqrt(SQR(ToReal(n1)) 
+      + SQR(ToReal(n2)) + SQR(ToReal(n3)))) + xL*ToReal(n1) + 
+      yL*ToReal(n2) + 
+      zL*ToReal(n3)))*INV(ToReal(periodicity))*sqrt(SQR(ToReal(n1)) + 
+      SQR(ToReal(n2)) + SQR(ToReal(n3)))*ToReal(amplitude);
+    
+    /* Copy local copies back to grid functions */
+    phiExact[index] = phiExactL;
+    piExact[index] = piExactL;
   }
+  CCTK_ENDLOOP3 (wave_exact_sine);
 }
 
 extern "C" void wave_exact_sine(CCTK_ARGUMENTS)
@@ -146,5 +150,33 @@ extern "C" void wave_exact_sine(CCTK_ARGUMENTS)
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
   
+  
+  if (verbose > 1)
+  {
+    CCTK_VInfo(CCTK_THORNSTRING,"Entering wave_exact_sine_Body");
+  }
+  
+  if (cctk_iteration % wave_exact_sine_calc_every != wave_exact_sine_calc_offset)
+  {
+    return;
+  }
+  
+  const char *groups[] = {"Wave::exact","grid::coordinates"};
+  GenericFD_AssertGroupStorage(cctkGH, "wave_exact_sine", 2, groups);
+  
+  switch(fdOrder)
+  {
+    case 2:
+      break;
+    
+    case 4:
+      break;
+  }
+  
   GenericFD_LoopOverEverything(cctkGH, &wave_exact_sine_Body);
+  
+  if (verbose > 1)
+  {
+    CCTK_VInfo(CCTK_THORNSTRING,"Leaving wave_exact_sine_Body");
+  }
 }