Regenerate code

Kranc version beb854b56cd60ec97072d709a064eeafe1633ed1

1 files changed, 49 insertions, 36 deletions

diff --git a/ML_ADM/src/ML_ADM_RHS.cc b/ML_ADM/src/ML_ADM_RHS.cc
index 78d4fbe..7e180d3 100644
--- a/ML_ADM/src/ML_ADM_RHS.cc
+++ b/ML_ADM/src/ML_ADM_RHS.cc
@@ -43,7 +43,7 @@ extern "C" void ML_ADM_RHS_SelectBCs(CCTK_ARGUMENTS)
   return;
 }
 
-static void ML_ADM_RHS_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 ML_ADM_RHS_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;
@@ -51,38 +51,6 @@ static void ML_ADM_RHS_Body(cGH const * restrict const cctkGH, int const dir, in
   
   /* Declare finite differencing variables */
   
-  if (verbose > 1)
-  {
-    CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_ADM_RHS_Body");
-  }
-  
-  if (cctk_iteration % ML_ADM_RHS_calc_every != ML_ADM_RHS_calc_offset)
-  {
-    return;
-  }
-  
-  const char *groups[] = {"ML_ADM::ML_curv","ML_ADM::ML_curvrhs","ML_ADM::ML_lapse","ML_ADM::ML_lapserhs","ML_ADM::ML_metric","ML_ADM::ML_metricrhs","ML_ADM::ML_shift","ML_ADM::ML_shiftrhs"};
-  GenericFD_AssertGroupStorage(cctkGH, "ML_ADM_RHS", 8, groups);
-  
-  switch(fdOrder)
-  {
-    case 2:
-      GenericFD_EnsureStencilFits(cctkGH, "ML_ADM_RHS", 1, 1, 1);
-      break;
-    
-    case 4:
-      GenericFD_EnsureStencilFits(cctkGH, "ML_ADM_RHS", 2, 2, 2);
-      break;
-    
-    case 6:
-      GenericFD_EnsureStencilFits(cctkGH, "ML_ADM_RHS", 3, 3, 3);
-      break;
-    
-    case 8:
-      GenericFD_EnsureStencilFits(cctkGH, "ML_ADM_RHS", 4, 4, 4);
-      break;
-  }
-  
   /* Include user-supplied include files */
   
   /* Initialise finite differencing variables */
@@ -96,6 +64,7 @@ static void ML_ADM_RHS_Body(cGH const * restrict const cctkGH, int const dir, in
   CCTK_REAL_VEC const dy = ToReal(CCTK_DELTA_SPACE(1));
   CCTK_REAL_VEC const dz = ToReal(CCTK_DELTA_SPACE(2));
   CCTK_REAL_VEC const dt = ToReal(CCTK_DELTA_TIME);
+  CCTK_REAL_VEC const t = ToReal(cctk_time);
   CCTK_REAL_VEC const dxi = INV(dx);
   CCTK_REAL_VEC const dyi = INV(dy);
   CCTK_REAL_VEC const dzi = INV(dz);
@@ -191,10 +160,18 @@ static void ML_ADM_RHS_Body(cGH const * restrict const cctkGH, int const dir, in
   CCTK_REAL const *restrict const dJ323 = use_jacobian ? jacobian_derivative_ptrs[16] : 0;
   CCTK_REAL const *restrict const dJ333 = use_jacobian ? jacobian_derivative_ptrs[17] : 0;
   
+  /* Assign local copies of arrays functions */
+  
+  
+  
+  /* Calculate temporaries and arrays functions */
+  
+  /* Copy local copies back to grid functions */
+  
   /* Loop over the grid points */
   #pragma omp parallel
   LC_LOOP3VEC (ML_ADM_RHS,
-    i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
+    i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_lsh[0],cctk_lsh[1],cctk_lsh[2],
     CCTK_REAL_VEC_SIZE)
   {
@@ -1561,8 +1538,6 @@ static void ML_ADM_RHS_Body(cGH const * restrict const cctkGH, int const dir, in
       vec_store_nta_partial_lo(K33rhs[index],K33rhsL,elt_count);
       break;
     }
-    
-    /* Copy local copies back to grid functions */
     vec_store_nta(alpharhs[index],alpharhsL);
     vec_store_nta(beta1rhs[index],beta1rhsL);
     vec_store_nta(beta2rhs[index],beta2rhsL);
@@ -1588,5 +1563,43 @@ extern "C" void ML_ADM_RHS(CCTK_ARGUMENTS)
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
   
+  
+  if (verbose > 1)
+  {
+    CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_ADM_RHS_Body");
+  }
+  
+  if (cctk_iteration % ML_ADM_RHS_calc_every != ML_ADM_RHS_calc_offset)
+  {
+    return;
+  }
+  
+  const char *groups[] = {"ML_ADM::ML_curv","ML_ADM::ML_curvrhs","ML_ADM::ML_lapse","ML_ADM::ML_lapserhs","ML_ADM::ML_metric","ML_ADM::ML_metricrhs","ML_ADM::ML_shift","ML_ADM::ML_shiftrhs"};
+  GenericFD_AssertGroupStorage(cctkGH, "ML_ADM_RHS", 8, groups);
+  
+  switch(fdOrder)
+  {
+    case 2:
+      GenericFD_EnsureStencilFits(cctkGH, "ML_ADM_RHS", 1, 1, 1);
+      break;
+    
+    case 4:
+      GenericFD_EnsureStencilFits(cctkGH, "ML_ADM_RHS", 2, 2, 2);
+      break;
+    
+    case 6:
+      GenericFD_EnsureStencilFits(cctkGH, "ML_ADM_RHS", 3, 3, 3);
+      break;
+    
+    case 8:
+      GenericFD_EnsureStencilFits(cctkGH, "ML_ADM_RHS", 4, 4, 4);
+      break;
+  }
+  
   GenericFD_LoopOverInterior(cctkGH, &ML_ADM_RHS_Body);
+  
+  if (verbose > 1)
+  {
+    CCTK_VInfo(CCTK_THORNSTRING,"Leaving ML_ADM_RHS_Body");
+  }
 }