diff --git a/AsterX/schedule.ccl b/AsterX/schedule.ccl index 85e319a1..6a8d8d59 100644 --- a/AsterX/schedule.ccl +++ b/AsterX/schedule.ccl @@ -44,24 +44,21 @@ SCHEDULE AsterX_ComputedBstagFromA IN AsterX_InitialGroup { LANG: C READS: Avec_x(everywhere) Avec_y(everywhere) Avec_z(everywhere) - WRITES: dBx_stag(interior) dBy_stag(interior) dBz_stag(interior) - SYNC: dBx_stag dBy_stag dBz_stag + WRITES: dBx_stag(everywhere) dBy_stag(everywhere) dBz_stag(everywhere) } "Calculate dBstag from curl of A" SCHEDULE AsterX_ComputedBFromdBstag IN AsterX_InitialGroup AFTER AsterX_ComputedBstagFromA { LANG: C READS: dBx_stag(everywhere) dBy_stag(everywhere) dBz_stag(everywhere) - WRITES: dB(interior) - SYNC: dB + WRITES: dB(everywhere) } "Calculate centered dB from dBstag" SCHEDULE AsterX_ComputeBFromdB IN AsterX_InitialGroup AFTER AsterX_ComputedBFromdBstag { LANG: C - READS: dB(interior) ADMBaseX::metric(interior) - WRITES: HydroBaseX::Bvec(interior) - SYNC: HydroBaseX::Bvec + READS: dB(everywhere) ADMBaseX::metric(everywhere) + WRITES: HydroBaseX::Bvec(everywhere) } "Calculate centered B from densitized B" SCHEDULE AsterX_Prim2Con_Initial IN AsterX_InitialGroup AFTER AsterX_ComputeBFromdB @@ -107,16 +104,14 @@ SCHEDULE AsterX_ComputedBstagFromA IN AsterX_Con2PrimGroup { LANG: C READS: Avec_x(everywhere) Avec_y(everywhere) Avec_z(everywhere) - WRITES: dBx_stag(interior) dBy_stag(interior) dBz_stag(interior) - SYNC: dBx_stag dBy_stag dBz_stag + WRITES: dBx_stag(everywhere) dBy_stag(everywhere) dBz_stag(everywhere) } "Calculate dBstag from curl of A" SCHEDULE AsterX_ComputedBFromdBstag IN AsterX_Con2PrimGroup AFTER AsterX_ComputedBstagFromA { LANG: C READS: dBx_stag(everywhere) dBy_stag(everywhere) dBz_stag(everywhere) - WRITES: dB(interior) - SYNC: dB + WRITES: dB(everywhere) } "Calculate centered dB from dBstag" SCHEDULE AsterX_Con2Prim IN AsterX_Con2PrimGroup AFTER AsterX_ComputedBFromdBstag diff --git a/AsterX/src/computeBfromA.cxx b/AsterX/src/computeBfromA.cxx index 53938d23..f68466d0 100644 --- a/AsterX/src/computeBfromA.cxx +++ b/AsterX/src/computeBfromA.cxx @@ -29,7 +29,7 @@ template void ComputeStaggeredB(CCTK_ARGUMENTS) { constexpr array face_centred = {!(dir == 0), !(dir == 1), !(dir == 2)}; - grid.loop_int_device( + grid.loop_all_device( grid.nghostzones, [=] CCTK_DEVICE(const PointDesc &p) CCTK_ATTRIBUTE_ALWAYS_INLINE { // Neighbouring "plus" and "minus" cell indices @@ -68,7 +68,7 @@ extern "C" void AsterX_ComputedBFromdBstag(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTSX_AsterX_ComputedBFromdBstag; DECLARE_CCTK_PARAMETERS; - grid.loop_int_device<1, 1, 1>( + grid.loop_all_device<1, 1, 1>( grid.nghostzones, [=] CCTK_DEVICE(const PointDesc &p) CCTK_ATTRIBUTE_ALWAYS_INLINE { // Neighbouring "plus" and "minus" cell indices @@ -88,7 +88,7 @@ extern "C" void AsterX_ComputeBFromdB(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTSX_AsterX_ComputeBFromdB; DECLARE_CCTK_PARAMETERS; - grid.loop_int_device<1, 1, 1>( + grid.loop_all_device<1, 1, 1>( grid.nghostzones, [=] CCTK_DEVICE(const PointDesc &p) CCTK_ATTRIBUTE_ALWAYS_INLINE { /* Interpolate metric terms from vertices to center */