From 5859ce9074941ed0f52f5200d0adde8fed1d9012 Mon Sep 17 00:00:00 2001 From: Ian Hinder Date: Thu, 17 Nov 2011 18:07:14 +0100 Subject: Regenerate code Kranc version beb854b56cd60ec97072d709a064eeafe1633ed1 --- ML_ADM/src/ML_ADM_Minkowski.cc | 77 ++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 32 deletions(-) (limited to 'ML_ADM/src/ML_ADM_Minkowski.cc') diff --git a/ML_ADM/src/ML_ADM_Minkowski.cc b/ML_ADM/src/ML_ADM_Minkowski.cc index d401bfc..52b8daa 100644 --- a/ML_ADM/src/ML_ADM_Minkowski.cc +++ b/ML_ADM/src/ML_ADM_Minkowski.cc @@ -22,7 +22,7 @@ #define SQR(x) (kmul(x,x)) #define CUB(x) (kmul(x,SQR(x))) -static void ML_ADM_Minkowski_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_Minkowski_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; @@ -30,34 +30,6 @@ static void ML_ADM_Minkowski_Body(cGH const * restrict const cctkGH, int const d /* Declare finite differencing variables */ - if (verbose > 1) - { - CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_ADM_Minkowski_Body"); - } - - if (cctk_iteration % ML_ADM_Minkowski_calc_every != ML_ADM_Minkowski_calc_offset) - { - return; - } - - const char *groups[] = {"ML_ADM::ML_curv","ML_ADM::ML_lapse","ML_ADM::ML_metric","ML_ADM::ML_shift"}; - GenericFD_AssertGroupStorage(cctkGH, "ML_ADM_Minkowski", 4, groups); - - switch(fdOrder) - { - case 2: - break; - - case 4: - break; - - case 6: - break; - - case 8: - break; - } - /* Include user-supplied include files */ /* Initialise finite differencing variables */ @@ -71,6 +43,7 @@ static void ML_ADM_Minkowski_Body(cGH const * restrict const cctkGH, int const d 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); @@ -166,10 +139,18 @@ static void ML_ADM_Minkowski_Body(cGH const * restrict const cctkGH, int const d 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_Minkowski, - 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) { @@ -304,8 +285,6 @@ static void ML_ADM_Minkowski_Body(cGH const * restrict const cctkGH, int const d vec_store_nta_partial_lo(K33[index],K33L,elt_count); break; } - - /* Copy local copies back to grid functions */ vec_store_nta(alpha[index],alphaL); vec_store_nta(beta1[index],beta1L); vec_store_nta(beta2[index],beta2L); @@ -331,5 +310,39 @@ extern "C" void ML_ADM_Minkowski(CCTK_ARGUMENTS) DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; + + if (verbose > 1) + { + CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_ADM_Minkowski_Body"); + } + + if (cctk_iteration % ML_ADM_Minkowski_calc_every != ML_ADM_Minkowski_calc_offset) + { + return; + } + + const char *groups[] = {"ML_ADM::ML_curv","ML_ADM::ML_lapse","ML_ADM::ML_metric","ML_ADM::ML_shift"}; + GenericFD_AssertGroupStorage(cctkGH, "ML_ADM_Minkowski", 4, groups); + + switch(fdOrder) + { + case 2: + break; + + case 4: + break; + + case 6: + break; + + case 8: + break; + } + GenericFD_LoopOverEverything(cctkGH, &ML_ADM_Minkowski_Body); + + if (verbose > 1) + { + CCTK_VInfo(CCTK_THORNSTRING,"Leaving ML_ADM_Minkowski_Body"); + } } -- cgit v1.2.3