From a65586203c3cb4bb4d16811bcc48715b31911e81 Mon Sep 17 00:00:00 2001 From: Ian Hinder Date: Mon, 23 Jan 2012 13:17:26 -0600 Subject: Regenerate examples (except Advect) Advect doesn't work at the moment due to a problem with TensorTools. --- .../eulerauto_cons_calc_intercell_conserved_1.cc | 176 +++++++++++---------- 1 file changed, 96 insertions(+), 80 deletions(-) (limited to 'Examples/EulerAuto/src/eulerauto_cons_calc_intercell_conserved_1.cc') diff --git a/Examples/EulerAuto/src/eulerauto_cons_calc_intercell_conserved_1.cc b/Examples/EulerAuto/src/eulerauto_cons_calc_intercell_conserved_1.cc index 3f91fa6..fdcd6f7 100644 --- a/Examples/EulerAuto/src/eulerauto_cons_calc_intercell_conserved_1.cc +++ b/Examples/EulerAuto/src/eulerauto_cons_calc_intercell_conserved_1.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 eulerauto_cons_calc_intercell_conserved_1_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 eulerauto_cons_calc_intercell_conserved_1_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 eulerauto_cons_calc_intercell_conserved_1_Body"); - } - - if (cctk_iteration % eulerauto_cons_calc_intercell_conserved_1_calc_every != eulerauto_cons_calc_intercell_conserved_1_calc_offset) - { - return; - } - - const char *groups[] = {"EulerAuto::Den_lr_group","EulerAuto::En_lr_group","EulerAuto::p_lr_group","EulerAuto::rho_lr_group","EulerAuto::S1_lr_group","EulerAuto::S2_lr_group","EulerAuto::S3_lr_group","EulerAuto::v1_lr_group","EulerAuto::v2_lr_group","EulerAuto::v3_lr_group"}; - GenericFD_AssertGroupStorage(cctkGH, "eulerauto_cons_calc_intercell_conserved_1", 10, 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); @@ -74,70 +62,78 @@ static void eulerauto_cons_calc_intercell_conserved_1_Body(cGH const * restrict CCTK_REAL const p1ody = INV(dy); CCTK_REAL const p1odz = 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 (eulerauto_cons_calc_intercell_conserved_1, + 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++) - { - 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 pLeftL = pLeft[index]; - CCTK_REAL pRightL = pRight[index]; - CCTK_REAL rhoLeftL = rhoLeft[index]; - CCTK_REAL rhoRightL = rhoRight[index]; - CCTK_REAL v1LeftL = v1Left[index]; - CCTK_REAL v1RightL = v1Right[index]; - CCTK_REAL v2LeftL = v2Left[index]; - CCTK_REAL v2RightL = v2Right[index]; - CCTK_REAL v3LeftL = v3Left[index]; - CCTK_REAL v3RightL = v3Right[index]; - - - /* Include user supplied include files */ - - /* Precompute derivatives */ - - /* Calculate temporaries and grid functions */ - CCTK_REAL DenLeftL = rhoLeftL; - - CCTK_REAL S1LeftL = rhoLeftL*v1LeftL; - - CCTK_REAL S2LeftL = rhoLeftL*v2LeftL; - - CCTK_REAL S3LeftL = rhoLeftL*v3LeftL; - - CCTK_REAL EnLeftL = pLeftL*INV(-1 + ToReal(gamma)) + - 0.5*rhoLeftL*(SQR(v1LeftL) + SQR(v2LeftL) + SQR(v3LeftL)); - - CCTK_REAL DenRightL = rhoRightL; - - CCTK_REAL S1RightL = rhoRightL*v1RightL; - - CCTK_REAL S2RightL = rhoRightL*v2RightL; - - CCTK_REAL S3RightL = rhoRightL*v3RightL; - - CCTK_REAL EnRightL = pRightL*INV(-1 + ToReal(gamma)) + - 0.5*rhoRightL*(SQR(v1RightL) + SQR(v2RightL) + SQR(v3RightL)); - - /* Copy local copies back to grid functions */ - DenLeft[index] = DenLeftL; - DenRight[index] = DenRightL; - EnLeft[index] = EnLeftL; - EnRight[index] = EnRightL; - S1Left[index] = S1LeftL; - S1Right[index] = S1RightL; - S2Left[index] = S2LeftL; - S2Right[index] = S2RightL; - S3Left[index] = S3LeftL; - S3Right[index] = S3RightL; - } - } + ptrdiff_t const index = di*i + dj*j + dk*k; + + /* Assign local copies of grid functions */ + + CCTK_REAL pLeftL = pLeft[index]; + CCTK_REAL pRightL = pRight[index]; + CCTK_REAL rhoLeftL = rhoLeft[index]; + CCTK_REAL rhoRightL = rhoRight[index]; + CCTK_REAL v1LeftL = v1Left[index]; + CCTK_REAL v1RightL = v1Right[index]; + CCTK_REAL v2LeftL = v2Left[index]; + CCTK_REAL v2RightL = v2Right[index]; + CCTK_REAL v3LeftL = v3Left[index]; + CCTK_REAL v3RightL = v3Right[index]; + + + /* Include user supplied include files */ + + /* Precompute derivatives */ + + /* Calculate temporaries and grid functions */ + CCTK_REAL DenLeftL = rhoLeftL; + + CCTK_REAL S1LeftL = rhoLeftL*v1LeftL; + + CCTK_REAL S2LeftL = rhoLeftL*v2LeftL; + + CCTK_REAL S3LeftL = rhoLeftL*v3LeftL; + + CCTK_REAL EnLeftL = 0.5*INV(-1 + ToReal(gamma))*(2*pLeftL + + rhoLeftL*(SQR(v1LeftL) + SQR(v2LeftL) + SQR(v3LeftL))*(-1 + + ToReal(gamma))); + + CCTK_REAL DenRightL = rhoRightL; + + CCTK_REAL S1RightL = rhoRightL*v1RightL; + + CCTK_REAL S2RightL = rhoRightL*v2RightL; + + CCTK_REAL S3RightL = rhoRightL*v3RightL; + + CCTK_REAL EnRightL = 0.5*INV(-1 + ToReal(gamma))*(2*pRightL + + rhoRightL*(SQR(v1RightL) + SQR(v2RightL) + SQR(v3RightL))*(-1 + + ToReal(gamma))); + + /* Copy local copies back to grid functions */ + DenLeft[index] = DenLeftL; + DenRight[index] = DenRightL; + EnLeft[index] = EnLeftL; + EnRight[index] = EnRightL; + S1Left[index] = S1LeftL; + S1Right[index] = S1RightL; + S2Left[index] = S2LeftL; + S2Right[index] = S2RightL; + S3Left[index] = S3LeftL; + S3Right[index] = S3RightL; } + CCTK_ENDLOOP3 (eulerauto_cons_calc_intercell_conserved_1); } extern "C" void eulerauto_cons_calc_intercell_conserved_1(CCTK_ARGUMENTS) @@ -145,5 +141,25 @@ extern "C" void eulerauto_cons_calc_intercell_conserved_1(CCTK_ARGUMENTS) DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; + + if (verbose > 1) + { + CCTK_VInfo(CCTK_THORNSTRING,"Entering eulerauto_cons_calc_intercell_conserved_1_Body"); + } + + if (cctk_iteration % eulerauto_cons_calc_intercell_conserved_1_calc_every != eulerauto_cons_calc_intercell_conserved_1_calc_offset) + { + return; + } + + const char *groups[] = {"EulerAuto::Den_lr_group","EulerAuto::En_lr_group","EulerAuto::p_lr_group","EulerAuto::rho_lr_group","EulerAuto::S1_lr_group","EulerAuto::S2_lr_group","EulerAuto::S3_lr_group","EulerAuto::v1_lr_group","EulerAuto::v2_lr_group","EulerAuto::v3_lr_group"}; + GenericFD_AssertGroupStorage(cctkGH, "eulerauto_cons_calc_intercell_conserved_1", 10, groups); + + GenericFD_LoopOverEverything(cctkGH, &eulerauto_cons_calc_intercell_conserved_1_Body); + + if (verbose > 1) + { + CCTK_VInfo(CCTK_THORNSTRING,"Leaving eulerauto_cons_calc_intercell_conserved_1_Body"); + } } -- cgit v1.2.3