diff options
author | Erik Schnetter <schnetter@gmail.com> | 2012-04-03 16:05:18 -0400 |
---|---|---|
committer | Erik Schnetter <schnetter@gmail.com> | 2012-04-03 16:05:18 -0400 |
commit | af04ce2e3d96d19b94dd4b416a6617b649c6da34 (patch) | |
tree | 3e54bd8fc0990b431e5fb3c0584af1e2a8c1a808 /ML_ADMQuantities_O2 | |
parent | 6a60c4578abcd30d8fc60904ba275ec2e21133a5 (diff) |
Regenerate code with current version of Kranc
This is necessary so that Pi is correctly vectorized.
Diffstat (limited to 'ML_ADMQuantities_O2')
-rw-r--r-- | ML_ADMQuantities_O2/schedule.ccl | 26 | ||||
-rw-r--r-- | ML_ADMQuantities_O2/src/ML_ADMQuantities_O2.cc | 27 | ||||
-rw-r--r-- | ML_ADMQuantities_O2/src/make.code.defn | 2 |
3 files changed, 39 insertions, 16 deletions
diff --git a/ML_ADMQuantities_O2/schedule.ccl b/ML_ADMQuantities_O2/schedule.ccl index 336e8a1..0c73b79 100644 --- a/ML_ADMQuantities_O2/schedule.ccl +++ b/ML_ADMQuantities_O2/schedule.ccl @@ -33,12 +33,6 @@ schedule ML_ADMQuantities_O2_Startup at STARTUP OPTIONS: meta } "create banner" -schedule ML_ADMQuantities_O2_RegisterVars in MoL_Register -{ - LANG: C - OPTIONS: meta -} "Register Variables for MoL" - schedule ML_ADMQuantities_O2_RegisterSymmetries in SymmetryRegister { LANG: C @@ -53,6 +47,20 @@ schedule group ML_ADMQuantities_O2_group in MoL_PseudoEvolution after MoL_PostSt schedule ML_ADMQuantities_O2 in ML_ADMQuantities_O2_group { LANG: C + READS: grid::coordinates + READS: Grid::coordinates + READS: ML_BSSN::ML_curv + READS: ML_BSSN::ML_Gamma + READS: ML_BSSN::ML_lapse + READS: ML_BSSN::ML_log_confac + READS: ML_BSSN::ML_metric + READS: ML_BSSN::ML_shift + READS: ML_BSSN::ML_trace_curv + READS: TmunuBase::stress_energy_scalar + READS: TmunuBase::stress_energy_tensor + READS: TmunuBase::stress_energy_vector + WRITES: ML_ADMQuantities_O2::ML_Jadm + WRITES: ML_ADMQuantities_O2::ML_Madm } "ML_ADMQuantities_O2" schedule ML_ADMQuantities_O2_SelectBCs in ML_ADMQuantities_O2_bc_group @@ -90,6 +98,12 @@ schedule ML_ADMQuantities_O2_CheckBoundaries at BASEGRID OPTIONS: meta } "check boundaries treatment" +schedule ML_ADMQuantities_O2_RegisterVars in MoL_Register +{ + LANG: C + OPTIONS: meta +} "Register Variables for MoL" + schedule group ApplyBCs as ML_ADMQuantities_O2_ApplyBCs in MoL_PostStep after ML_ADMQuantities_O2_SelectBoundConds { # no language specified diff --git a/ML_ADMQuantities_O2/src/ML_ADMQuantities_O2.cc b/ML_ADMQuantities_O2/src/ML_ADMQuantities_O2.cc index 529c3d0..84f71dd 100644 --- a/ML_ADMQuantities_O2/src/ML_ADMQuantities_O2.cc +++ b/ML_ADMQuantities_O2/src/ML_ADMQuantities_O2.cc @@ -43,8 +43,6 @@ static void ML_ADMQuantities_O2_Body(cGH const * restrict const cctkGH, int cons DECLARE_CCTK_PARAMETERS; - /* Declare finite differencing variables */ - /* Include user-supplied include files */ /* Initialise finite differencing variables */ @@ -75,9 +73,9 @@ static void ML_ADMQuantities_O2_Body(cGH const * restrict const cctkGH, int cons CCTK_REAL const p1o2dx = 0.5*INV(dx); CCTK_REAL const p1o2dy = 0.5*INV(dy); CCTK_REAL const p1o2dz = 0.5*INV(dz); - CCTK_REAL const p1o4dxdy = 0.25*INV(dx)*INV(dy); - CCTK_REAL const p1o4dxdz = 0.25*INV(dx)*INV(dz); - CCTK_REAL const p1o4dydz = 0.25*INV(dy)*INV(dz); + CCTK_REAL const p1o4dxdy = 0.25*INV(dx*dy); + CCTK_REAL const p1o4dxdz = 0.25*INV(dx*dz); + CCTK_REAL const p1o4dydz = 0.25*INV(dy*dz); CCTK_REAL const p1odx = INV(dx); CCTK_REAL const p1odx2 = INV(SQR(dx)); CCTK_REAL const p1ody = INV(dy); @@ -98,7 +96,7 @@ static void ML_ADMQuantities_O2_Body(cGH const * restrict const cctkGH, int cons /* Loop over the grid points */ #pragma omp parallel - CCTK_LOOP3 (ML_ADMQuantities_O2, + CCTK_LOOP3(ML_ADMQuantities_O2, i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2], cctk_lsh[0],cctk_lsh[1],cctk_lsh[2]) { @@ -656,7 +654,7 @@ static void ML_ADMQuantities_O2_Body(cGH const * restrict const cctkGH, int cons Jadm3[index] = Jadm3L; Madm[index] = MadmL; } - CCTK_ENDLOOP3 (ML_ADMQuantities_O2); + CCTK_ENDLOOP3(ML_ADMQuantities_O2); } extern "C" void ML_ADMQuantities_O2(CCTK_ARGUMENTS) @@ -675,12 +673,23 @@ extern "C" void ML_ADMQuantities_O2(CCTK_ARGUMENTS) return; } - const char *groups[] = {"grid::coordinates","Grid::coordinates","ML_BSSN::ML_curv","ML_BSSN::ML_Gamma","ML_BSSN::ML_lapse","ML_BSSN::ML_log_confac","ML_BSSN::ML_metric","ML_BSSN::ML_shift","ML_BSSN::ML_trace_curv","ML_ADMQuantities_O2::ML_Jadm","ML_ADMQuantities_O2::ML_Madm"}; + const char *const groups[] = { + "grid::coordinates", + "Grid::coordinates", + "ML_BSSN::ML_curv", + "ML_BSSN::ML_Gamma", + "ML_BSSN::ML_lapse", + "ML_BSSN::ML_log_confac", + "ML_BSSN::ML_metric", + "ML_BSSN::ML_shift", + "ML_BSSN::ML_trace_curv", + "ML_ADMQuantities_O2::ML_Jadm", + "ML_ADMQuantities_O2::ML_Madm"}; GenericFD_AssertGroupStorage(cctkGH, "ML_ADMQuantities_O2", 11, groups); GenericFD_EnsureStencilFits(cctkGH, "ML_ADMQuantities_O2", 1, 1, 1); - GenericFD_LoopOverInterior(cctkGH, &ML_ADMQuantities_O2_Body); + GenericFD_LoopOverInterior(cctkGH, ML_ADMQuantities_O2_Body); if (verbose > 1) { diff --git a/ML_ADMQuantities_O2/src/make.code.defn b/ML_ADMQuantities_O2/src/make.code.defn index f8be0a5..f708d22 100644 --- a/ML_ADMQuantities_O2/src/make.code.defn +++ b/ML_ADMQuantities_O2/src/make.code.defn @@ -1,3 +1,3 @@ # File produced by Kranc -SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc ML_ADMQuantities_O2.cc Boundaries.cc +SRCS = Startup.cc RegisterSymmetries.cc RegisterMoL.cc ML_ADMQuantities_O2.cc Boundaries.cc |