diff options
Diffstat (limited to 'ML_BSSN/src/ML_BSSN_Advect.cc')
| -rw-r--r-- | ML_BSSN/src/ML_BSSN_Advect.cc | 212 |
1 files changed, 55 insertions, 157 deletions
diff --git a/ML_BSSN/src/ML_BSSN_Advect.cc b/ML_BSSN/src/ML_BSSN_Advect.cc index 0f8a946..a519fdf 100644 --- a/ML_BSSN/src/ML_BSSN_Advect.cc +++ b/ML_BSSN/src/ML_BSSN_Advect.cc @@ -38,18 +38,12 @@ extern "C" void ML_BSSN_Advect_SelectBCs(CCTK_ARGUMENTS) ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN::ML_curvrhs","flat"); if (ierr < 0) CCTK_WARN(1, "Failed to register flat BC for ML_BSSN::ML_curvrhs."); - ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN::ML_dtlapserhs","flat"); - if (ierr < 0) - CCTK_WARN(1, "Failed to register flat BC for ML_BSSN::ML_dtlapserhs."); ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN::ML_dtshiftrhs","flat"); if (ierr < 0) CCTK_WARN(1, "Failed to register flat BC for ML_BSSN::ML_dtshiftrhs."); ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN::ML_Gammarhs","flat"); if (ierr < 0) CCTK_WARN(1, "Failed to register flat BC for ML_BSSN::ML_Gammarhs."); - ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN::ML_lapserhs","flat"); - if (ierr < 0) - CCTK_WARN(1, "Failed to register flat BC for ML_BSSN::ML_lapserhs."); ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN::ML_log_confacrhs","flat"); if (ierr < 0) CCTK_WARN(1, "Failed to register flat BC for ML_BSSN::ML_log_confacrhs."); @@ -252,13 +246,11 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, { const ptrdiff_t index CCTK_ATTRIBUTE_UNUSED = di*i + dj*j + dk*k; // vec_iter_counter+=CCTK_REAL_VEC_SIZE; + if (fabs(y[index]) > 1e-8) + continue; /* Assign local copies of grid functions */ - CCTK_REAL_VEC AL CCTK_ATTRIBUTE_UNUSED = vec_load(A[index]); - CCTK_REAL_VEC alphaL CCTK_ATTRIBUTE_UNUSED = vec_load(alpha[index]); - CCTK_REAL_VEC alpharhsL CCTK_ATTRIBUTE_UNUSED = vec_load(alpharhs[index]); - CCTK_REAL_VEC ArhsL CCTK_ATTRIBUTE_UNUSED = vec_load(Arhs[index]); CCTK_REAL_VEC At11L CCTK_ATTRIBUTE_UNUSED = vec_load(At11[index]); CCTK_REAL_VEC At11rhsL CCTK_ATTRIBUTE_UNUSED = vec_load(At11rhs[index]); CCTK_REAL_VEC At12L CCTK_ATTRIBUTE_UNUSED = vec_load(At12[index]); @@ -325,18 +317,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, /* Include user supplied include files */ /* Precompute derivatives */ - CCTK_REAL_VEC PDupwindNthAnti1A CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC PDupwindNthSymm1A CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC PDupwindNthAnti2A CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC PDupwindNthSymm2A CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC PDupwindNthAnti3A CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC PDupwindNthSymm3A CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC PDupwindNthAnti1alpha CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC PDupwindNthSymm1alpha CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC PDupwindNthAnti2alpha CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC PDupwindNthSymm2alpha CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC PDupwindNthAnti3alpha CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC PDupwindNthSymm3alpha CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC PDupwindNthAnti1At11 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC PDupwindNthSymm1At11 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC PDupwindNthAnti2At11 CCTK_ATTRIBUTE_UNUSED; @@ -480,18 +460,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, { case 2: { - PDupwindNthAnti1A = PDupwindNthAntifdOrder21(&A[index]); - PDupwindNthSymm1A = PDupwindNthSymmfdOrder21(&A[index]); - PDupwindNthAnti2A = PDupwindNthAntifdOrder22(&A[index]); - PDupwindNthSymm2A = PDupwindNthSymmfdOrder22(&A[index]); - PDupwindNthAnti3A = PDupwindNthAntifdOrder23(&A[index]); - PDupwindNthSymm3A = PDupwindNthSymmfdOrder23(&A[index]); - PDupwindNthAnti1alpha = PDupwindNthAntifdOrder21(&alpha[index]); - PDupwindNthSymm1alpha = PDupwindNthSymmfdOrder21(&alpha[index]); - PDupwindNthAnti2alpha = PDupwindNthAntifdOrder22(&alpha[index]); - PDupwindNthSymm2alpha = PDupwindNthSymmfdOrder22(&alpha[index]); - PDupwindNthAnti3alpha = PDupwindNthAntifdOrder23(&alpha[index]); - PDupwindNthSymm3alpha = PDupwindNthSymmfdOrder23(&alpha[index]); PDupwindNthAnti1At11 = PDupwindNthAntifdOrder21(&At11[index]); PDupwindNthSymm1At11 = PDupwindNthSymmfdOrder21(&At11[index]); PDupwindNthAnti2At11 = PDupwindNthAntifdOrder22(&At11[index]); @@ -635,18 +603,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, case 4: { - PDupwindNthAnti1A = PDupwindNthAntifdOrder41(&A[index]); - PDupwindNthSymm1A = PDupwindNthSymmfdOrder41(&A[index]); - PDupwindNthAnti2A = PDupwindNthAntifdOrder42(&A[index]); - PDupwindNthSymm2A = PDupwindNthSymmfdOrder42(&A[index]); - PDupwindNthAnti3A = PDupwindNthAntifdOrder43(&A[index]); - PDupwindNthSymm3A = PDupwindNthSymmfdOrder43(&A[index]); - PDupwindNthAnti1alpha = PDupwindNthAntifdOrder41(&alpha[index]); - PDupwindNthSymm1alpha = PDupwindNthSymmfdOrder41(&alpha[index]); - PDupwindNthAnti2alpha = PDupwindNthAntifdOrder42(&alpha[index]); - PDupwindNthSymm2alpha = PDupwindNthSymmfdOrder42(&alpha[index]); - PDupwindNthAnti3alpha = PDupwindNthAntifdOrder43(&alpha[index]); - PDupwindNthSymm3alpha = PDupwindNthSymmfdOrder43(&alpha[index]); PDupwindNthAnti1At11 = PDupwindNthAntifdOrder41(&At11[index]); PDupwindNthSymm1At11 = PDupwindNthSymmfdOrder41(&At11[index]); PDupwindNthAnti2At11 = PDupwindNthAntifdOrder42(&At11[index]); @@ -790,18 +746,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, case 6: { - PDupwindNthAnti1A = PDupwindNthAntifdOrder61(&A[index]); - PDupwindNthSymm1A = PDupwindNthSymmfdOrder61(&A[index]); - PDupwindNthAnti2A = PDupwindNthAntifdOrder62(&A[index]); - PDupwindNthSymm2A = PDupwindNthSymmfdOrder62(&A[index]); - PDupwindNthAnti3A = PDupwindNthAntifdOrder63(&A[index]); - PDupwindNthSymm3A = PDupwindNthSymmfdOrder63(&A[index]); - PDupwindNthAnti1alpha = PDupwindNthAntifdOrder61(&alpha[index]); - PDupwindNthSymm1alpha = PDupwindNthSymmfdOrder61(&alpha[index]); - PDupwindNthAnti2alpha = PDupwindNthAntifdOrder62(&alpha[index]); - PDupwindNthSymm2alpha = PDupwindNthSymmfdOrder62(&alpha[index]); - PDupwindNthAnti3alpha = PDupwindNthAntifdOrder63(&alpha[index]); - PDupwindNthSymm3alpha = PDupwindNthSymmfdOrder63(&alpha[index]); PDupwindNthAnti1At11 = PDupwindNthAntifdOrder61(&At11[index]); PDupwindNthSymm1At11 = PDupwindNthSymmfdOrder61(&At11[index]); PDupwindNthAnti2At11 = PDupwindNthAntifdOrder62(&At11[index]); @@ -945,18 +889,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, case 8: { - PDupwindNthAnti1A = PDupwindNthAntifdOrder81(&A[index]); - PDupwindNthSymm1A = PDupwindNthSymmfdOrder81(&A[index]); - PDupwindNthAnti2A = PDupwindNthAntifdOrder82(&A[index]); - PDupwindNthSymm2A = PDupwindNthSymmfdOrder82(&A[index]); - PDupwindNthAnti3A = PDupwindNthAntifdOrder83(&A[index]); - PDupwindNthSymm3A = PDupwindNthSymmfdOrder83(&A[index]); - PDupwindNthAnti1alpha = PDupwindNthAntifdOrder81(&alpha[index]); - PDupwindNthSymm1alpha = PDupwindNthSymmfdOrder81(&alpha[index]); - PDupwindNthAnti2alpha = PDupwindNthAntifdOrder82(&alpha[index]); - PDupwindNthSymm2alpha = PDupwindNthSymmfdOrder82(&alpha[index]); - PDupwindNthAnti3alpha = PDupwindNthAntifdOrder83(&alpha[index]); - PDupwindNthSymm3alpha = PDupwindNthSymmfdOrder83(&alpha[index]); PDupwindNthAnti1At11 = PDupwindNthAntifdOrder81(&At11[index]); PDupwindNthSymm1At11 = PDupwindNthSymmfdOrder81(&At11[index]); PDupwindNthAnti2At11 = PDupwindNthAntifdOrder82(&At11[index]); @@ -1100,6 +1032,57 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, default: CCTK_BUILTIN_UNREACHABLE(); } + + double xx = x[index]; + int origin = fabs(xx) < 1e-8; + + PDupwindNthAnti2At11 = origin ? -2 * PDupwindNthAnti1At12 : -2 * At12[index] / xx; + PDupwindNthSymm2At11 = origin ? -2 * PDupwindNthSymm1At12 : -2 * At12[index] / xx; + PDupwindNthAnti2At12 = origin ? PDupwindNthAnti1At11 - PDupwindNthAnti1At22 : (At11[index] - At22[index]) / xx; + PDupwindNthSymm2At12 = origin ? PDupwindNthSymm1At11 - PDupwindNthSymm1At22 : (At11[index] - At22[index]) / xx; + PDupwindNthAnti2At13 = origin ? -PDupwindNthAnti1At23 : - At23[index] / xx; + PDupwindNthSymm2At13 = origin ? -PDupwindNthSymm1At23 : - At23[index] / xx; + PDupwindNthAnti2At22 = origin ? 2 * PDupwindNthAnti1At12 : 2 * At12[index] / xx; + PDupwindNthSymm2At22 = origin ? 2 * PDupwindNthSymm1At12 : 2 * At12[index] / xx; + PDupwindNthAnti2At23 = origin ? PDupwindNthAnti1At13 : At13[index] / xx; + PDupwindNthSymm2At23 = origin ? PDupwindNthSymm1At13 : At13[index] / xx; + PDupwindNthAnti2At33 = 0; + PDupwindNthSymm2At33 = 0; + + PDupwindNthAnti2B1 = 0; + PDupwindNthSymm2B1 = 0; + PDupwindNthAnti2B2 = origin ? PDupwindNthAnti1B1 : B1[index] / xx; + PDupwindNthSymm2B2 = origin ? PDupwindNthSymm1B1 : B1[index] / xx; + PDupwindNthAnti2B3 = 0; + PDupwindNthSymm2B3 = 0; + + PDupwindNthAnti2beta1 = 0; + PDupwindNthSymm2beta1 = 0; + PDupwindNthAnti2beta2 = origin ? PDupwindNthAnti1beta1 : beta1[index] / xx; + PDupwindNthSymm2beta2 = origin ? PDupwindNthSymm1beta1 : beta1[index] / xx; + PDupwindNthAnti2beta3 = 0; + PDupwindNthSymm2beta3 = 0; + + PDupwindNthAnti2gt11 = 0; + PDupwindNthSymm2gt11 = 0; + PDupwindNthAnti2gt12 = origin ? PDupwindNthAnti1gt11 - PDupwindNthAnti1gt22 : (gt11[index] - gt22[index]) / xx; + PDupwindNthSymm2gt12 = origin ? PDupwindNthSymm1gt11 - PDupwindNthSymm1gt22 : (gt11[index] - gt22[index]) / xx; + PDupwindNthAnti2gt13 = 0; + PDupwindNthSymm2gt13 = 0; + PDupwindNthAnti2gt22 = 0; + PDupwindNthSymm2gt22 = 0; + PDupwindNthAnti2gt23 = origin ? PDupwindNthAnti1gt13 : gt13[index] / xx; + PDupwindNthSymm2gt23 = origin ? PDupwindNthSymm1gt13 : gt13[index] / xx; + PDupwindNthAnti2gt33 = 0; + PDupwindNthSymm2gt33 = 0; + + PDupwindNthAnti2phi = 0; + PDupwindNthSymm2phi = 0; + PDupwindNthAnti2trK = 0; + PDupwindNthSymm2trK = 0; + PDupwindNthAnti2Xt2 = origin ? PDupwindNthAnti1Xt1 : Xt1[index] / xx; + PDupwindNthSymm2Xt2 = origin ? PDupwindNthSymm1Xt1 : Xt1[index] / xx; + /* Calculate temporaries and grid functions */ ptrdiff_t dir1 CCTK_ATTRIBUTE_UNUSED = kisgn(beta1L); @@ -1108,8 +1091,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, ptrdiff_t dir3 CCTK_ATTRIBUTE_UNUSED = kisgn(beta3L); - CCTK_REAL_VEC JacPDupwindNthAnti1A CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC JacPDupwindNthAnti1alpha CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthAnti1At11 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthAnti1At12 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthAnti1At13 CCTK_ATTRIBUTE_UNUSED; @@ -1133,8 +1114,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, CCTK_REAL_VEC JacPDupwindNthAnti1Xt1 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthAnti1Xt2 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthAnti1Xt3 CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC JacPDupwindNthAnti2A CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC JacPDupwindNthAnti2alpha CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthAnti2At11 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthAnti2At12 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthAnti2At13 CCTK_ATTRIBUTE_UNUSED; @@ -1158,8 +1137,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, CCTK_REAL_VEC JacPDupwindNthAnti2Xt1 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthAnti2Xt2 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthAnti2Xt3 CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC JacPDupwindNthAnti3A CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC JacPDupwindNthAnti3alpha CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthAnti3At11 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthAnti3At12 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthAnti3At13 CCTK_ATTRIBUTE_UNUSED; @@ -1183,8 +1160,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, CCTK_REAL_VEC JacPDupwindNthAnti3Xt1 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthAnti3Xt2 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthAnti3Xt3 CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC JacPDupwindNthSymm1A CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC JacPDupwindNthSymm1alpha CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthSymm1At11 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthSymm1At12 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthSymm1At13 CCTK_ATTRIBUTE_UNUSED; @@ -1208,8 +1183,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, CCTK_REAL_VEC JacPDupwindNthSymm1Xt1 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthSymm1Xt2 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthSymm1Xt3 CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC JacPDupwindNthSymm2A CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC JacPDupwindNthSymm2alpha CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthSymm2At11 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthSymm2At12 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthSymm2At13 CCTK_ATTRIBUTE_UNUSED; @@ -1233,8 +1206,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, CCTK_REAL_VEC JacPDupwindNthSymm2Xt1 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthSymm2Xt2 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthSymm2Xt3 CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC JacPDupwindNthSymm3A CCTK_ATTRIBUTE_UNUSED; - CCTK_REAL_VEC JacPDupwindNthSymm3alpha CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthSymm3At11 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthSymm3At12 CCTK_ATTRIBUTE_UNUSED; CCTK_REAL_VEC JacPDupwindNthSymm3At13 CCTK_ATTRIBUTE_UNUSED; @@ -1261,12 +1232,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, if (use_jacobian) { - JacPDupwindNthAnti1A = - kmadd(J11L,PDupwindNthAnti1A,kmadd(J21L,PDupwindNthAnti2A,kmul(J31L,PDupwindNthAnti3A))); - - JacPDupwindNthAnti1alpha = - kmadd(J11L,PDupwindNthAnti1alpha,kmadd(J21L,PDupwindNthAnti2alpha,kmul(J31L,PDupwindNthAnti3alpha))); - JacPDupwindNthAnti1At11 = kmadd(J11L,PDupwindNthAnti1At11,kmadd(J21L,PDupwindNthAnti2At11,kmul(J31L,PDupwindNthAnti3At11))); @@ -1336,12 +1301,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, JacPDupwindNthAnti1Xt3 = kmadd(J11L,PDupwindNthAnti1Xt3,kmadd(J21L,PDupwindNthAnti2Xt3,kmul(J31L,PDupwindNthAnti3Xt3))); - JacPDupwindNthSymm1A = - kmadd(J11L,PDupwindNthSymm1A,kmadd(J21L,PDupwindNthSymm2A,kmul(J31L,PDupwindNthSymm3A))); - - JacPDupwindNthSymm1alpha = - kmadd(J11L,PDupwindNthSymm1alpha,kmadd(J21L,PDupwindNthSymm2alpha,kmul(J31L,PDupwindNthSymm3alpha))); - JacPDupwindNthSymm1At11 = kmadd(J11L,PDupwindNthSymm1At11,kmadd(J21L,PDupwindNthSymm2At11,kmul(J31L,PDupwindNthSymm3At11))); @@ -1411,12 +1370,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, JacPDupwindNthSymm1Xt3 = kmadd(J11L,PDupwindNthSymm1Xt3,kmadd(J21L,PDupwindNthSymm2Xt3,kmul(J31L,PDupwindNthSymm3Xt3))); - JacPDupwindNthAnti2A = - kmadd(J12L,PDupwindNthAnti1A,kmadd(J22L,PDupwindNthAnti2A,kmul(J32L,PDupwindNthAnti3A))); - - JacPDupwindNthAnti2alpha = - kmadd(J12L,PDupwindNthAnti1alpha,kmadd(J22L,PDupwindNthAnti2alpha,kmul(J32L,PDupwindNthAnti3alpha))); - JacPDupwindNthAnti2At11 = kmadd(J12L,PDupwindNthAnti1At11,kmadd(J22L,PDupwindNthAnti2At11,kmul(J32L,PDupwindNthAnti3At11))); @@ -1486,12 +1439,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, JacPDupwindNthAnti2Xt3 = kmadd(J12L,PDupwindNthAnti1Xt3,kmadd(J22L,PDupwindNthAnti2Xt3,kmul(J32L,PDupwindNthAnti3Xt3))); - JacPDupwindNthSymm2A = - kmadd(J12L,PDupwindNthSymm1A,kmadd(J22L,PDupwindNthSymm2A,kmul(J32L,PDupwindNthSymm3A))); - - JacPDupwindNthSymm2alpha = - kmadd(J12L,PDupwindNthSymm1alpha,kmadd(J22L,PDupwindNthSymm2alpha,kmul(J32L,PDupwindNthSymm3alpha))); - JacPDupwindNthSymm2At11 = kmadd(J12L,PDupwindNthSymm1At11,kmadd(J22L,PDupwindNthSymm2At11,kmul(J32L,PDupwindNthSymm3At11))); @@ -1561,12 +1508,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, JacPDupwindNthSymm2Xt3 = kmadd(J12L,PDupwindNthSymm1Xt3,kmadd(J22L,PDupwindNthSymm2Xt3,kmul(J32L,PDupwindNthSymm3Xt3))); - JacPDupwindNthAnti3A = - kmadd(J13L,PDupwindNthAnti1A,kmadd(J23L,PDupwindNthAnti2A,kmul(J33L,PDupwindNthAnti3A))); - - JacPDupwindNthAnti3alpha = - kmadd(J13L,PDupwindNthAnti1alpha,kmadd(J23L,PDupwindNthAnti2alpha,kmul(J33L,PDupwindNthAnti3alpha))); - JacPDupwindNthAnti3At11 = kmadd(J13L,PDupwindNthAnti1At11,kmadd(J23L,PDupwindNthAnti2At11,kmul(J33L,PDupwindNthAnti3At11))); @@ -1636,12 +1577,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, JacPDupwindNthAnti3Xt3 = kmadd(J13L,PDupwindNthAnti1Xt3,kmadd(J23L,PDupwindNthAnti2Xt3,kmul(J33L,PDupwindNthAnti3Xt3))); - JacPDupwindNthSymm3A = - kmadd(J13L,PDupwindNthSymm1A,kmadd(J23L,PDupwindNthSymm2A,kmul(J33L,PDupwindNthSymm3A))); - - JacPDupwindNthSymm3alpha = - kmadd(J13L,PDupwindNthSymm1alpha,kmadd(J23L,PDupwindNthSymm2alpha,kmul(J33L,PDupwindNthSymm3alpha))); - JacPDupwindNthSymm3At11 = kmadd(J13L,PDupwindNthSymm1At11,kmadd(J23L,PDupwindNthSymm2At11,kmul(J33L,PDupwindNthSymm3At11))); @@ -1713,10 +1648,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, } else { - JacPDupwindNthAnti1A = PDupwindNthAnti1A; - - JacPDupwindNthAnti1alpha = PDupwindNthAnti1alpha; - JacPDupwindNthAnti1At11 = PDupwindNthAnti1At11; JacPDupwindNthAnti1At12 = PDupwindNthAnti1At12; @@ -1763,10 +1694,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, JacPDupwindNthAnti1Xt3 = PDupwindNthAnti1Xt3; - JacPDupwindNthSymm1A = PDupwindNthSymm1A; - - JacPDupwindNthSymm1alpha = PDupwindNthSymm1alpha; - JacPDupwindNthSymm1At11 = PDupwindNthSymm1At11; JacPDupwindNthSymm1At12 = PDupwindNthSymm1At12; @@ -1813,10 +1740,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, JacPDupwindNthSymm1Xt3 = PDupwindNthSymm1Xt3; - JacPDupwindNthAnti2A = PDupwindNthAnti2A; - - JacPDupwindNthAnti2alpha = PDupwindNthAnti2alpha; - JacPDupwindNthAnti2At11 = PDupwindNthAnti2At11; JacPDupwindNthAnti2At12 = PDupwindNthAnti2At12; @@ -1863,10 +1786,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, JacPDupwindNthAnti2Xt3 = PDupwindNthAnti2Xt3; - JacPDupwindNthSymm2A = PDupwindNthSymm2A; - - JacPDupwindNthSymm2alpha = PDupwindNthSymm2alpha; - JacPDupwindNthSymm2At11 = PDupwindNthSymm2At11; JacPDupwindNthSymm2At12 = PDupwindNthSymm2At12; @@ -1913,10 +1832,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, JacPDupwindNthSymm2Xt3 = PDupwindNthSymm2Xt3; - JacPDupwindNthAnti3A = PDupwindNthAnti3A; - - JacPDupwindNthAnti3alpha = PDupwindNthAnti3alpha; - JacPDupwindNthAnti3At11 = PDupwindNthAnti3At11; JacPDupwindNthAnti3At12 = PDupwindNthAnti3At12; @@ -1963,10 +1878,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, JacPDupwindNthAnti3Xt3 = PDupwindNthAnti3Xt3; - JacPDupwindNthSymm3A = PDupwindNthSymm3A; - - JacPDupwindNthSymm3alpha = PDupwindNthSymm3alpha; - JacPDupwindNthSymm3At11 = PDupwindNthSymm3At11; JacPDupwindNthSymm3At12 = PDupwindNthSymm3At12; @@ -2065,13 +1976,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, At33rhsL = kadd(At33rhsL,kmadd(beta1L,JacPDupwindNthAnti1At33,kmadd(beta2L,JacPDupwindNthAnti2At33,kmadd(beta3L,JacPDupwindNthAnti3At33,kmadd(JacPDupwindNthSymm1At33,kfabs(beta1L),kmadd(JacPDupwindNthSymm2At33,kfabs(beta2L),kmul(JacPDupwindNthSymm3At33,kfabs(beta3L)))))))); - alpharhsL = - kmadd(kmadd(beta1L,JacPDupwindNthAnti1alpha,kmadd(beta2L,JacPDupwindNthAnti2alpha,kmadd(beta3L,JacPDupwindNthAnti3alpha,kmadd(JacPDupwindNthSymm1alpha,kfabs(beta1L),kmadd(JacPDupwindNthSymm2alpha,kfabs(beta2L),kmul(JacPDupwindNthSymm3alpha,kfabs(beta3L))))))),ToReal(LapseAdvectionCoeff),alpharhsL); - - ArhsL = - kmadd(ToReal(LapseACoeff),kmsub(kmadd(beta1L,JacPDupwindNthAnti1A,kmadd(beta2L,JacPDupwindNthAnti2A,kmadd(beta3L,JacPDupwindNthAnti3A,kmadd(JacPDupwindNthSymm1A,kfabs(beta1L),kmadd(JacPDupwindNthSymm2A,kfabs(beta2L),kmul(JacPDupwindNthSymm3A,kfabs(beta3L))))))),ToReal(LapseAdvectionCoeff),kmul(kmadd(beta1L,JacPDupwindNthAnti1trK,kmadd(beta2L,JacPDupwindNthAnti2trK,kmadd(beta3L,JacPDupwindNthAnti3trK,kmadd(JacPDupwindNthSymm1trK,kfabs(beta1L),kmadd(JacPDupwindNthSymm2trK,kfabs(beta2L),kmul(JacPDupwindNthSymm3trK,kfabs(beta3L))))))),ToReal(-1 - + LapseAdvectionCoeff))),ArhsL); - beta1rhsL = kmadd(kmadd(beta1L,JacPDupwindNthAnti1beta1,kmadd(beta2L,JacPDupwindNthAnti2beta1,kmadd(beta3L,JacPDupwindNthAnti3beta1,kmadd(JacPDupwindNthSymm1beta1,kfabs(beta1L),kmadd(JacPDupwindNthSymm2beta1,kfabs(beta2L),kmul(JacPDupwindNthSymm3beta1,kfabs(beta3L))))))),ToReal(ShiftAdvectionCoeff),beta1rhsL); @@ -2095,8 +1999,6 @@ static void ML_BSSN_Advect_Body(const cGH* restrict const cctkGH, const int dir, /* Copy local copies back to grid functions */ vec_store_partial_prepare(i,vecimin,vecimax); - vec_store_nta_partial(alpharhs[index],alpharhsL); - vec_store_nta_partial(Arhs[index],ArhsL); vec_store_nta_partial(At11rhs[index],At11rhsL); vec_store_nta_partial(At12rhs[index],At12rhsL); vec_store_nta_partial(At13rhs[index],At13rhsL); @@ -2128,7 +2030,7 @@ extern "C" void ML_BSSN_Advect(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - + if (verbose > 1) { @@ -2143,14 +2045,10 @@ extern "C" void ML_BSSN_Advect(CCTK_ARGUMENTS) const char* const groups[] = { "ML_BSSN::ML_curv", "ML_BSSN::ML_curvrhs", - "ML_BSSN::ML_dtlapse", - "ML_BSSN::ML_dtlapserhs", "ML_BSSN::ML_dtshift", "ML_BSSN::ML_dtshiftrhs", "ML_BSSN::ML_Gamma", "ML_BSSN::ML_Gammarhs", - "ML_BSSN::ML_lapse", - "ML_BSSN::ML_lapserhs", "ML_BSSN::ML_log_confac", "ML_BSSN::ML_log_confacrhs", "ML_BSSN::ML_metric", @@ -2159,7 +2057,7 @@ extern "C" void ML_BSSN_Advect(CCTK_ARGUMENTS) "ML_BSSN::ML_shiftrhs", "ML_BSSN::ML_trace_curv", "ML_BSSN::ML_trace_curvrhs"}; - GenericFD_AssertGroupStorage(cctkGH, "ML_BSSN_Advect", 18, groups); + GenericFD_AssertGroupStorage(cctkGH, "ML_BSSN_Advect", 14, groups); switch (fdOrder) { |