diff options
author | Erik Schnetter <schnetter@cct.lsu.edu> | 2010-02-13 16:31:29 -0600 |
---|---|---|
committer | Erik Schnetter <schnetter@cct.lsu.edu> | 2010-02-13 16:31:29 -0600 |
commit | 36b4367cba09dd4e68bbbf0d71f9fd54b824ad31 (patch) | |
tree | 7458f820acbe08d7d0d200df478b74c7a7352f62 /ML_BSSN/src | |
parent | 9eea7b4930f6f85e477139187eb93e4cef2bef3d (diff) | |
parent | ed9b5d81cac4d2ff453c771a0d786bc4c24ec034 (diff) |
Merge /Users/eschnett/Cbeta/arrangements/McLachlan
Conflicts:
ML_BSSN/src/ML_BSSN_Minkowski.c
ML_BSSN/src/ML_BSSN_convertFromADMBase.c
ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.c
ML_BSSN/src/ML_BSSN_setBetaDriverSpatial.c
ML_BSSN/src/make.code.defn
ML_BSSN_Helper/src/SetGroupTags.c
ML_BSSN_M/param.ccl
ML_BSSN_M/schedule.ccl
ML_BSSN_M/src/ML_BSSN_M_Minkowski.c
ML_BSSN_M/src/ML_BSSN_M_convertFromADMBase.c
ML_BSSN_M/src/ML_BSSN_M_convertFromADMBaseGamma.c
ML_BSSN_M/src/ML_BSSN_M_setBetaDriverSpatial.c
ML_BSSN_M/src/make.code.defn
ML_BSSN_MP/src/ML_BSSN_MP_Minkowski.c
ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBase.c
ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBaseGamma.c
ML_BSSN_MP/src/ML_BSSN_MP_setBetaDriverSpatial.c
ML_BSSN_MP/src/make.code.defn
ML_BSSN_MP_Helper/src/SetGroupTags.c
ML_BSSN_M_Helper/schedule.ccl
ML_BSSN_M_Helper/src/SetGroupTags.c
m/McLachlan_BSSN.m
m/prototype/ML_BSSN_Helper/src/SetGroupTags.c
Diffstat (limited to 'ML_BSSN/src')
-rw-r--r-- | ML_BSSN/src/ML_BSSN_Minkowski.c | 4 | ||||
-rw-r--r-- | ML_BSSN/src/ML_BSSN_RHS.c | 48 | ||||
-rw-r--r-- | ML_BSSN/src/ML_BSSN_RHS1.c | 26 | ||||
-rw-r--r-- | ML_BSSN/src/ML_BSSN_RHS2.c | 42 | ||||
-rw-r--r-- | ML_BSSN/src/ML_BSSN_constraints.c | 34 | ||||
-rw-r--r-- | ML_BSSN/src/ML_BSSN_convertFromADMBase.c | 4 | ||||
-rw-r--r-- | ML_BSSN/src/ML_BSSN_setBetaDriverSpatial.c (renamed from ML_BSSN/src/ML_BSSN_setBetaDriver.c) | 14 | ||||
-rw-r--r-- | ML_BSSN/src/make.code.defn | 2 |
8 files changed, 40 insertions, 134 deletions
diff --git a/ML_BSSN/src/ML_BSSN_Minkowski.c b/ML_BSSN/src/ML_BSSN_Minkowski.c index c467955..29622aa 100644 --- a/ML_BSSN/src/ML_BSSN_Minkowski.c +++ b/ML_BSSN/src/ML_BSSN_Minkowski.c @@ -106,7 +106,6 @@ void ML_BSSN_Minkowski_Body(cGH const * restrict const cctkGH, int const dir, in // CCTK_REAL At11L = INITVALUE, At12L = INITVALUE, At13L = INITVALUE, At22L = INITVALUE, At23L = INITVALUE, At33L = INITVALUE; // CCTK_REAL B1L = INITVALUE, B2L = INITVALUE, B3L = INITVALUE; // CCTK_REAL beta1L = INITVALUE, beta2L = INITVALUE, beta3L = INITVALUE; - // CCTK_REAL etaL = INITVALUE; // CCTK_REAL gt11L = INITVALUE, gt12L = INITVALUE, gt13L = INITVALUE, gt22L = INITVALUE, gt23L = INITVALUE, gt33L = INITVALUE; // CCTK_REAL phiL = INITVALUE; // CCTK_REAL trKL = INITVALUE; @@ -176,8 +175,6 @@ void ML_BSSN_Minkowski_Body(cGH const * restrict const cctkGH, int const dir, in CCTK_REAL const B3L = 0; - CCTK_REAL const etaL = BetaDriver; - /* Copy local copies back to grid functions */ A[index] = AL; @@ -194,7 +191,6 @@ void ML_BSSN_Minkowski_Body(cGH const * restrict const cctkGH, int const dir, in beta1[index] = beta1L; beta2[index] = beta2L; beta3[index] = beta3L; - eta[index] = etaL; gt11[index] = gt11L; gt12[index] = gt12L; gt13[index] = gt13L; diff --git a/ML_BSSN/src/ML_BSSN_RHS.c b/ML_BSSN/src/ML_BSSN_RHS.c index f207bcc..ad6e249 100644 --- a/ML_BSSN/src/ML_BSSN_RHS.c +++ b/ML_BSSN/src/ML_BSSN_RHS.c @@ -132,8 +132,6 @@ void ML_BSSN_RHS_Body(cGH const * restrict const cctkGH, int const dir, int cons // CCTK_REAL Rphi11 = INITVALUE, Rphi12 = INITVALUE, Rphi13 = INITVALUE, Rphi22 = INITVALUE, Rphi23 = INITVALUE, Rphi33 = INITVALUE; // CCTK_REAL Rt11 = INITVALUE, Rt12 = INITVALUE, Rt13 = INITVALUE, Rt22 = INITVALUE, Rt23 = INITVALUE, Rt33 = INITVALUE; // CCTK_REAL S1 = INITVALUE, S2 = INITVALUE, S3 = INITVALUE; - // CCTK_REAL T00 = INITVALUE, T01 = INITVALUE, T02 = INITVALUE, T03 = INITVALUE, T11 = INITVALUE, T12 = INITVALUE; - // CCTK_REAL T13 = INITVALUE, T22 = INITVALUE, T23 = INITVALUE, T33 = INITVALUE; // CCTK_REAL trAts = INITVALUE; // CCTK_REAL trS = INITVALUE; // CCTK_REAL Xtn1 = INITVALUE, Xtn2 = INITVALUE, Xtn3 = INITVALUE; @@ -922,37 +920,17 @@ void ML_BSSN_RHS_Body(cGH const * restrict const cctkGH, int const dir, int cons CCTK_REAL const R33 = Rphi33 + Rt33; - CCTK_REAL const T00 = eTttL; + CCTK_REAL const rho = pow(alphaL,-2)*(eTttL - 2*(beta2L*eTtyL + beta3L*eTtzL) + + 2*(beta1L*(-eTtxL + beta2L*eTxyL + beta3L*eTxzL) + beta2L*beta3L*eTyzL) + eTxxL*SQR(beta1L) + eTyyL*SQR(beta2L) + + eTzzL*SQR(beta3L)); - CCTK_REAL const T01 = eTtxL; + CCTK_REAL const S1 = (-eTtxL + beta1L*eTxxL + beta2L*eTxyL + beta3L*eTxzL)*INV(alphaL); - CCTK_REAL const T02 = eTtyL; + CCTK_REAL const S2 = (-eTtyL + beta1L*eTxyL + beta2L*eTyyL + beta3L*eTyzL)*INV(alphaL); - CCTK_REAL const T03 = eTtzL; + CCTK_REAL const S3 = (-eTtzL + beta1L*eTxzL + beta2L*eTyzL + beta3L*eTzzL)*INV(alphaL); - CCTK_REAL const T11 = eTxxL; - - CCTK_REAL const T12 = eTxyL; - - CCTK_REAL const T13 = eTxzL; - - CCTK_REAL const T22 = eTyyL; - - CCTK_REAL const T23 = eTyzL; - - CCTK_REAL const T33 = eTzzL; - - CCTK_REAL const rho = pow(alphaL,-2)*(T00 - 2*(beta2L*T02 + beta3L*T03) + - 2*(beta1L*(-T01 + beta2L*T12 + beta3L*T13) + beta2L*beta3L*T23) + T11*SQR(beta1L) + T22*SQR(beta2L) + - T33*SQR(beta3L)); - - CCTK_REAL const S1 = (-T01 + beta1L*T11 + beta2L*T12 + beta3L*T13)*INV(alphaL); - - CCTK_REAL const S2 = (-T02 + beta1L*T12 + beta2L*T22 + beta3L*T23)*INV(alphaL); - - CCTK_REAL const S3 = (-T03 + beta1L*T13 + beta2L*T23 + beta3L*T33)*INV(alphaL); - - CCTK_REAL const trS = gu11*T11 + gu22*T22 + 2*(gu21*T12 + gu31*T13 + gu32*T23) + gu33*T33; + CCTK_REAL const trS = eTxxL*gu11 + eTyyL*gu22 + 2*(eTxyL*gu21 + eTxzL*gu31 + eTyzL*gu32) + eTzzL*gu33; CCTK_REAL const phirhsL = PDupwindNth1(phi, i, j, k)*beta1L + PDupwindNth2(phi, i, j, k)*beta2L + PDupwindNth3(phi, i, j, k)*beta3L + (PDstandardNth1beta1 + PDstandardNth2beta2 + PDstandardNth3beta3)* @@ -1062,7 +1040,7 @@ void ML_BSSN_RHS_Body(cGH const * restrict const cctkGH, int const dir, int cons At11L*(1.333333333333333333333333333333333333333*PDstandardNth1beta1 - 0.6666666666666666666666666666666666666667*(PDstandardNth2beta2 + PDstandardNth3beta3) + alphaL*trKL) + em4phi*(Ats11 - 0.3333333333333333333333333333333333333333*g11*trAts + - alphaL*(-25.13274122871834590770114706623602307358*T11 + 8.377580409572781969233715688745341024526*g11*trS)); + alphaL*(-25.13274122871834590770114706623602307358*eTxxL + 8.377580409572781969233715688745341024526*g11*trS)); CCTK_REAL const At12rhsL = -2.*alphaL*(At11L*Atm12 + At12L*Atm22 + At13L*Atm32) + PDupwindNth1(At12, i, j, k)*beta1L + PDupwindNth2(At12, i, j, k)*beta2L + PDupwindNth3(At12, i, j, k)*beta3L + At22L*PDstandardNth1beta2 + @@ -1070,7 +1048,7 @@ void ML_BSSN_RHS_Body(cGH const * restrict const cctkGH, int const dir, int cons At12L*(0.3333333333333333333333333333333333333333*(PDstandardNth1beta1 + PDstandardNth2beta2) - 0.6666666666666666666666666666666666666667*PDstandardNth3beta3 + alphaL*trKL) + em4phi*(Ats12 - 0.3333333333333333333333333333333333333333*g12*trAts + - alphaL*(-25.13274122871834590770114706623602307358*T12 + 8.377580409572781969233715688745341024526*g12*trS)); + alphaL*(-25.13274122871834590770114706623602307358*eTxyL + 8.377580409572781969233715688745341024526*g12*trS)); CCTK_REAL const At13rhsL = -2.*alphaL*(At11L*Atm13 + At12L*Atm23 + At13L*Atm33) + PDupwindNth1(At13, i, j, k)*beta1L + PDupwindNth2(At13, i, j, k)*beta2L + PDupwindNth3(At13, i, j, k)*beta3L + At23L*PDstandardNth1beta2 + @@ -1078,7 +1056,7 @@ void ML_BSSN_RHS_Body(cGH const * restrict const cctkGH, int const dir, int cons At13L*(-0.6666666666666666666666666666666666666667*PDstandardNth2beta2 + 0.3333333333333333333333333333333333333333*(PDstandardNth1beta1 + PDstandardNth3beta3) + alphaL*trKL) + em4phi*(Ats13 - 0.3333333333333333333333333333333333333333*g13*trAts + - alphaL*(-25.13274122871834590770114706623602307358*T13 + 8.377580409572781969233715688745341024526*g13*trS)); + alphaL*(-25.13274122871834590770114706623602307358*eTxzL + 8.377580409572781969233715688745341024526*g13*trS)); CCTK_REAL const At22rhsL = -2.*alphaL*(At12L*Atm12 + At22L*Atm22 + At23L*Atm32) + PDupwindNth1(At22, i, j, k)*beta1L + PDupwindNth2(At22, i, j, k)*beta2L + PDupwindNth3(At22, i, j, k)*beta3L + @@ -1086,7 +1064,7 @@ void ML_BSSN_RHS_Body(cGH const * restrict const cctkGH, int const dir, int cons At22L*(1.333333333333333333333333333333333333333*PDstandardNth2beta2 - 0.6666666666666666666666666666666666666667*(PDstandardNth1beta1 + PDstandardNth3beta3) + alphaL*trKL) + em4phi*(Ats22 - 0.3333333333333333333333333333333333333333*g22*trAts + - alphaL*(-25.13274122871834590770114706623602307358*T22 + 8.377580409572781969233715688745341024526*g22*trS)); + alphaL*(-25.13274122871834590770114706623602307358*eTyyL + 8.377580409572781969233715688745341024526*g22*trS)); CCTK_REAL const At23rhsL = -2.*alphaL*(At12L*Atm13 + At22L*Atm23 + At23L*Atm33) + PDupwindNth1(At23, i, j, k)*beta1L + PDupwindNth2(At23, i, j, k)*beta2L + PDupwindNth3(At23, i, j, k)*beta3L + At13L*PDstandardNth2beta1 + @@ -1094,7 +1072,7 @@ void ML_BSSN_RHS_Body(cGH const * restrict const cctkGH, int const dir, int cons At23L*(-0.6666666666666666666666666666666666666667*PDstandardNth1beta1 + 0.3333333333333333333333333333333333333333*(PDstandardNth2beta2 + PDstandardNth3beta3) + alphaL*trKL) + em4phi*(Ats23 - 0.3333333333333333333333333333333333333333*g23*trAts + - alphaL*(-25.13274122871834590770114706623602307358*T23 + 8.377580409572781969233715688745341024526*g23*trS)); + alphaL*(-25.13274122871834590770114706623602307358*eTyzL + 8.377580409572781969233715688745341024526*g23*trS)); CCTK_REAL const At33rhsL = -2.*alphaL*(At13L*Atm13 + At23L*Atm23 + At33L*Atm33) + PDupwindNth1(At33, i, j, k)*beta1L + PDupwindNth2(At33, i, j, k)*beta2L + PDupwindNth3(At33, i, j, k)*beta3L + @@ -1102,7 +1080,7 @@ void ML_BSSN_RHS_Body(cGH const * restrict const cctkGH, int const dir, int cons At33L*(-0.6666666666666666666666666666666666666667*(PDstandardNth1beta1 + PDstandardNth2beta2) + 1.333333333333333333333333333333333333333*PDstandardNth3beta3 + alphaL*trKL) + em4phi*(Ats33 - 0.3333333333333333333333333333333333333333*g33*trAts + - alphaL*(-25.13274122871834590770114706623602307358*T33 + 8.377580409572781969233715688745341024526*g33*trS)); + alphaL*(-25.13274122871834590770114706623602307358*eTzzL + 8.377580409572781969233715688745341024526*g33*trS)); CCTK_REAL const alpharhsL = (PDupwindNth1(alpha, i, j, k)*beta1L + PDupwindNth2(alpha, i, j, k)*beta2L + PDupwindNth3(alpha, i, j, k)*beta3L)*LapseAdvectionCoeff + diff --git a/ML_BSSN/src/ML_BSSN_RHS1.c b/ML_BSSN/src/ML_BSSN_RHS1.c index 71e93dc..63d25bb 100644 --- a/ML_BSSN/src/ML_BSSN_RHS1.c +++ b/ML_BSSN/src/ML_BSSN_RHS1.c @@ -111,8 +111,6 @@ void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir, int con // CCTK_REAL Gt311 = INITVALUE, Gt312 = INITVALUE, Gt313 = INITVALUE, Gt322 = INITVALUE, Gt323 = INITVALUE, Gt333 = INITVALUE; // CCTK_REAL gtu11 = INITVALUE, gtu21 = INITVALUE, gtu22 = INITVALUE, gtu31 = INITVALUE, gtu32 = INITVALUE, gtu33 = INITVALUE; // CCTK_REAL S1 = INITVALUE, S2 = INITVALUE, S3 = INITVALUE; - // CCTK_REAL T01 = INITVALUE, T02 = INITVALUE, T03 = INITVALUE, T11 = INITVALUE, T12 = INITVALUE, T13 = INITVALUE; - // CCTK_REAL T22 = INITVALUE, T23 = INITVALUE, T33 = INITVALUE; // CCTK_REAL Xtn1 = INITVALUE, Xtn2 = INITVALUE, Xtn3 = INITVALUE; /* Declare local copies of grid functions */ @@ -410,29 +408,11 @@ void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir, int con CCTK_REAL const Atu33 = Atm31*gtu31 + Atm32*gtu32 + Atm33*gtu33; - CCTK_REAL const T01 = eTtxL; + CCTK_REAL const S1 = (-eTtxL + beta1L*eTxxL + beta2L*eTxyL + beta3L*eTxzL)*INV(alphaL); - CCTK_REAL const T02 = eTtyL; + CCTK_REAL const S2 = (-eTtyL + beta1L*eTxyL + beta2L*eTyyL + beta3L*eTyzL)*INV(alphaL); - CCTK_REAL const T03 = eTtzL; - - CCTK_REAL const T11 = eTxxL; - - CCTK_REAL const T12 = eTxyL; - - CCTK_REAL const T13 = eTxzL; - - CCTK_REAL const T22 = eTyyL; - - CCTK_REAL const T23 = eTyzL; - - CCTK_REAL const T33 = eTzzL; - - CCTK_REAL const S1 = (-T01 + beta1L*T11 + beta2L*T12 + beta3L*T13)*INV(alphaL); - - CCTK_REAL const S2 = (-T02 + beta1L*T12 + beta2L*T22 + beta3L*T23)*INV(alphaL); - - CCTK_REAL const S3 = (-T03 + beta1L*T13 + beta2L*T23 + beta3L*T33)*INV(alphaL); + CCTK_REAL const S3 = (-eTtzL + beta1L*eTxzL + beta2L*eTyzL + beta3L*eTzzL)*INV(alphaL); CCTK_REAL const phirhsL = PDupwindNth1(phi, i, j, k)*beta1L + PDupwindNth2(phi, i, j, k)*beta2L + PDupwindNth3(phi, i, j, k)*beta3L + (PDstandardNth1beta1 + PDstandardNth2beta2 + PDstandardNth3beta3)* diff --git a/ML_BSSN/src/ML_BSSN_RHS2.c b/ML_BSSN/src/ML_BSSN_RHS2.c index a8ff2dc..3c6b439 100644 --- a/ML_BSSN/src/ML_BSSN_RHS2.c +++ b/ML_BSSN/src/ML_BSSN_RHS2.c @@ -138,8 +138,6 @@ void ML_BSSN_RHS2_Body(cGH const * restrict const cctkGH, int const dir, int con // CCTK_REAL rho = INITVALUE; // CCTK_REAL Rphi11 = INITVALUE, Rphi12 = INITVALUE, Rphi13 = INITVALUE, Rphi22 = INITVALUE, Rphi23 = INITVALUE, Rphi33 = INITVALUE; // CCTK_REAL Rt11 = INITVALUE, Rt12 = INITVALUE, Rt13 = INITVALUE, Rt22 = INITVALUE, Rt23 = INITVALUE, Rt33 = INITVALUE; - // CCTK_REAL T00 = INITVALUE, T01 = INITVALUE, T02 = INITVALUE, T03 = INITVALUE, T11 = INITVALUE, T12 = INITVALUE; - // CCTK_REAL T13 = INITVALUE, T22 = INITVALUE, T23 = INITVALUE, T33 = INITVALUE; // CCTK_REAL trAts = INITVALUE; // CCTK_REAL trS = INITVALUE; // CCTK_REAL Xtn1 = INITVALUE, Xtn2 = INITVALUE, Xtn3 = INITVALUE; @@ -742,31 +740,11 @@ void ML_BSSN_RHS2_Body(cGH const * restrict const cctkGH, int const dir, int con CCTK_REAL const R33 = Rphi33 + Rt33; - CCTK_REAL const T00 = eTttL; + CCTK_REAL const rho = pow(alphaL,-2)*(eTttL - 2*(beta2L*eTtyL + beta3L*eTtzL) + + 2*(beta1L*(-eTtxL + beta2L*eTxyL + beta3L*eTxzL) + beta2L*beta3L*eTyzL) + eTxxL*SQR(beta1L) + eTyyL*SQR(beta2L) + + eTzzL*SQR(beta3L)); - CCTK_REAL const T01 = eTtxL; - - CCTK_REAL const T02 = eTtyL; - - CCTK_REAL const T03 = eTtzL; - - CCTK_REAL const T11 = eTxxL; - - CCTK_REAL const T12 = eTxyL; - - CCTK_REAL const T13 = eTxzL; - - CCTK_REAL const T22 = eTyyL; - - CCTK_REAL const T23 = eTyzL; - - CCTK_REAL const T33 = eTzzL; - - CCTK_REAL const rho = pow(alphaL,-2)*(T00 - 2*(beta2L*T02 + beta3L*T03) + - 2*(beta1L*(-T01 + beta2L*T12 + beta3L*T13) + beta2L*beta3L*T23) + T11*SQR(beta1L) + T22*SQR(beta2L) + - T33*SQR(beta3L)); - - CCTK_REAL const trS = gu11*T11 + gu22*T22 + 2*(gu21*T12 + gu31*T13 + gu32*T23) + gu33*T33; + CCTK_REAL const trS = eTxxL*gu11 + eTyyL*gu22 + 2*(eTxyL*gu21 + eTxzL*gu31 + eTyzL*gu32) + eTzzL*gu33; CCTK_REAL const trKrhsL = PDupwindNth1(trK, i, j, k)*beta1L + PDupwindNth2(trK, i, j, k)*beta2L + PDupwindNth3(trK, i, j, k)*beta3L + (G111*gu11 + G122*gu22 + 2.*(G112*gu21 + G113*gu31 + G123*gu32) + G133*gu33)* @@ -804,7 +782,7 @@ void ML_BSSN_RHS2_Body(cGH const * restrict const cctkGH, int const dir, int con At11L*(1.333333333333333333333333333333333333333*PDstandardNth1beta1 - 0.6666666666666666666666666666666666666667*(PDstandardNth2beta2 + PDstandardNth3beta3) + alphaL*trKL) + em4phi*(Ats11 - 0.3333333333333333333333333333333333333333*g11*trAts + - alphaL*(-25.13274122871834590770114706623602307358*T11 + 8.377580409572781969233715688745341024526*g11*trS)); + alphaL*(-25.13274122871834590770114706623602307358*eTxxL + 8.377580409572781969233715688745341024526*g11*trS)); CCTK_REAL const At12rhsL = -2.*alphaL*(At11L*Atm12 + At12L*Atm22 + At13L*Atm32) + PDupwindNth1(At12, i, j, k)*beta1L + PDupwindNth2(At12, i, j, k)*beta2L + PDupwindNth3(At12, i, j, k)*beta3L + At22L*PDstandardNth1beta2 + @@ -812,7 +790,7 @@ void ML_BSSN_RHS2_Body(cGH const * restrict const cctkGH, int const dir, int con At12L*(0.3333333333333333333333333333333333333333*(PDstandardNth1beta1 + PDstandardNth2beta2) - 0.6666666666666666666666666666666666666667*PDstandardNth3beta3 + alphaL*trKL) + em4phi*(Ats12 - 0.3333333333333333333333333333333333333333*g12*trAts + - alphaL*(-25.13274122871834590770114706623602307358*T12 + 8.377580409572781969233715688745341024526*g12*trS)); + alphaL*(-25.13274122871834590770114706623602307358*eTxyL + 8.377580409572781969233715688745341024526*g12*trS)); CCTK_REAL const At13rhsL = -2.*alphaL*(At11L*Atm13 + At12L*Atm23 + At13L*Atm33) + PDupwindNth1(At13, i, j, k)*beta1L + PDupwindNth2(At13, i, j, k)*beta2L + PDupwindNth3(At13, i, j, k)*beta3L + At23L*PDstandardNth1beta2 + @@ -820,7 +798,7 @@ void ML_BSSN_RHS2_Body(cGH const * restrict const cctkGH, int const dir, int con At13L*(-0.6666666666666666666666666666666666666667*PDstandardNth2beta2 + 0.3333333333333333333333333333333333333333*(PDstandardNth1beta1 + PDstandardNth3beta3) + alphaL*trKL) + em4phi*(Ats13 - 0.3333333333333333333333333333333333333333*g13*trAts + - alphaL*(-25.13274122871834590770114706623602307358*T13 + 8.377580409572781969233715688745341024526*g13*trS)); + alphaL*(-25.13274122871834590770114706623602307358*eTxzL + 8.377580409572781969233715688745341024526*g13*trS)); CCTK_REAL const At22rhsL = -2.*alphaL*(At12L*Atm12 + At22L*Atm22 + At23L*Atm32) + PDupwindNth1(At22, i, j, k)*beta1L + PDupwindNth2(At22, i, j, k)*beta2L + PDupwindNth3(At22, i, j, k)*beta3L + @@ -828,7 +806,7 @@ void ML_BSSN_RHS2_Body(cGH const * restrict const cctkGH, int const dir, int con At22L*(1.333333333333333333333333333333333333333*PDstandardNth2beta2 - 0.6666666666666666666666666666666666666667*(PDstandardNth1beta1 + PDstandardNth3beta3) + alphaL*trKL) + em4phi*(Ats22 - 0.3333333333333333333333333333333333333333*g22*trAts + - alphaL*(-25.13274122871834590770114706623602307358*T22 + 8.377580409572781969233715688745341024526*g22*trS)); + alphaL*(-25.13274122871834590770114706623602307358*eTyyL + 8.377580409572781969233715688745341024526*g22*trS)); CCTK_REAL const At23rhsL = -2.*alphaL*(At12L*Atm13 + At22L*Atm23 + At23L*Atm33) + PDupwindNth1(At23, i, j, k)*beta1L + PDupwindNth2(At23, i, j, k)*beta2L + PDupwindNth3(At23, i, j, k)*beta3L + At13L*PDstandardNth2beta1 + @@ -836,7 +814,7 @@ void ML_BSSN_RHS2_Body(cGH const * restrict const cctkGH, int const dir, int con At23L*(-0.6666666666666666666666666666666666666667*PDstandardNth1beta1 + 0.3333333333333333333333333333333333333333*(PDstandardNth2beta2 + PDstandardNth3beta3) + alphaL*trKL) + em4phi*(Ats23 - 0.3333333333333333333333333333333333333333*g23*trAts + - alphaL*(-25.13274122871834590770114706623602307358*T23 + 8.377580409572781969233715688745341024526*g23*trS)); + alphaL*(-25.13274122871834590770114706623602307358*eTyzL + 8.377580409572781969233715688745341024526*g23*trS)); CCTK_REAL const At33rhsL = -2.*alphaL*(At13L*Atm13 + At23L*Atm23 + At33L*Atm33) + PDupwindNth1(At33, i, j, k)*beta1L + PDupwindNth2(At33, i, j, k)*beta2L + PDupwindNth3(At33, i, j, k)*beta3L + @@ -844,7 +822,7 @@ void ML_BSSN_RHS2_Body(cGH const * restrict const cctkGH, int const dir, int con At33L*(-0.6666666666666666666666666666666666666667*(PDstandardNth1beta1 + PDstandardNth2beta2) + 1.333333333333333333333333333333333333333*PDstandardNth3beta3 + alphaL*trKL) + em4phi*(Ats33 - 0.3333333333333333333333333333333333333333*g33*trAts + - alphaL*(-25.13274122871834590770114706623602307358*T33 + 8.377580409572781969233715688745341024526*g33*trS)); + alphaL*(-25.13274122871834590770114706623602307358*eTzzL + 8.377580409572781969233715688745341024526*g33*trS)); CCTK_REAL const alpharhsL = (PDupwindNth1(alpha, i, j, k)*beta1L + PDupwindNth2(alpha, i, j, k)*beta2L + PDupwindNth3(alpha, i, j, k)*beta3L)*LapseAdvectionCoeff + diff --git a/ML_BSSN/src/ML_BSSN_constraints.c b/ML_BSSN/src/ML_BSSN_constraints.c index f63c3fd..48db1b3 100644 --- a/ML_BSSN/src/ML_BSSN_constraints.c +++ b/ML_BSSN/src/ML_BSSN_constraints.c @@ -117,8 +117,6 @@ void ML_BSSN_constraints_Body(cGH const * restrict const cctkGH, int const dir, // CCTK_REAL Rphi11 = INITVALUE, Rphi12 = INITVALUE, Rphi13 = INITVALUE, Rphi22 = INITVALUE, Rphi23 = INITVALUE, Rphi33 = INITVALUE; // CCTK_REAL Rt11 = INITVALUE, Rt12 = INITVALUE, Rt13 = INITVALUE, Rt22 = INITVALUE, Rt23 = INITVALUE, Rt33 = INITVALUE; // CCTK_REAL S1 = INITVALUE, S2 = INITVALUE, S3 = INITVALUE; - // CCTK_REAL T00 = INITVALUE, T01 = INITVALUE, T02 = INITVALUE, T03 = INITVALUE, T11 = INITVALUE, T12 = INITVALUE; - // CCTK_REAL T13 = INITVALUE, T22 = INITVALUE, T23 = INITVALUE, T33 = INITVALUE; // CCTK_REAL trR = INITVALUE; /* Declare local copies of grid functions */ @@ -793,35 +791,15 @@ void ML_BSSN_constraints_Body(cGH const * restrict const cctkGH, int const dir, CCTK_REAL const Atm33 = At13L*gtu31 + At23L*gtu32 + At33L*gtu33; - CCTK_REAL const T00 = eTttL; + CCTK_REAL const rho = pow(alphaL,-2)*(eTttL - 2*(beta2L*eTtyL + beta3L*eTtzL) + + 2*(beta1L*(-eTtxL + beta2L*eTxyL + beta3L*eTxzL) + beta2L*beta3L*eTyzL) + eTxxL*SQR(beta1L) + eTyyL*SQR(beta2L) + + eTzzL*SQR(beta3L)); - CCTK_REAL const T01 = eTtxL; + CCTK_REAL const S1 = (-eTtxL + beta1L*eTxxL + beta2L*eTxyL + beta3L*eTxzL)*INV(alphaL); - CCTK_REAL const T02 = eTtyL; + CCTK_REAL const S2 = (-eTtyL + beta1L*eTxyL + beta2L*eTyyL + beta3L*eTyzL)*INV(alphaL); - CCTK_REAL const T03 = eTtzL; - - CCTK_REAL const T11 = eTxxL; - - CCTK_REAL const T12 = eTxyL; - - CCTK_REAL const T13 = eTxzL; - - CCTK_REAL const T22 = eTyyL; - - CCTK_REAL const T23 = eTyzL; - - CCTK_REAL const T33 = eTzzL; - - CCTK_REAL const rho = pow(alphaL,-2)*(T00 - 2*(beta2L*T02 + beta3L*T03) + - 2*(beta1L*(-T01 + beta2L*T12 + beta3L*T13) + beta2L*beta3L*T23) + T11*SQR(beta1L) + T22*SQR(beta2L) + - T33*SQR(beta3L)); - - CCTK_REAL const S1 = (-T01 + beta1L*T11 + beta2L*T12 + beta3L*T13)*INV(alphaL); - - CCTK_REAL const S2 = (-T02 + beta1L*T12 + beta2L*T22 + beta3L*T23)*INV(alphaL); - - CCTK_REAL const S3 = (-T03 + beta1L*T13 + beta2L*T23 + beta3L*T33)*INV(alphaL); + CCTK_REAL const S3 = (-eTtzL + beta1L*eTxzL + beta2L*eTyzL + beta3L*eTzzL)*INV(alphaL); CCTK_REAL const HL = -2.*(Atm12*Atm21 + Atm13*Atm31 + Atm23*Atm32) - 50.26548245743669181540229413247204614715*rho + trR - 1.*(SQR(Atm11) + SQR(Atm22) + SQR(Atm33)) + 0.6666666666666666666666666666666666666667*SQR(trKL); diff --git a/ML_BSSN/src/ML_BSSN_convertFromADMBase.c b/ML_BSSN/src/ML_BSSN_convertFromADMBase.c index 95c7d4c..1b93cb2 100644 --- a/ML_BSSN/src/ML_BSSN_convertFromADMBase.c +++ b/ML_BSSN/src/ML_BSSN_convertFromADMBase.c @@ -112,7 +112,6 @@ void ML_BSSN_convertFromADMBase_Body(cGH const * restrict const cctkGH, int cons // CCTK_REAL betaxL = INITVALUE; // CCTK_REAL betayL = INITVALUE; // CCTK_REAL betazL = INITVALUE; - // CCTK_REAL etaL = INITVALUE; // CCTK_REAL gt11L = INITVALUE, gt12L = INITVALUE, gt13L = INITVALUE, gt22L = INITVALUE, gt23L = INITVALUE, gt33L = INITVALUE; // CCTK_REAL gxxL = INITVALUE; // CCTK_REAL gxyL = INITVALUE; @@ -223,8 +222,6 @@ void ML_BSSN_convertFromADMBase_Body(cGH const * restrict const cctkGH, int cons CCTK_REAL const beta3L = betazL; - CCTK_REAL const etaL = BetaDriver; - /* Copy local copies back to grid functions */ alpha[index] = alphaL; @@ -237,7 +234,6 @@ void ML_BSSN_convertFromADMBase_Body(cGH const * restrict const cctkGH, int cons beta1[index] = beta1L; beta2[index] = beta2L; beta3[index] = beta3L; - eta[index] = etaL; gt11[index] = gt11L; gt12[index] = gt12L; gt13[index] = gt13L; diff --git a/ML_BSSN/src/ML_BSSN_setBetaDriver.c b/ML_BSSN/src/ML_BSSN_setBetaDriverSpatial.c index 2f6a35f..1e726e2 100644 --- a/ML_BSSN/src/ML_BSSN_setBetaDriver.c +++ b/ML_BSSN/src/ML_BSSN_setBetaDriverSpatial.c @@ -20,7 +20,7 @@ #define CUB(x) ((x) * (x) * (x)) #define QAD(x) ((x) * (x) * (x) * (x)) -void ML_BSSN_setBetaDriver_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[]) +void ML_BSSN_setBetaDriverSpatial_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[]) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; @@ -44,10 +44,10 @@ void ML_BSSN_setBetaDriver_Body(cGH const * restrict const cctkGH, int const dir if (verbose > 1) { - CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_BSSN_setBetaDriver_Body"); + CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_BSSN_setBetaDriverSpatial_Body"); } - if (cctk_iteration % ML_BSSN_setBetaDriver_calc_every != ML_BSSN_setBetaDriver_calc_offset) + if (cctk_iteration % ML_BSSN_setBetaDriverSpatial_calc_every != ML_BSSN_setBetaDriverSpatial_calc_offset) { return; } @@ -89,7 +89,7 @@ void ML_BSSN_setBetaDriver_Body(cGH const * restrict const cctkGH, int const dir /* Loop over the grid points */ #pragma omp parallel - LC_LOOP3 (ML_BSSN_setBetaDriver, + LC_LOOP3 (ML_BSSN_setBetaDriverSpatial, i,j,k, min[0],min[1],min[2], max[0],max[1],max[2], cctk_lsh[0],cctk_lsh[1],cctk_lsh[2]) { @@ -127,13 +127,13 @@ void ML_BSSN_setBetaDriver_Body(cGH const * restrict const cctkGH, int const dir /* Copy local copies back to subblock grid functions */ } - LC_ENDLOOP3 (ML_BSSN_setBetaDriver); + LC_ENDLOOP3 (ML_BSSN_setBetaDriverSpatial); } -void ML_BSSN_setBetaDriver(CCTK_ARGUMENTS) +void ML_BSSN_setBetaDriverSpatial(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - GenericFD_LoopOverEverything(cctkGH, &ML_BSSN_setBetaDriver_Body); + GenericFD_LoopOverEverything(cctkGH, &ML_BSSN_setBetaDriverSpatial_Body); } diff --git a/ML_BSSN/src/make.code.defn b/ML_BSSN/src/make.code.defn index dcab216..eed6fb1 100644 --- a/ML_BSSN/src/make.code.defn +++ b/ML_BSSN/src/make.code.defn @@ -1,3 +1,3 @@ # File produced by Kranc -SRCS = Startup.c RegisterMoL.c RegisterSymmetries.c ML_BSSN_Minkowski.c ML_BSSN_convertFromADMBase.c ML_BSSN_convertFromADMBaseGamma.c ML_BSSN_setBetaDriver.c ML_BSSN_RHS.c ML_BSSN_RHS1.c ML_BSSN_RHS2.c ML_BSSN_RHSStaticBoundary.c ML_BSSN_RHSRadiativeBoundary.c ML_BSSN_enforce.c ML_BSSN_enforce2.c ML_BSSN_boundary.c ML_BSSN_convertToADMBase.c ML_BSSN_convertToADMBaseDtLapseShift.c ML_BSSN_convertToADMBaseDtLapseShiftBoundary.c ML_BSSN_convertToADMBaseFakeDtLapseShift.c ML_BSSN_constraints.c ML_BSSN_constraints_boundary.c Boundaries.c +SRCS = Startup.c RegisterMoL.c RegisterSymmetries.c ML_BSSN_Minkowski.c ML_BSSN_convertFromADMBase.c ML_BSSN_convertFromADMBaseGamma.c ML_BSSN_setBetaDriverConstant.c ML_BSSN_setBetaDriverSpatial.c ML_BSSN_RHS.c ML_BSSN_RHS1.c ML_BSSN_RHS2.c ML_BSSN_RHSStaticBoundary.c ML_BSSN_RHSRadiativeBoundary.c ML_BSSN_enforce.c ML_BSSN_enforce2.c ML_BSSN_boundary.c ML_BSSN_convertToADMBase.c ML_BSSN_convertToADMBaseDtLapseShift.c ML_BSSN_convertToADMBaseDtLapseShiftBoundary.c ML_BSSN_convertToADMBaseFakeDtLapseShift.c ML_BSSN_constraints.c ML_BSSN_constraints_boundary.c Boundaries.c |