Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix extrinsic curvature K_ud in constraints evaluation and waveform #604

Merged
merged 2 commits into from
Oct 7, 2024
Merged

fix extrinsic curvature K_ud in constraints evaluation and waveform #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8831ea4
fix extrinsic curvature
HengruiZhu99 Sep 30, 2024
bb92b69
fix lint
HengruiZhu99 Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/z4c/z4c_adm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ void Z4c::ADMConstraints(MeshBlockPack *pmbp) {
AthenaScratchTensor<Real, TensorSymm::SYM2, 3, 2> g_uu;
//AthenaScratchTensor<Real, TensorSymm::SYM2, 3, 2> g_uu_z4c;
AthenaScratchTensor<Real, TensorSymm::SYM2, 3, 2> R_dd;
AthenaScratchTensor<Real, TensorSymm::SYM2, 3, 2> K_ud;
AthenaScratchTensor<Real, TensorSymm::NONE, 3, 2> K_ud;

AthenaScratchTensor<Real, TensorSymm::SYM2, 3, 3> dg_ddd;
AthenaScratchTensor<Real, TensorSymm::SYM2, 3, 3> dg_ddd_z4c;
Expand Down Expand Up @@ -430,7 +430,7 @@ void Z4c::ADMConstraints(MeshBlockPack *pmbp) {
//
Real K = 0.0;
for(int a = 0; a < 3; ++a) {
for(int b = a; b < 3; ++b) {
for(int b = 0; b < 3; ++b) {
K_ud(a,b) = 0.0;
for(int c = 0; c < 3; ++c) {
K_ud(a,b) += g_uu(a,c) * adm.vK_dd(m,c,b,k,j,i);
Expand Down
5 changes: 2 additions & 3 deletions src/z4c/z4c_calculate_weyl_scalars.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ void Z4c::Z4cWeyl(MeshBlockPack *pmbp) {
// inverse of conf. metric
AthenaScratchTensor<Real, TensorSymm::SYM2, 3, 2> g_uu;
AthenaScratchTensor<Real, TensorSymm::SYM2, 3, 2> R_dd; // Ricci tensor
AthenaScratchTensor<Real, TensorSymm::SYM2, 3, 2> K_ud; // extrinsic curvature
AthenaScratchTensor<Real, TensorSymm::NONE, 3, 2> K_ud; // extrinsic curvature

// Rank 3
AthenaScratchTensor<Real, TensorSymm::SYM2, 3, 3> dg_ddd; // metric 1st drvts
Expand All @@ -104,7 +104,6 @@ void Z4c::Z4cWeyl(MeshBlockPack *pmbp) {
for (int b = a; b < 3; ++b) {
g_uu(a,b) = 0.0;
R_dd(a,b) = 0.0;
K_ud(a,b) = 0.0;
for (int c = 0; c < 3; ++c) {
dg_ddd(c,a,b) = 0.0;
dK_ddd(c,a,b) = 0.0;
Expand Down Expand Up @@ -218,6 +217,7 @@ void Z4c::Z4cWeyl(MeshBlockPack *pmbp) {

for(int a = 0; a < 3; ++a) {
for(int b = 0; b < 3; ++b) {
K_ud(a,b) = 0.0;
for(int c = 0; c < 3; ++c) {
K_ud(a,b) += g_uu(a,c) * adm.vK_dd(m,c,b,k,j,i);
}
Expand Down Expand Up @@ -411,4 +411,3 @@ template void Z4c::Z4cWeyl<2>(MeshBlockPack *pmbp);
template void Z4c::Z4cWeyl<3>(MeshBlockPack *pmbp);
template void Z4c::Z4cWeyl<4>(MeshBlockPack *pmbp);
} // namespace z4c