diff options
| author | Erik Schnetter <eschnett@10-4-36-54.lsu.edu> | 2007-11-05 11:21:08 -0600 |
|---|---|---|
| committer | Erik Schnetter <eschnett@10-4-36-54.lsu.edu> | 2007-11-05 11:21:08 -0600 |
| commit | 3cb4af668f8aae3585fad040ee5afcb7254f5fb5 (patch) | |
| tree | b09b1ced63cff895dc51ac766eefbe5d9b856e98 /ML_ADM | |
| parent | 0ce4347e570531db0b35480a8f1272f7de555550 (diff) | |
Internal changes, add debug statements
Reverse order of canonical indices of symmetric tensors.
Add debug statements for BSSN constraints.
Diffstat (limited to 'ML_ADM')
| -rw-r--r-- | ML_ADM/interface.ccl | 24 | ||||
| -rw-r--r-- | ML_ADM/param.ccl | 48 | ||||
| -rw-r--r-- | ML_ADM/src/Boundaries.c | 300 | ||||
| -rw-r--r-- | ML_ADM/src/ML_ADM_Minkowski.c | 28 | ||||
| -rw-r--r-- | ML_ADM/src/ML_ADM_RHS.c | 406 | ||||
| -rw-r--r-- | ML_ADM/src/ML_ADM_constraints.c | 384 | ||||
| -rw-r--r-- | ML_ADM/src/ML_ADM_convertFromADMBase.c | 28 | ||||
| -rw-r--r-- | ML_ADM/src/ML_ADM_convertToADMBase.c | 28 | ||||
| -rw-r--r-- | ML_ADM/src/RegisterMoL.c | 12 | ||||
| -rw-r--r-- | ML_ADM/src/RegisterSymmetries.c | 12 |
10 files changed, 635 insertions, 635 deletions
diff --git a/ML_ADM/interface.ccl b/ML_ADM/interface.ccl index c3fae86..7137187 100644 --- a/ML_ADM/interface.ccl +++ b/ML_ADM/interface.ccl @@ -48,10 +48,10 @@ public: CCTK_REAL curvrhs type=GF timelevels=1 tags='tensortypealias="DD_sym" tensorweight=1.0000000000000000000' { K11rhs, - K21rhs, - K31rhs, + K12rhs, + K13rhs, K22rhs, - K32rhs, + K23rhs, K33rhs } "curvrhs" @@ -65,10 +65,10 @@ public: CCTK_REAL metricrhs type=GF timelevels=1 tags='tensortypealias="DD_sym" tensorweight=1.0000000000000000000' { g11rhs, - g21rhs, - g31rhs, + g12rhs, + g13rhs, g22rhs, - g32rhs, + g23rhs, g33rhs } "metricrhs" @@ -84,10 +84,10 @@ public: CCTK_REAL curv type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweight=1.0000000000000000000' { K11, - K21, - K31, + K12, + K13, K22, - K32, + K23, K33 } "curv" @@ -101,10 +101,10 @@ public: CCTK_REAL metric type=GF timelevels=3 tags='tensortypealias="DD_sym" tensorweight=1.0000000000000000000' { g11, - g21, - g31, + g12, + g13, g22, - g32, + g23, g33 } "metric" diff --git a/ML_ADM/param.ccl b/ML_ADM/param.ccl index 71c2edb..adba59f 100644 --- a/ML_ADM/param.ccl +++ b/ML_ADM/param.ccl @@ -121,7 +121,7 @@ KEYWORD K11_bound "Boundary condition to implement" } "skip" private: -KEYWORD K21_bound "Boundary condition to implement" +KEYWORD K12_bound "Boundary condition to implement" { "flat" :: "Flat boundary condition" "none" :: "No boundary condition" @@ -133,7 +133,7 @@ KEYWORD K21_bound "Boundary condition to implement" } "skip" private: -KEYWORD K31_bound "Boundary condition to implement" +KEYWORD K13_bound "Boundary condition to implement" { "flat" :: "Flat boundary condition" "none" :: "No boundary condition" @@ -157,7 +157,7 @@ KEYWORD K22_bound "Boundary condition to implement" } "skip" private: -KEYWORD K32_bound "Boundary condition to implement" +KEYWORD K23_bound "Boundary condition to implement" { "flat" :: "Flat boundary condition" "none" :: "No boundary condition" @@ -205,7 +205,7 @@ KEYWORD g11_bound "Boundary condition to implement" } "skip" private: -KEYWORD g21_bound "Boundary condition to implement" +KEYWORD g12_bound "Boundary condition to implement" { "flat" :: "Flat boundary condition" "none" :: "No boundary condition" @@ -217,7 +217,7 @@ KEYWORD g21_bound "Boundary condition to implement" } "skip" private: -KEYWORD g31_bound "Boundary condition to implement" +KEYWORD g13_bound "Boundary condition to implement" { "flat" :: "Flat boundary condition" "none" :: "No boundary condition" @@ -241,7 +241,7 @@ KEYWORD g22_bound "Boundary condition to implement" } "skip" private: -KEYWORD g32_bound "Boundary condition to implement" +KEYWORD g23_bound "Boundary condition to implement" { "flat" :: "Flat boundary condition" "none" :: "No boundary condition" @@ -355,13 +355,13 @@ CCTK_REAL K11_bound_speed "characteristic speed at boundary" } 1. private: -CCTK_REAL K21_bound_speed "characteristic speed at boundary" +CCTK_REAL K12_bound_speed "characteristic speed at boundary" { "0:*" :: "outgoing characteristic speed > 0" } 1. private: -CCTK_REAL K31_bound_speed "characteristic speed at boundary" +CCTK_REAL K13_bound_speed "characteristic speed at boundary" { "0:*" :: "outgoing characteristic speed > 0" } 1. @@ -373,7 +373,7 @@ CCTK_REAL K22_bound_speed "characteristic speed at boundary" } 1. private: -CCTK_REAL K32_bound_speed "characteristic speed at boundary" +CCTK_REAL K23_bound_speed "characteristic speed at boundary" { "0:*" :: "outgoing characteristic speed > 0" } 1. @@ -397,13 +397,13 @@ CCTK_REAL g11_bound_speed "characteristic speed at boundary" } 1. private: -CCTK_REAL g21_bound_speed "characteristic speed at boundary" +CCTK_REAL g12_bound_speed "characteristic speed at boundary" { "0:*" :: "outgoing characteristic speed > 0" } 1. private: -CCTK_REAL g31_bound_speed "characteristic speed at boundary" +CCTK_REAL g13_bound_speed "characteristic speed at boundary" { "0:*" :: "outgoing characteristic speed > 0" } 1. @@ -415,7 +415,7 @@ CCTK_REAL g22_bound_speed "characteristic speed at boundary" } 1. private: -CCTK_REAL g32_bound_speed "characteristic speed at boundary" +CCTK_REAL g23_bound_speed "characteristic speed at boundary" { "0:*" :: "outgoing characteristic speed > 0" } 1. @@ -475,13 +475,13 @@ CCTK_REAL K11_bound_limit "limit value for r -> infinity" } 0. private: -CCTK_REAL K21_bound_limit "limit value for r -> infinity" +CCTK_REAL K12_bound_limit "limit value for r -> infinity" { "*:*" :: "value of limit value is unrestricted" } 0. private: -CCTK_REAL K31_bound_limit "limit value for r -> infinity" +CCTK_REAL K13_bound_limit "limit value for r -> infinity" { "*:*" :: "value of limit value is unrestricted" } 0. @@ -493,7 +493,7 @@ CCTK_REAL K22_bound_limit "limit value for r -> infinity" } 0. private: -CCTK_REAL K32_bound_limit "limit value for r -> infinity" +CCTK_REAL K23_bound_limit "limit value for r -> infinity" { "*:*" :: "value of limit value is unrestricted" } 0. @@ -517,13 +517,13 @@ CCTK_REAL g11_bound_limit "limit value for r -> infinity" } 0. private: -CCTK_REAL g21_bound_limit "limit value for r -> infinity" +CCTK_REAL g12_bound_limit "limit value for r -> infinity" { "*:*" :: "value of limit value is unrestricted" } 0. private: -CCTK_REAL g31_bound_limit "limit value for r -> infinity" +CCTK_REAL g13_bound_limit "limit value for r -> infinity" { "*:*" :: "value of limit value is unrestricted" } 0. @@ -535,7 +535,7 @@ CCTK_REAL g22_bound_limit "limit value for r -> infinity" } 0. private: -CCTK_REAL g32_bound_limit "limit value for r -> infinity" +CCTK_REAL g23_bound_limit "limit value for r -> infinity" { "*:*" :: "value of limit value is unrestricted" } 0. @@ -595,13 +595,13 @@ CCTK_REAL K11_bound_scalar "Dirichlet boundary value" } 0. private: -CCTK_REAL K21_bound_scalar "Dirichlet boundary value" +CCTK_REAL K12_bound_scalar "Dirichlet boundary value" { "*:*" :: "unrestricted" } 0. private: -CCTK_REAL K31_bound_scalar "Dirichlet boundary value" +CCTK_REAL K13_bound_scalar "Dirichlet boundary value" { "*:*" :: "unrestricted" } 0. @@ -613,7 +613,7 @@ CCTK_REAL K22_bound_scalar "Dirichlet boundary value" } 0. private: -CCTK_REAL K32_bound_scalar "Dirichlet boundary value" +CCTK_REAL K23_bound_scalar "Dirichlet boundary value" { "*:*" :: "unrestricted" } 0. @@ -637,13 +637,13 @@ CCTK_REAL g11_bound_scalar "Dirichlet boundary value" } 0. private: -CCTK_REAL g21_bound_scalar "Dirichlet boundary value" +CCTK_REAL g12_bound_scalar "Dirichlet boundary value" { "*:*" :: "unrestricted" } 0. private: -CCTK_REAL g31_bound_scalar "Dirichlet boundary value" +CCTK_REAL g13_bound_scalar "Dirichlet boundary value" { "*:*" :: "unrestricted" } 0. @@ -655,7 +655,7 @@ CCTK_REAL g22_bound_scalar "Dirichlet boundary value" } 0. private: -CCTK_REAL g32_bound_scalar "Dirichlet boundary value" +CCTK_REAL g23_bound_scalar "Dirichlet boundary value" { "*:*" :: "unrestricted" } 0. diff --git a/ML_ADM/src/Boundaries.c b/ML_ADM/src/Boundaries.c index a79a204..6d66707 100644 --- a/ML_ADM/src/Boundaries.c +++ b/ML_ADM/src/Boundaries.c @@ -90,26 +90,26 @@ void ML_ADM_ApplyBoundConds(CCTK_ARGUMENTS) CCTK_WARN(-1, "Failed to register K11_bound BC for ML_ADM::K11!"); } - if (CCTK_EQUALS(K21_bound, "none" ) || - CCTK_EQUALS(K21_bound, "static") || - CCTK_EQUALS(K21_bound, "flat" ) || - CCTK_EQUALS(K21_bound, "zero" ) ) + if (CCTK_EQUALS(K12_bound, "none" ) || + CCTK_EQUALS(K12_bound, "static") || + CCTK_EQUALS(K12_bound, "flat" ) || + CCTK_EQUALS(K12_bound, "zero" ) ) { ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, - "ML_ADM::K21", K21_bound); + "ML_ADM::K12", K12_bound); if (ierr < 0) - CCTK_WARN(-1, "Failed to register K21_bound BC for ML_ADM::K21!"); + CCTK_WARN(-1, "Failed to register K12_bound BC for ML_ADM::K12!"); } - if (CCTK_EQUALS(K31_bound, "none" ) || - CCTK_EQUALS(K31_bound, "static") || - CCTK_EQUALS(K31_bound, "flat" ) || - CCTK_EQUALS(K31_bound, "zero" ) ) + if (CCTK_EQUALS(K13_bound, "none" ) || + CCTK_EQUALS(K13_bound, "static") || + CCTK_EQUALS(K13_bound, "flat" ) || + CCTK_EQUALS(K13_bound, "zero" ) ) { ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, - "ML_ADM::K31", K31_bound); + "ML_ADM::K13", K13_bound); if (ierr < 0) - CCTK_WARN(-1, "Failed to register K31_bound BC for ML_ADM::K31!"); + CCTK_WARN(-1, "Failed to register K13_bound BC for ML_ADM::K13!"); } if (CCTK_EQUALS(K22_bound, "none" ) || @@ -123,15 +123,15 @@ void ML_ADM_ApplyBoundConds(CCTK_ARGUMENTS) CCTK_WARN(-1, "Failed to register K22_bound BC for ML_ADM::K22!"); } - if (CCTK_EQUALS(K32_bound, "none" ) || - CCTK_EQUALS(K32_bound, "static") || - CCTK_EQUALS(K32_bound, "flat" ) || - CCTK_EQUALS(K32_bound, "zero" ) ) + if (CCTK_EQUALS(K23_bound, "none" ) || + CCTK_EQUALS(K23_bound, "static") || + CCTK_EQUALS(K23_bound, "flat" ) || + CCTK_EQUALS(K23_bound, "zero" ) ) { ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, - "ML_ADM::K32", K32_bound); + "ML_ADM::K23", K23_bound); if (ierr < 0) - CCTK_WARN(-1, "Failed to register K32_bound BC for ML_ADM::K32!"); + CCTK_WARN(-1, "Failed to register K23_bound BC for ML_ADM::K23!"); } if (CCTK_EQUALS(K33_bound, "none" ) || @@ -167,26 +167,26 @@ void ML_ADM_ApplyBoundConds(CCTK_ARGUMENTS) CCTK_WARN(-1, "Failed to register g11_bound BC for ML_ADM::g11!"); } - if (CCTK_EQUALS(g21_bound, "none" ) || - CCTK_EQUALS(g21_bound, "static") || - CCTK_EQUALS(g21_bound, "flat" ) || - CCTK_EQUALS(g21_bound, "zero" ) ) + if (CCTK_EQUALS(g12_bound, "none" ) || + CCTK_EQUALS(g12_bound, "static") || + CCTK_EQUALS(g12_bound, "flat" ) || + CCTK_EQUALS(g12_bound, "zero" ) ) { ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, - "ML_ADM::g21", g21_bound); + "ML_ADM::g12", g12_bound); if (ierr < 0) - CCTK_WARN(-1, "Failed to register g21_bound BC for ML_ADM::g21!"); + CCTK_WARN(-1, "Failed to register g12_bound BC for ML_ADM::g12!"); } - if (CCTK_EQUALS(g31_bound, "none" ) || - CCTK_EQUALS(g31_bound, "static") || - CCTK_EQUALS(g31_bound, "flat" ) || - CCTK_EQUALS(g31_bound, "zero" ) ) + if (CCTK_EQUALS(g13_bound, "none" ) || + CCTK_EQUALS(g13_bound, "static") || + CCTK_EQUALS(g13_bound, "flat" ) || + CCTK_EQUALS(g13_bound, "zero" ) ) { ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, - "ML_ADM::g31", g31_bound); + "ML_ADM::g13", g13_bound); if (ierr < 0) - CCTK_WARN(-1, "Failed to register g31_bound BC for ML_ADM::g31!"); + CCTK_WARN(-1, "Failed to register g13_bound BC for ML_ADM::g13!"); } if (CCTK_EQUALS(g22_bound, "none" ) || @@ -200,15 +200,15 @@ void ML_ADM_ApplyBoundConds(CCTK_ARGUMENTS) CCTK_WARN(-1, "Failed to register g22_bound BC for ML_ADM::g22!"); } - if (CCTK_EQUALS(g32_bound, "none" ) || - CCTK_EQUALS(g32_bound, "static") || - CCTK_EQUALS(g32_bound, "flat" ) || - CCTK_EQUALS(g32_bound, "zero" ) ) + if (CCTK_EQUALS(g23_bound, "none" ) || + CCTK_EQUALS(g23_bound, "static") || + CCTK_EQUALS(g23_bound, "flat" ) || + CCTK_EQUALS(g23_bound, "zero" ) ) { ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, - "ML_ADM::g32", g32_bound); + "ML_ADM::g23", g23_bound); if (ierr < 0) - CCTK_WARN(-1, "Failed to register g32_bound BC for ML_ADM::g32!"); + CCTK_WARN(-1, "Failed to register g23_bound BC for ML_ADM::g23!"); } if (CCTK_EQUALS(g33_bound, "none" ) || @@ -345,39 +345,39 @@ void ML_ADM_ApplyBoundConds(CCTK_ARGUMENTS) } - if (CCTK_EQUALS(K21_bound, "radiative")) + if (CCTK_EQUALS(K12_bound, "radiative")) { /* apply radiation boundary condition */ - CCTK_INT handle_K21_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); - if (handle_K21_bound < 0) CCTK_WARN(-1, "could not create table!"); - if (Util_TableSetReal(handle_K21_bound , K21_bound_limit, "LIMIT") < 0) + CCTK_INT handle_K12_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); + if (handle_K12_bound < 0) CCTK_WARN(-1, "could not create table!"); + if (Util_TableSetReal(handle_K12_bound , K12_bound_limit, "LIMIT") < 0) CCTK_WARN(-1, "could not set LIMIT value in table!"); - if (Util_TableSetReal(handle_K21_bound ,K21_bound_speed, "SPEED") < 0) + if (Util_TableSetReal(handle_K12_bound ,K12_bound_speed, "SPEED") < 0) CCTK_WARN(-1, "could not set SPEED value in table!"); - ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_K21_bound, - "ML_ADM::K21", "Radiation"); + ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_K12_bound, + "ML_ADM::K12", "Radiation"); if (ierr < 0) - CCTK_WARN(-1, "Failed to register Radiation BC for ML_ADM::K21!"); + CCTK_WARN(-1, "Failed to register Radiation BC for ML_ADM::K12!"); } - if (CCTK_EQUALS(K31_bound, "radiative")) + if (CCTK_EQUALS(K13_bound, "radiative")) { /* apply radiation boundary condition */ - CCTK_INT handle_K31_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); - if (handle_K31_bound < 0) CCTK_WARN(-1, "could not create table!"); - if (Util_TableSetReal(handle_K31_bound , K31_bound_limit, "LIMIT") < 0) + CCTK_INT handle_K13_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); + if (handle_K13_bound < 0) CCTK_WARN(-1, "could not create table!"); + if (Util_TableSetReal(handle_K13_bound , K13_bound_limit, "LIMIT") < 0) CCTK_WARN(-1, "could not set LIMIT value in table!"); - if (Util_TableSetReal(handle_K31_bound ,K31_bound_speed, "SPEED") < 0) + if (Util_TableSetReal(handle_K13_bound ,K13_bound_speed, "SPEED") < 0) CCTK_WARN(-1, "could not set SPEED value in table!"); - ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_K31_bound, - "ML_ADM::K31", "Radiation"); + ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_K13_bound, + "ML_ADM::K13", "Radiation"); if (ierr < 0) - CCTK_WARN(-1, "Failed to register Radiation BC for ML_ADM::K31!"); + CCTK_WARN(-1, "Failed to register Radiation BC for ML_ADM::K13!"); } @@ -399,21 +399,21 @@ void ML_ADM_ApplyBoundConds(CCTK_ARGUMENTS) } - if (CCTK_EQUALS(K32_bound, "radiative")) + if (CCTK_EQUALS(K23_bound, "radiative")) { /* apply radiation boundary condition */ - CCTK_INT handle_K32_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); - if (handle_K32_bound < 0) CCTK_WARN(-1, "could not create table!"); - if (Util_TableSetReal(handle_K32_bound , K32_bound_limit, "LIMIT") < 0) + CCTK_INT handle_K23_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); + if (handle_K23_bound < 0) CCTK_WARN(-1, "could not create table!"); + if (Util_TableSetReal(handle_K23_bound , K23_bound_limit, "LIMIT") < 0) CCTK_WARN(-1, "could not set LIMIT value in table!"); - if (Util_TableSetReal(handle_K32_bound ,K32_bound_speed, "SPEED") < 0) + if (Util_TableSetReal(handle_K23_bound ,K23_bound_speed, "SPEED") < 0) CCTK_WARN(-1, "could not set SPEED value in table!"); - ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_K32_bound, - "ML_ADM::K32", "Radiation"); + ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_K23_bound, + "ML_ADM::K23", "Radiation"); if (ierr < 0) - CCTK_WARN(-1, "Failed to register Radiation BC for ML_ADM::K32!"); + CCTK_WARN(-1, "Failed to register Radiation BC for ML_ADM::K23!"); } @@ -471,39 +471,39 @@ void ML_ADM_ApplyBoundConds(CCTK_ARGUMENTS) } - if (CCTK_EQUALS(g21_bound, "radiative")) + if (CCTK_EQUALS(g12_bound, "radiative")) { /* apply radiation boundary condition */ - CCTK_INT handle_g21_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); - if (handle_g21_bound < 0) CCTK_WARN(-1, "could not create table!"); - if (Util_TableSetReal(handle_g21_bound , g21_bound_limit, "LIMIT") < 0) + CCTK_INT handle_g12_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); + if (handle_g12_bound < 0) CCTK_WARN(-1, "could not create table!"); + if (Util_TableSetReal(handle_g12_bound , g12_bound_limit, "LIMIT") < 0) CCTK_WARN(-1, "could not set LIMIT value in table!"); - if (Util_TableSetReal(handle_g21_bound ,g21_bound_speed, "SPEED") < 0) + if (Util_TableSetReal(handle_g12_bound ,g12_bound_speed, "SPEED") < 0) CCTK_WARN(-1, "could not set SPEED value in table!"); - ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_g21_bound, - "ML_ADM::g21", "Radiation"); + ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_g12_bound, + "ML_ADM::g12", "Radiation"); if (ierr < 0) - CCTK_WARN(-1, "Failed to register Radiation BC for ML_ADM::g21!"); + CCTK_WARN(-1, "Failed to register Radiation BC for ML_ADM::g12!"); } - if (CCTK_EQUALS(g31_bound, "radiative")) + if (CCTK_EQUALS(g13_bound, "radiative")) { /* apply radiation boundary condition */ - CCTK_INT handle_g31_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); - if (handle_g31_bound < 0) CCTK_WARN(-1, "could not create table!"); - if (Util_TableSetReal(handle_g31_bound , g31_bound_limit, "LIMIT") < 0) + CCTK_INT handle_g13_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); + if (handle_g13_bound < 0) CCTK_WARN(-1, "could not create table!"); + if (Util_TableSetReal(handle_g13_bound , g13_bound_limit, "LIMIT") < 0) CCTK_WARN(-1, "could not set LIMIT value in table!"); - if (Util_TableSetReal(handle_g31_bound ,g31_bound_speed, "SPEED") < 0) + if (Util_TableSetReal(handle_g13_bound ,g13_bound_speed, "SPEED") < 0) CCTK_WARN(-1, "could not set SPEED value in table!"); - ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_g31_bound, - "ML_ADM::g31", "Radiation"); + ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_g13_bound, + "ML_ADM::g13", "Radiation"); if (ierr < 0) - CCTK_WARN(-1, "Failed to register Radiation BC for ML_ADM::g31!"); + CCTK_WARN(-1, "Failed to register Radiation BC for ML_ADM::g13!"); } @@ -525,21 +525,21 @@ void ML_ADM_ApplyBoundConds(CCTK_ARGUMENTS) } - if (CCTK_EQUALS(g32_bound, "radiative")) + if (CCTK_EQUALS(g23_bound, "radiative")) { /* apply radiation boundary condition */ - CCTK_INT handle_g32_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); - if (handle_g32_bound < 0) CCTK_WARN(-1, "could not create table!"); - if (Util_TableSetReal(handle_g32_bound , g32_bound_limit, "LIMIT") < 0) + CCTK_INT handle_g23_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); + if (handle_g23_bound < 0) CCTK_WARN(-1, "could not create table!"); + if (Util_TableSetReal(handle_g23_bound , g23_bound_limit, "LIMIT") < 0) CCTK_WARN(-1, "could not set LIMIT value in table!"); - if (Util_TableSetReal(handle_g32_bound ,g32_bound_speed, "SPEED") < 0) + if (Util_TableSetReal(handle_g23_bound ,g23_bound_speed, "SPEED") < 0) CCTK_WARN(-1, "could not set SPEED value in table!"); - ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_g32_bound, - "ML_ADM::g32", "Radiation"); + ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_g23_bound, + "ML_ADM::g23", "Radiation"); if (ierr < 0) - CCTK_WARN(-1, "Failed to register Radiation BC for ML_ADM::g32!"); + CCTK_WARN(-1, "Failed to register Radiation BC for ML_ADM::g23!"); } @@ -695,35 +695,35 @@ void ML_ADM_ApplyBoundConds(CCTK_ARGUMENTS) } - if (CCTK_EQUALS(K21_bound, "scalar")) + if (CCTK_EQUALS(K12_bound, "scalar")) { /* apply scalar boundary condition */ - CCTK_INT handle_K21_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); - if (handle_K21_bound < 0) CCTK_WARN(-1, "could not create table!"); - if (Util_TableSetReal(handle_K21_bound ,K21_bound_scalar, "SCALAR") < 0) + CCTK_INT handle_K12_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); + if (handle_K12_bound < 0) CCTK_WARN(-1, "could not create table!"); + if (Util_TableSetReal(handle_K12_bound ,K12_bound_scalar, "SCALAR") < 0) CCTK_WARN(-1, "could not set SCALAR value in table!"); - ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_K21_bound, - "ML_ADM::K21", "scalar"); + ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_K12_bound, + "ML_ADM::K12", "scalar"); if (ierr < 0) - CCTK_WARN(-1, "Error in registering Scalar BC for ML_ADM::K21!"); + CCTK_WARN(-1, "Error in registering Scalar BC for ML_ADM::K12!"); } - if (CCTK_EQUALS(K31_bound, "scalar")) + if (CCTK_EQUALS(K13_bound, "scalar")) { /* apply scalar boundary condition */ - CCTK_INT handle_K31_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); - if (handle_K31_bound < 0) CCTK_WARN(-1, "could not create table!"); - if (Util_TableSetReal(handle_K31_bound ,K31_bound_scalar, "SCALAR") < 0) + CCTK_INT handle_K13_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); + if (handle_K13_bound < 0) CCTK_WARN(-1, "could not create table!"); + if (Util_TableSetReal(handle_K13_bound ,K13_bound_scalar, "SCALAR") < 0) CCTK_WARN(-1, "could not set SCALAR value in table!"); - ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_K31_bound, - "ML_ADM::K31", "scalar"); + ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_K13_bound, + "ML_ADM::K13", "scalar"); if (ierr < 0) - CCTK_WARN(-1, "Error in registering Scalar BC for ML_ADM::K31!"); + CCTK_WARN(-1, "Error in registering Scalar BC for ML_ADM::K13!"); } @@ -743,19 +743,19 @@ void ML_ADM_ApplyBoundConds(CCTK_ARGUMENTS) } - if (CCTK_EQUALS(K32_bound, "scalar")) + if (CCTK_EQUALS(K23_bound, "scalar")) { /* apply scalar boundary condition */ - CCTK_INT handle_K32_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); - if (handle_K32_bound < 0) CCTK_WARN(-1, "could not create table!"); - if (Util_TableSetReal(handle_K32_bound ,K32_bound_scalar, "SCALAR") < 0) + CCTK_INT handle_K23_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); + if (handle_K23_bound < 0) CCTK_WARN(-1, "could not create table!"); + if (Util_TableSetReal(handle_K23_bound ,K23_bound_scalar, "SCALAR") < 0) CCTK_WARN(-1, "could not set SCALAR value in table!"); - ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_K32_bound, - "ML_ADM::K32", "scalar"); + ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_K23_bound, + "ML_ADM::K23", "scalar"); if (ierr < 0) - CCTK_WARN(-1, "Error in registering Scalar BC for ML_ADM::K32!"); + CCTK_WARN(-1, "Error in registering Scalar BC for ML_ADM::K23!"); } @@ -807,35 +807,35 @@ void ML_ADM_ApplyBoundConds(CCTK_ARGUMENTS) } - if (CCTK_EQUALS(g21_bound, "scalar")) + if (CCTK_EQUALS(g12_bound, "scalar")) { /* apply scalar boundary condition */ - CCTK_INT handle_g21_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); - if (handle_g21_bound < 0) CCTK_WARN(-1, "could not create table!"); - if (Util_TableSetReal(handle_g21_bound ,g21_bound_scalar, "SCALAR") < 0) + CCTK_INT handle_g12_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); + if (handle_g12_bound < 0) CCTK_WARN(-1, "could not create table!"); + if (Util_TableSetReal(handle_g12_bound ,g12_bound_scalar, "SCALAR") < 0) CCTK_WARN(-1, "could not set SCALAR value in table!"); - ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_g21_bound, - "ML_ADM::g21", "scalar"); + ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_g12_bound, + "ML_ADM::g12", "scalar"); if (ierr < 0) - CCTK_WARN(-1, "Error in registering Scalar BC for ML_ADM::g21!"); + CCTK_WARN(-1, "Error in registering Scalar BC for ML_ADM::g12!"); } - if (CCTK_EQUALS(g31_bound, "scalar")) + if (CCTK_EQUALS(g13_bound, "scalar")) { /* apply scalar boundary condition */ - CCTK_INT handle_g31_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); - if (handle_g31_bound < 0) CCTK_WARN(-1, "could not create table!"); - if (Util_TableSetReal(handle_g31_bound ,g31_bound_scalar, "SCALAR") < 0) + CCTK_INT handle_g13_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); + if (handle_g13_bound < 0) CCTK_WARN(-1, "could not create table!"); + if (Util_TableSetReal(handle_g13_bound ,g13_bound_scalar, "SCALAR") < 0) CCTK_WARN(-1, "could not set SCALAR value in table!"); - ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_g31_bound, - "ML_ADM::g31", "scalar"); + ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_g13_bound, + "ML_ADM::g13", "scalar"); if (ierr < 0) - CCTK_WARN(-1, "Error in registering Scalar BC for ML_ADM::g31!"); + CCTK_WARN(-1, "Error in registering Scalar BC for ML_ADM::g13!"); } @@ -855,19 +855,19 @@ void ML_ADM_ApplyBoundConds(CCTK_ARGUMENTS) } - if (CCTK_EQUALS(g32_bound, "scalar")) + if (CCTK_EQUALS(g23_bound, "scalar")) { /* apply scalar boundary condition */ - CCTK_INT handle_g32_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); - if (handle_g32_bound < 0) CCTK_WARN(-1, "could not create table!"); - if (Util_TableSetReal(handle_g32_bound ,g32_bound_scalar, "SCALAR") < 0) + CCTK_INT handle_g23_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE); + if (handle_g23_bound < 0) CCTK_WARN(-1, "could not create table!"); + if (Util_TableSetReal(handle_g23_bound ,g23_bound_scalar, "SCALAR") < 0) CCTK_WARN(-1, "could not set SCALAR value in table!"); - ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_g32_bound, - "ML_ADM::g32", "scalar"); + ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_g23_bound, + "ML_ADM::g23", "scalar"); if (ierr < 0) - CCTK_WARN(-1, "Error in registering Scalar BC for ML_ADM::g32!"); + CCTK_WARN(-1, "Error in registering Scalar BC for ML_ADM::g23!"); } @@ -965,25 +965,25 @@ void ML_ADM_ApplyBoundConds(CCTK_ARGUMENTS) #$bound$#ML_ADM::K11_bound_limit = 0.0 #$bound$#ML_ADM::K11_bound_scalar = 0.0 -#$bound$#ML_ADM::K21_bound = "skip" -#$bound$#ML_ADM::K21_bound_speed = 1.0 -#$bound$#ML_ADM::K21_bound_limit = 0.0 -#$bound$#ML_ADM::K21_bound_scalar = 0.0 +#$bound$#ML_ADM::K12_bound = "skip" +#$bound$#ML_ADM::K12_bound_speed = 1.0 +#$bound$#ML_ADM::K12_bound_limit = 0.0 +#$bound$#ML_ADM::K12_bound_scalar = 0.0 -#$bound$#ML_ADM::K31_bound = "skip" -#$bound$#ML_ADM::K31_bound_speed = 1.0 -#$bound$#ML_ADM::K31_bound_limit = 0.0 -#$bound$#ML_ADM::K31_bound_scalar = 0.0 +#$bound$#ML_ADM::K13_bound = "skip" +#$bound$#ML_ADM::K13_bound_speed = 1.0 +#$bound$#ML_ADM::K13_bound_limit = 0.0 +#$bound$#ML_ADM::K13_bound_scalar = 0.0 #$bound$#ML_ADM::K22_bound = "skip" #$bound$#ML_ADM::K22_bound_speed = 1.0 #$bound$#ML_ADM::K22_bound_limit = 0.0 #$bound$#ML_ADM::K22_bound_scalar = 0.0 -#$bound$#ML_ADM::K32_bound = "skip" -#$bound$#ML_ADM::K32_bound_speed = 1.0 -#$bound$#ML_ADM::K32_bound_limit = 0.0 -#$bound$#ML_ADM::K32_bound_scalar = 0.0 +#$bound$#ML_ADM::K23_bound = "skip" +#$bound$#ML_ADM::K23_bound_speed = 1.0 +#$bound$#ML_ADM::K23_bound_limit = 0.0 +#$bound$#ML_ADM::K23_bound_scalar = 0.0 #$bound$#ML_ADM::K33_bound = "skip" #$bound$#ML_ADM::K33_bound_speed = 1.0 @@ -1000,25 +1000,25 @@ void ML_ADM_ApplyBoundConds(CCTK_ARGUMENTS) #$bound$#ML_ADM::g11_bound_limit = 0.0 #$bound$#ML_ADM::g11_bound_scalar = 0.0 -#$bound$#ML_ADM::g21_bound = "skip" -#$bound$#ML_ADM::g21_bound_speed = 1.0 -#$bound$#ML_ADM::g21_bound_limit = 0.0 -#$bound$#ML_ADM::g21_bound_scalar = 0.0 +#$bound$#ML_ADM::g12_bound = "skip" +#$bound$#ML_ADM::g12_bound_speed = 1.0 +#$bound$#ML_ADM::g12_bound_limit = 0.0 +#$bound$#ML_ADM::g12_bound_scalar = 0.0 -#$bound$#ML_ADM::g31_bound = "skip" -#$bound$#ML_ADM::g31_bound_speed = 1.0 -#$bound$#ML_ADM::g31_bound_limit = 0.0 -#$bound$#ML_ADM::g31_bound_scalar = 0.0 +#$bound$#ML_ADM::g13_bound = "skip" +#$bound$#ML_ADM::g13_bound_speed = 1.0 +#$bound$#ML_ADM::g13_bound_limit = 0.0 +#$bound$#ML_ADM::g13_bound_scalar = 0.0 #$bound$#ML_ADM::g22_bound = "skip" #$bound$#ML_ADM::g22_bound_speed = 1.0 #$bound$#ML_ADM::g22_bound_limit = 0.0 #$bound$#ML_ADM::g22_bound_scalar = 0.0 -#$bound$#ML_ADM::g32_bound = "skip" -#$bound$#ML_ADM::g32_bound_speed = 1.0 -#$bound$#ML_ADM::g32_bound_limit = 0.0 -#$bound$#ML_ADM::g32_bound_scalar = 0.0 +#$bound$#ML_ADM::g23_bound = "skip" +#$bound$#ML_ADM::g23_bound_speed = 1.0 +#$bound$#ML_ADM::g23_bound_limit = 0.0 +#$bound$#ML_ADM::g23_bound_scalar = 0.0 #$bound$#ML_ADM::g33_bound = "skip" #$bound$#ML_ADM::g33_bound_speed = 1.0 diff --git a/ML_ADM/src/ML_ADM_Minkowski.c b/ML_ADM/src/ML_ADM_Minkowski.c index 9319aea..8b4b7b6 100644 --- a/ML_ADM/src/ML_ADM_Minkowski.c +++ b/ML_ADM/src/ML_ADM_Minkowski.c @@ -98,8 +98,8 @@ void ML_ADM_Minkowski_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL n /* Declare local copies of grid functions */ CCTK_REAL alphaL = INITVALUE; CCTK_REAL beta1L = INITVALUE, beta2L = INITVALUE, beta3L = INITVALUE; - CCTK_REAL g11L = INITVALUE, g21L = INITVALUE, g22L = INITVALUE, g31L = INITVALUE, g32L = INITVALUE, g33L = INITVALUE; - CCTK_REAL K11L = INITVALUE, K21L = INITVALUE, K22L = INITVALUE, K31L = INITVALUE, K32L = INITVALUE, K33L = INITVALUE; + CCTK_REAL g11L = INITVALUE, g12L = INITVALUE, g13L = INITVALUE, g22L = INITVALUE, g23L = INITVALUE, g33L = INITVALUE; + CCTK_REAL K11L = INITVALUE, K12L = INITVALUE, K13L = INITVALUE, K22L = INITVALUE, K23L = INITVALUE, K33L = INITVALUE; /* Declare precomputed derivatives*/ /* Declare derivatives */ @@ -117,25 +117,25 @@ void ML_ADM_Minkowski_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL n /* Calculate temporaries and grid functions */ g11L = 1; - g21L = 0; + g12L = 0; - g31L = 0; + g13L = 0; g22L = 1; - g32L = 0; + g23L = 0; g33L = 1; K11L = 0; - K21L = 0; + K12L = 0; - K31L = 0; + K13L = 0; K22L = 0; - K32L = 0; + K23L = 0; K33L = 0; @@ -154,16 +154,16 @@ void ML_ADM_Minkowski_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL n beta2[index] = beta2L; beta3[index] = beta3L; g11[index] = g11L; - g21[index] = g21L; + g12[index] = g12L; + g13[index] = g13L; g22[index] = g22L; - g31[index] = g31L; - g32[index] = g32L; + g23[index] = g23L; g33[index] = g33L; K11[index] = K11L; - K21[index] = K21L; + K12[index] = K12L; + K13[index] = K13L; K22[index] = K22L; - K31[index] = K31L; - K32[index] = K32L; + K23[index] = K23L; K33[index] = K33L; /* Copy local copies back to subblock grid functions */ diff --git a/ML_ADM/src/ML_ADM_RHS.c b/ML_ADM/src/ML_ADM_RHS.c index 718eedc..db9a713 100644 --- a/ML_ADM/src/ML_ADM_RHS.c +++ b/ML_ADM/src/ML_ADM_RHS.c @@ -95,22 +95,22 @@ void ML_ADM_RHS_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL normal[ /* Declare shorthands */ CCTK_REAL detg = INITVALUE; - CCTK_REAL G111 = INITVALUE, G121 = INITVALUE, G122 = INITVALUE, G131 = INITVALUE, G132 = INITVALUE, G133 = INITVALUE; - CCTK_REAL G211 = INITVALUE, G221 = INITVALUE, G222 = INITVALUE, G231 = INITVALUE, G232 = INITVALUE, G233 = INITVALUE; - CCTK_REAL G311 = INITVALUE, G321 = INITVALUE, G322 = INITVALUE, G331 = INITVALUE, G332 = INITVALUE, G333 = INITVALUE; - CCTK_REAL gu11 = INITVALUE, gu12 = INITVALUE, gu13 = INITVALUE, gu22 = INITVALUE, gu23 = INITVALUE, gu33 = INITVALUE; + CCTK_REAL G111 = INITVALUE, G112 = INITVALUE, G113 = INITVALUE, G122 = INITVALUE, G123 = INITVALUE, G133 = INITVALUE; + CCTK_REAL G211 = INITVALUE, G212 = INITVALUE, G213 = INITVALUE, G222 = INITVALUE, G223 = INITVALUE, G233 = INITVALUE; + CCTK_REAL G311 = INITVALUE, G312 = INITVALUE, G313 = INITVALUE, G322 = INITVALUE, G323 = INITVALUE, G333 = INITVALUE; + CCTK_REAL gu11 = INITVALUE, gu21 = INITVALUE, gu22 = INITVALUE, gu31 = INITVALUE, gu32 = INITVALUE, gu33 = INITVALUE; CCTK_REAL Km11 = INITVALUE, Km12 = INITVALUE, Km13 = INITVALUE, Km21 = INITVALUE, Km22 = INITVALUE, Km23 = INITVALUE; CCTK_REAL Km31 = INITVALUE, Km32 = INITVALUE, Km33 = INITVALUE; - CCTK_REAL R11 = INITVALUE, R21 = INITVALUE, R22 = INITVALUE, R31 = INITVALUE, R32 = INITVALUE, R33 = INITVALUE; + CCTK_REAL R11 = INITVALUE, R12 = INITVALUE, R13 = INITVALUE, R22 = INITVALUE, R23 = INITVALUE, R33 = INITVALUE; CCTK_REAL trK = INITVALUE; /* Declare local copies of grid functions */ CCTK_REAL alphaL = INITVALUE, alpharhsL = INITVALUE; CCTK_REAL beta1L = INITVALUE, beta1rhsL = INITVALUE, beta2L = INITVALUE, beta2rhsL = INITVALUE, beta3L = INITVALUE, beta3rhsL = INITVALUE; - CCTK_REAL g11L = INITVALUE, g11rhsL = INITVALUE, g21L = INITVALUE, g21rhsL = INITVALUE, g22L = INITVALUE, g22rhsL = INITVALUE; - CCTK_REAL g31L = INITVALUE, g31rhsL = INITVALUE, g32L = INITVALUE, g32rhsL = INITVALUE, g33L = INITVALUE, g33rhsL = INITVALUE; - CCTK_REAL K11L = INITVALUE, K11rhsL = INITVALUE, K21L = INITVALUE, K21rhsL = INITVALUE, K22L = INITVALUE, K22rhsL = INITVALUE; - CCTK_REAL K31L = INITVALUE, K31rhsL = INITVALUE, K32L = INITVALUE, K32rhsL = INITVALUE, K33L = INITVALUE, K33rhsL = INITVALUE; + CCTK_REAL g11L = INITVALUE, g11rhsL = INITVALUE, g12L = INITVALUE, g12rhsL = INITVALUE, g13L = INITVALUE, g13rhsL = INITVALUE; + CCTK_REAL g22L = INITVALUE, g22rhsL = INITVALUE, g23L = INITVALUE, g23rhsL = INITVALUE, g33L = INITVALUE, g33rhsL = INITVALUE; + CCTK_REAL K11L = INITVALUE, K11rhsL = INITVALUE, K12L = INITVALUE, K12rhsL = INITVALUE, K13L = INITVALUE, K13rhsL = INITVALUE; + CCTK_REAL K22L = INITVALUE, K22rhsL = INITVALUE, K23L = INITVALUE, K23rhsL = INITVALUE, K33L = INITVALUE, K33rhsL = INITVALUE; /* Declare precomputed derivatives*/ /* Declare derivatives */ @@ -143,16 +143,26 @@ void ML_ADM_RHS_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL normal[ CCTK_REAL PDstandard4th23g11 = INITVALUE; CCTK_REAL PDstandard4th31g11 = INITVALUE; CCTK_REAL PDstandard4th32g11 = INITVALUE; - CCTK_REAL PDstandard4th1g21 = INITVALUE; - CCTK_REAL PDstandard4th2g21 = INITVALUE; - CCTK_REAL PDstandard4th3g21 = INITVALUE; - CCTK_REAL PDstandard4th33g21 = INITVALUE; - CCTK_REAL PDstandard4th12g21 = INITVALUE; - CCTK_REAL PDstandard4th13g21 = INITVALUE; - CCTK_REAL PDstandard4th21g21 = INITVALUE; - CCTK_REAL PDstandard4th23g21 = INITVALUE; - CCTK_REAL PDstandard4th31g21 = INITVALUE; - CCTK_REAL PDstandard4th32g21 = INITVALUE; + CCTK_REAL PDstandard4th1g12 = INITVALUE; + CCTK_REAL PDstandard4th2g12 = INITVALUE; + CCTK_REAL PDstandard4th3g12 = INITVALUE; + CCTK_REAL PDstandard4th33g12 = INITVALUE; + CCTK_REAL PDstandard4th12g12 = INITVALUE; + CCTK_REAL PDstandard4th13g12 = INITVALUE; + CCTK_REAL PDstandard4th21g12 = INITVALUE; + CCTK_REAL PDstandard4th23g12 = INITVALUE; + CCTK_REAL PDstandard4th31g12 = INITVALUE; + CCTK_REAL PDstandard4th32g12 = INITVALUE; + CCTK_REAL PDstandard4th1g13 = INITVALUE; + CCTK_REAL PDstandard4th2g13 = INITVALUE; + CCTK_REAL PDstandard4th3g13 = INITVALUE; + CCTK_REAL PDstandard4th22g13 = INITVALUE; + CCTK_REAL PDstandard4th12g13 = INITVALUE; + CCTK_REAL PDstandard4th13g13 = INITVALUE; + CCTK_REAL PDstandard4th21g13 = INITVALUE; + CCTK_REAL PDstandard4th23g13 = INITVALUE; + CCTK_REAL PDstandard4th31g13 = INITVALUE; + CCTK_REAL PDstandard4th32g13 = INITVALUE; CCTK_REAL PDstandard4th1g22 = INITVALUE; CCTK_REAL PDstandard4th2g22 = INITVALUE; CCTK_REAL PDstandard4th3g22 = INITVALUE; @@ -164,26 +174,16 @@ void ML_ADM_RHS_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL normal[ CCTK_REAL PDstandard4th23g22 = INITVALUE; CCTK_REAL PDstandard4th31g22 = INITVALUE; CCTK_REAL PDstandard4th32g22 = INITVALUE; - CCTK_REAL PDstandard4th1g31 = INITVALUE; - CCTK_REAL PDstandard4th2g31 = INITVALUE; - CCTK_REAL PDstandard4th3g31 = INITVALUE; - CCTK_REAL PDstandard4th22g31 = INITVALUE; - CCTK_REAL PDstandard4th12g31 = INITVALUE; - CCTK_REAL PDstandard4th13g31 = INITVALUE; - CCTK_REAL PDstandard4th21g31 = INITVALUE; - CCTK_REAL PDstandard4th23g31 = INITVALUE; - CCTK_REAL PDstandard4th31g31 = INITVALUE; - CCTK_REAL PDstandard4th32g31 = INITVALUE; - CCTK_REAL PDstandard4th1g32 = INITVALUE; - CCTK_REAL PDstandard4th2g32 = INITVALUE; - CCTK_REAL PDstandard4th3g32 = INITVALUE; - CCTK_REAL PDstandard4th11g32 = INITVALUE; - CCTK_REAL PDstandard4th12g32 = INITVALUE; - CCTK_REAL PDstandard4th13g32 = INITVALUE; - CCTK_REAL PDstandard4th21g32 = INITVALUE; - CCTK_REAL PDstandard4th23g32 = INITVALUE; - CCTK_REAL PDstandard4th31g32 = INITVALUE; - CCTK_REAL PDstandard4th32g32 = INITVALUE; + CCTK_REAL PDstandard4th1g23 = INITVALUE; + CCTK_REAL PDstandard4th2g23 = INITVALUE; + CCTK_REAL PDstandard4th3g23 = INITVALUE; + CCTK_REAL PDstandard4th11g23 = INITVALUE; + CCTK_REAL PDstandard4th12g23 = INITVALUE; + CCTK_REAL PDstandard4th13g23 = INITVALUE; + CCTK_REAL PDstandard4th21g23 = INITVALUE; + CCTK_REAL PDstandard4th23g23 = INITVALUE; + CCTK_REAL PDstandard4th31g23 = INITVALUE; + CCTK_REAL PDstandard4th32g23 = INITVALUE; CCTK_REAL PDstandard4th1g33 = INITVALUE; CCTK_REAL PDstandard4th2g33 = INITVALUE; CCTK_REAL PDstandard4th3g33 = INITVALUE; @@ -198,18 +198,18 @@ void ML_ADM_RHS_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL normal[ CCTK_REAL PDstandard4th1K11 = INITVALUE; CCTK_REAL PDstandard4th2K11 = INITVALUE; CCTK_REAL PDstandard4th3K11 = INITVALUE; - CCTK_REAL PDstandard4th1K21 = INITVALUE; - CCTK_REAL PDstandard4th2K21 = INITVALUE; - CCTK_REAL PDstandard4th3K21 = INITVALUE; + CCTK_REAL PDstandard4th1K12 = INITVALUE; + CCTK_REAL PDstandard4th2K12 = INITVALUE; + CCTK_REAL PDstandard4th3K12 = INITVALUE; + CCTK_REAL PDstandard4th1K13 = INITVALUE; + CCTK_REAL PDstandard4th2K13 = INITVALUE; + CCTK_REAL PDstandard4th3K13 = INITVALUE; CCTK_REAL PDstandard4th1K22 = INITVALUE; CCTK_REAL PDstandard4th2K22 = INITVALUE; CCTK_REAL PDstandard4th3K22 = INITVALUE; - CCTK_REAL PDstandard4th1K31 = INITVALUE; - CCTK_REAL PDstandard4th2K31 = INITVALUE; - CCTK_REAL PDstandard4th3K31 = INITVALUE; - CCTK_REAL PDstandard4th1K32 = INITVALUE; - CCTK_REAL PDstandard4th2K32 = INITVALUE; - CCTK_REAL PDstandard4th3K32 = INITVALUE; + CCTK_REAL PDstandard4th1K23 = INITVALUE; + CCTK_REAL PDstandard4th2K23 = INITVALUE; + CCTK_REAL PDstandard4th3K23 = INITVALUE; CCTK_REAL PDstandard4th1K33 = INITVALUE; CCTK_REAL PDstandard4th2K33 = INITVALUE; CCTK_REAL PDstandard4th3K33 = INITVALUE; @@ -220,16 +220,16 @@ void ML_ADM_RHS_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL normal[ beta2L = beta2[index]; beta3L = beta3[index]; g11L = g11[index]; - g21L = g21[index]; + g12L = g12[index]; + g13L = g13[index]; g22L = g22[index]; - g31L = g31[index]; - g32L = g32[index]; + g23L = g23[index]; g33L = g33[index]; K11L = K11[index]; - K21L = K21[index]; + K12L = K12[index]; + K13L = K13[index]; K22L = K22[index]; - K31L = K31[index]; - K32L = K32[index]; + K23L = K23[index]; K33L = K33[index]; /* Assign local copies of subblock grid functions */ @@ -261,33 +261,33 @@ void ML_ADM_RHS_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL normal[ PDstandard4th22g11 = PDstandard4th22(g11, i, j, k); PDstandard4th33g11 = PDstandard4th33(g11, i, j, k); PDstandard4th23g11 = PDstandard4th23(g11, i, j, k); - PDstandard4th1g21 = PDstandard4th1(g21, i, j, k); - PDstandard4th2g21 = PDstandard4th2(g21, i, j, k); - PDstandard4th3g21 = PDstandard4th3(g21, i, j, k); - PDstandard4th33g21 = PDstandard4th33(g21, i, j, k); - PDstandard4th12g21 = PDstandard4th12(g21, i, j, k); - PDstandard4th13g21 = PDstandard4th13(g21, i, j, k); - PDstandard4th23g21 = PDstandard4th23(g21, i, j, k); + PDstandard4th1g12 = PDstandard4th1(g12, i, j, k); + PDstandard4th2g12 = PDstandard4th2(g12, i, j, k); + PDstandard4th3g12 = PDstandard4th3(g12, i, j, k); + PDstandard4th33g12 = PDstandard4th33(g12, i, j, k); + PDstandard4th12g12 = PDstandard4th12(g12, i, j, k); + PDstandard4th13g12 = PDstandard4th13(g12, i, j, k); + PDstandard4th23g12 = PDstandard4th23(g12, i, j, k); + PDstandard4th1g13 = PDstandard4th1(g13, i, j, k); + PDstandard4th2g13 = PDstandard4th2(g13, i, j, k); + PDstandard4th3g13 = PDstandard4th3(g13, i, j, k); + PDstandard4th22g13 = PDstandard4th22(g13, i, j, k); + PDstandard4th12g13 = PDstandard4th12(g13, i, j, k); + PDstandard4th13g13 = PDstandard4th13(g13, i, j, k); + PDstandard4th23g13 = PDstandard4th23(g13, i, j, k); PDstandard4th1g22 = PDstandard4th1(g22, i, j, k); PDstandard4th2g22 = PDstandard4th2(g22, i, j, k); PDstandard4th3g22 = PDstandard4th3(g22, i, j, k); PDstandard4th11g22 = PDstandard4th11(g22, i, j, k); PDstandard4th33g22 = PDstandard4th33(g22, i, j, k); PDstandard4th13g22 = PDstandard4th13(g22, i, j, k); - PDstandard4th1g31 = PDstandard4th1(g31, i, j, k); - PDstandard4th2g31 = PDstandard4th2(g31, i, j, k); - PDstandard4th3g31 = PDstandard4th3(g31, i, j, k); - PDstandard4th22g31 = PDstandard4th22(g31, i, j, k); - PDstandard4th12g31 = PDstandard4th12(g31, i, j, k); - PDstandard4th13g31 = PDstandard4th13(g31, i, j, k); - PDstandard4th23g31 = PDstandard4th23(g31, i, j, k); - PDstandard4th1g32 = PDstandard4th1(g32, i, j, k); - PDstandard4th2g32 = PDstandard4th2(g32, i, j, k); - PDstandard4th3g32 = PDstandard4th3(g32, i, j, k); - PDstandard4th11g32 = PDstandard4th11(g32, i, j, k); - PDstandard4th12g32 = PDstandard4th12(g32, i, j, k); - PDstandard4th13g32 = PDstandard4th13(g32, i, j, k); - PDstandard4th23g32 = PDstandard4th23(g32, i, j, k); + PDstandard4th1g23 = PDstandard4th1(g23, i, j, k); + PDstandard4th2g23 = PDstandard4th2(g23, i, j, k); + PDstandard4th3g23 = PDstandard4th3(g23, i, j, k); + PDstandard4th11g23 = PDstandard4th11(g23, i, j, k); + PDstandard4th12g23 = PDstandard4th12(g23, i, j, k); + PDstandard4th13g23 = PDstandard4th13(g23, i, j, k); + PDstandard4th23g23 = PDstandard4th23(g23, i, j, k); PDstandard4th1g33 = PDstandard4th1(g33, i, j, k); PDstandard4th2g33 = PDstandard4th2(g33, i, j, k); PDstandard4th3g33 = PDstandard4th3(g33, i, j, k); @@ -297,18 +297,18 @@ void ML_ADM_RHS_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL normal[ PDstandard4th1K11 = PDstandard4th1(K11, i, j, k); PDstandard4th2K11 = PDstandard4th2(K11, i, j, k); PDstandard4th3K11 = PDstandard4th3(K11, i, j, k); - PDstandard4th1K21 = PDstandard4th1(K21, i, j, k); - PDstandard4th2K21 = PDstandard4th2(K21, i, j, k); - PDstandard4th3K21 = PDstandard4th3(K21, i, j, k); + PDstandard4th1K12 = PDstandard4th1(K12, i, j, k); + PDstandard4th2K12 = PDstandard4th2(K12, i, j, k); + PDstandard4th3K12 = PDstandard4th3(K12, i, j, k); + PDstandard4th1K13 = PDstandard4th1(K13, i, j, k); + PDstandard4th2K13 = PDstandard4th2(K13, i, j, k); + PDstandard4th3K13 = PDstandard4th3(K13, i, j, k); PDstandard4th1K22 = PDstandard4th1(K22, i, j, k); PDstandard4th2K22 = PDstandard4th2(K22, i, j, k); PDstandard4th3K22 = PDstandard4th3(K22, i, j, k); - PDstandard4th1K31 = PDstandard4th1(K31, i, j, k); - PDstandard4th2K31 = PDstandard4th2(K31, i, j, k); - PDstandard4th3K31 = PDstandard4th3(K31, i, j, k); - PDstandard4th1K32 = PDstandard4th1(K32, i, j, k); - PDstandard4th2K32 = PDstandard4th2(K32, i, j, k); - PDstandard4th3K32 = PDstandard4th3(K32, i, j, k); + PDstandard4th1K23 = PDstandard4th1(K23, i, j, k); + PDstandard4th2K23 = PDstandard4th2(K23, i, j, k); + PDstandard4th3K23 = PDstandard4th3(K23, i, j, k); PDstandard4th1K33 = PDstandard4th1(K33, i, j, k); PDstandard4th2K33 = PDstandard4th2(K33, i, j, k); PDstandard4th3K33 = PDstandard4th3(K33, i, j, k); @@ -316,184 +316,184 @@ void ML_ADM_RHS_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL normal[ /* Precompute derivatives (old style) */ /* Calculate temporaries and grid functions */ - detg = 2*g21L*g31L*g32L + g33L*(g11L*g22L - SQR(g21L)) - g22L*SQR(g31L) - g11L*SQR(g32L); + detg = 2*g12L*g13L*g23L + g33L*(g11L*g22L - SQR(g12L)) - g22L*SQR(g13L) - g11L*SQR(g23L); - gu11 = INV(detg)*(g22L*g33L - SQR(g32L)); + gu11 = INV(detg)*(g22L*g33L - SQR(g23L)); - gu12 = (g31L*g32L - g21L*g33L)*INV(detg); + gu21 = (g13L*g23L - g12L*g33L)*INV(detg); - gu13 = (-(g22L*g31L) + g21L*g32L)*INV(detg); + gu31 = (-(g13L*g22L) + g12L*g23L)*INV(detg); - gu22 = INV(detg)*(g11L*g33L - SQR(g31L)); + gu22 = INV(detg)*(g11L*g33L - SQR(g13L)); - gu23 = (g21L*g31L - g11L*g32L)*INV(detg); + gu32 = (g12L*g13L - g11L*g23L)*INV(detg); - gu33 = INV(detg)*(g11L*g22L - SQR(g21L)); + gu33 = INV(detg)*(g11L*g22L - SQR(g12L)); - G111 = khalf*(gu11*PDstandard4th1g11 + 2*(gu12*PDstandard4th1g21 + gu13*PDstandard4th1g31) - gu12*PDstandard4th2g11 - - gu13*PDstandard4th3g11); + G111 = khalf*(gu11*PDstandard4th1g11 + 2*(gu21*PDstandard4th1g12 + gu31*PDstandard4th1g13) - gu21*PDstandard4th2g11 - + gu31*PDstandard4th3g11); - G211 = khalf*(gu12*PDstandard4th1g11 + 2*(gu22*PDstandard4th1g21 + gu23*PDstandard4th1g31) - gu22*PDstandard4th2g11 - - gu23*PDstandard4th3g11); + G211 = khalf*(gu21*PDstandard4th1g11 + 2*(gu22*PDstandard4th1g12 + gu32*PDstandard4th1g13) - gu22*PDstandard4th2g11 - + gu32*PDstandard4th3g11); - G311 = khalf*(gu13*PDstandard4th1g11 + 2*(gu23*PDstandard4th1g21 + gu33*PDstandard4th1g31) - gu23*PDstandard4th2g11 - + G311 = khalf*(gu31*PDstandard4th1g11 + 2*(gu32*PDstandard4th1g12 + gu33*PDstandard4th1g13) - gu32*PDstandard4th2g11 - gu33*PDstandard4th3g11); - G121 = khalf*(gu12*PDstandard4th1g22 + gu11*PDstandard4th2g11 + - gu13*(PDstandard4th1g32 + PDstandard4th2g31 - PDstandard4th3g21)); + G112 = khalf*(gu21*PDstandard4th1g22 + gu11*PDstandard4th2g11 + + gu31*(PDstandard4th1g23 + PDstandard4th2g13 - PDstandard4th3g12)); - G221 = khalf*(gu22*PDstandard4th1g22 + gu12*PDstandard4th2g11 + - gu23*(PDstandard4th1g32 + PDstandard4th2g31 - PDstandard4th3g21)); + G212 = khalf*(gu22*PDstandard4th1g22 + gu21*PDstandard4th2g11 + + gu32*(PDstandard4th1g23 + PDstandard4th2g13 - PDstandard4th3g12)); - G321 = khalf*(gu23*PDstandard4th1g22 + gu13*PDstandard4th2g11 + - gu33*(PDstandard4th1g32 + PDstandard4th2g31 - PDstandard4th3g21)); + G312 = khalf*(gu32*PDstandard4th1g22 + gu31*PDstandard4th2g11 + + gu33*(PDstandard4th1g23 + PDstandard4th2g13 - PDstandard4th3g12)); - G131 = khalf*(gu13*PDstandard4th1g33 + gu11*PDstandard4th3g11 + - gu12*(PDstandard4th1g32 - PDstandard4th2g31 + PDstandard4th3g21)); + G113 = khalf*(gu31*PDstandard4th1g33 + gu11*PDstandard4th3g11 + + gu21*(PDstandard4th1g23 - PDstandard4th2g13 + PDstandard4th3g12)); - G231 = khalf*(gu23*PDstandard4th1g33 + gu12*PDstandard4th3g11 + - gu22*(PDstandard4th1g32 - PDstandard4th2g31 + PDstandard4th3g21)); + G213 = khalf*(gu32*PDstandard4th1g33 + gu21*PDstandard4th3g11 + + gu22*(PDstandard4th1g23 - PDstandard4th2g13 + PDstandard4th3g12)); - G331 = khalf*(gu33*PDstandard4th1g33 + gu13*PDstandard4th3g11 + - gu23*(PDstandard4th1g32 - PDstandard4th2g31 + PDstandard4th3g21)); + G313 = khalf*(gu33*PDstandard4th1g33 + gu31*PDstandard4th3g11 + + gu32*(PDstandard4th1g23 - PDstandard4th2g13 + PDstandard4th3g12)); - G122 = khalf*(gu11*(-PDstandard4th1g22 + 2*PDstandard4th2g21) + gu12*PDstandard4th2g22 + - gu13*(2*PDstandard4th2g32 - PDstandard4th3g22)); + G122 = khalf*(gu11*(-PDstandard4th1g22 + 2*PDstandard4th2g12) + gu21*PDstandard4th2g22 + + gu31*(2*PDstandard4th2g23 - PDstandard4th3g22)); - G222 = khalf*(gu12*(-PDstandard4th1g22 + 2*PDstandard4th2g21) + gu22*PDstandard4th2g22 + - gu23*(2*PDstandard4th2g32 - PDstandard4th3g22)); + G222 = khalf*(gu21*(-PDstandard4th1g22 + 2*PDstandard4th2g12) + gu22*PDstandard4th2g22 + + gu32*(2*PDstandard4th2g23 - PDstandard4th3g22)); - G322 = khalf*(gu13*(-PDstandard4th1g22 + 2*PDstandard4th2g21) + gu23*PDstandard4th2g22 + - gu33*(2*PDstandard4th2g32 - PDstandard4th3g22)); + G322 = khalf*(gu31*(-PDstandard4th1g22 + 2*PDstandard4th2g12) + gu32*PDstandard4th2g22 + + gu33*(2*PDstandard4th2g23 - PDstandard4th3g22)); - G132 = khalf*(gu13*PDstandard4th2g33 + gu11*(-PDstandard4th1g32 + PDstandard4th2g31 + PDstandard4th3g21) + - gu12*PDstandard4th3g22); + G123 = khalf*(gu31*PDstandard4th2g33 + gu11*(-PDstandard4th1g23 + PDstandard4th2g13 + PDstandard4th3g12) + + gu21*PDstandard4th3g22); - G232 = khalf*(gu23*PDstandard4th2g33 + gu12*(-PDstandard4th1g32 + PDstandard4th2g31 + PDstandard4th3g21) + + G223 = khalf*(gu32*PDstandard4th2g33 + gu21*(-PDstandard4th1g23 + PDstandard4th2g13 + PDstandard4th3g12) + gu22*PDstandard4th3g22); - G332 = khalf*(gu33*PDstandard4th2g33 + gu13*(-PDstandard4th1g32 + PDstandard4th2g31 + PDstandard4th3g21) + - gu23*PDstandard4th3g22); + G323 = khalf*(gu33*PDstandard4th2g33 + gu31*(-PDstandard4th1g23 + PDstandard4th2g13 + PDstandard4th3g12) + + gu32*PDstandard4th3g22); - G133 = khalf*(-(gu11*PDstandard4th1g33) - gu12*PDstandard4th2g33 + 2*gu11*PDstandard4th3g31 + - 2*gu12*PDstandard4th3g32 + gu13*PDstandard4th3g33); + G133 = khalf*(-(gu11*PDstandard4th1g33) - gu21*PDstandard4th2g33 + 2*gu11*PDstandard4th3g13 + + 2*gu21*PDstandard4th3g23 + gu31*PDstandard4th3g33); - G233 = khalf*(-(gu12*PDstandard4th1g33) - gu22*PDstandard4th2g33 + 2*gu12*PDstandard4th3g31 + - 2*gu22*PDstandard4th3g32 + gu23*PDstandard4th3g33); + G233 = khalf*(-(gu21*PDstandard4th1g33) - gu22*PDstandard4th2g33 + 2*gu21*PDstandard4th3g13 + + 2*gu22*PDstandard4th3g23 + gu32*PDstandard4th3g33); - G333 = khalf*(-(gu13*PDstandard4th1g33) - gu23*PDstandard4th2g33 + 2*gu13*PDstandard4th3g31 + - 2*gu23*PDstandard4th3g32 + gu33*PDstandard4th3g33); + G333 = khalf*(-(gu31*PDstandard4th1g33) - gu32*PDstandard4th2g33 + 2*gu31*PDstandard4th3g13 + + 2*gu32*PDstandard4th3g23 + gu33*PDstandard4th3g33); - R11 = khalf*(4*G231*G321 + G211*(2*G121 - 2*G222 - 2*G332) + G311*(2*G131 - 2*G333) - gu22*PDstandard4th11g22 - - 2*(G111*G221 + G232*G311 + G111*G331 + gu23*PDstandard4th11g32) - gu33*PDstandard4th11g33 + - 2*gu22*PDstandard4th12g21 + 2*gu23*PDstandard4th12g31 + 2*gu23*PDstandard4th13g21 + 2*gu33*PDstandard4th13g31 - - gu22*PDstandard4th22g11 - 2*gu23*PDstandard4th23g11 - gu33*PDstandard4th33g11 + 2*SQR(G221) + 2*SQR(G331)); + R11 = khalf*(4*G213*G312 + G211*(2*G112 - 2*G222 - 2*G323) + G311*(2*G113 - 2*G333) - gu22*PDstandard4th11g22 - + 2*(G111*G212 + G223*G311 + G111*G313 + gu32*PDstandard4th11g23) - gu33*PDstandard4th11g33 + + 2*gu22*PDstandard4th12g12 + 2*gu32*PDstandard4th12g13 + 2*gu32*PDstandard4th13g12 + 2*gu33*PDstandard4th13g13 - + gu22*PDstandard4th22g11 - 2*gu32*PDstandard4th23g11 - gu33*PDstandard4th33g11 + 2*SQR(G212) + 2*SQR(G313)); - R21 = khalf*(2*(G122*G211 + G132*G311 + G231*G322 + G331*G332) - - 2*(G121*G221 + G121*G331 + G221*G332 + G321*G333 + gu12*PDstandard4th12g21) - gu23*PDstandard4th12g32 - - gu33*PDstandard4th12g33 + gu13*(PDstandard4th11g32 - PDstandard4th12g31 - PDstandard4th13g21) + - gu23*PDstandard4th13g22 + gu33*PDstandard4th13g32 + gu12*(PDstandard4th11g22 + PDstandard4th22g11) + - gu23*PDstandard4th22g31 + gu13*PDstandard4th23g11 - gu23*PDstandard4th23g21 + gu33*PDstandard4th23g31 - - gu33*PDstandard4th33g21); + R12 = khalf*(2*(G122*G211 + G123*G311 + G213*G322 + G313*G323) - + 2*(G112*G212 + G112*G313 + G212*G323 + G312*G333 + gu21*PDstandard4th12g12) - gu32*PDstandard4th12g23 - + gu33*PDstandard4th12g33 + gu31*(PDstandard4th11g23 - PDstandard4th12g13 - PDstandard4th13g12) + + gu32*PDstandard4th13g22 + gu33*PDstandard4th13g23 + gu21*(PDstandard4th11g22 + PDstandard4th22g11) + + gu32*PDstandard4th22g13 + gu31*PDstandard4th23g11 - gu32*PDstandard4th23g12 + gu33*PDstandard4th23g13 - + gu33*PDstandard4th33g12); - R31 = khalf*(2*(G132*G211 + G221*G232 + G133*G311 + G233*G321) - - 2*(G222*G231 + G232*G331 + G131*(G221 + G331) + gu13*PDstandard4th13g31) + - gu12*(PDstandard4th11g32 - PDstandard4th12g31 - PDstandard4th13g21 + PDstandard4th23g11) + - gu22*(PDstandard4th12g32 - PDstandard4th13g22 - PDstandard4th22g31 + PDstandard4th23g21) + - gu13*(PDstandard4th11g33 + PDstandard4th33g11) + - gu23*(PDstandard4th12g33 - PDstandard4th13g32 - PDstandard4th23g31 + PDstandard4th33g21)); + R13 = khalf*(2*(G123*G211 + G212*G223 + G133*G311 + G233*G312) - + 2*(G213*G222 + G223*G313 + G113*(G212 + G313) + gu31*PDstandard4th13g13) + + gu21*(PDstandard4th11g23 - PDstandard4th12g13 - PDstandard4th13g12 + PDstandard4th23g11) + + gu22*(PDstandard4th12g23 - PDstandard4th13g22 - PDstandard4th22g13 + PDstandard4th23g12) + + gu31*(PDstandard4th11g33 + PDstandard4th33g11) + + gu32*(PDstandard4th12g33 - PDstandard4th13g23 - PDstandard4th23g13 + PDstandard4th33g12)); - R22 = khalf*(4*G132*G321 + G122*(2*G221 - 2*(G111 + G331)) + G322*(2*G232 - 2*G333) - - 2*(G131*G322 + G222*(G121 + G332) + gu13*PDstandard4th13g22) + - gu11*(-PDstandard4th11g22 + 2*PDstandard4th12g21 - PDstandard4th22g11) + - gu13*(-2*PDstandard4th22g31 + 2*(PDstandard4th12g32 + PDstandard4th23g21)) + - gu33*(-PDstandard4th22g33 + 2*PDstandard4th23g32 - PDstandard4th33g22) + 2*(SQR(G121) + SQR(G332))); + R22 = khalf*(4*G123*G312 + G122*(2*G212 - 2*(G111 + G313)) + G322*(2*G223 - 2*G333) - + 2*(G113*G322 + G222*(G112 + G323) + gu31*PDstandard4th13g22) + + gu11*(-PDstandard4th11g22 + 2*PDstandard4th12g12 - PDstandard4th22g11) + + gu31*(-2*PDstandard4th22g13 + 2*(PDstandard4th12g23 + PDstandard4th23g12)) + + gu33*(-PDstandard4th22g33 + 2*PDstandard4th23g23 - PDstandard4th33g22) + 2*(SQR(G112) + SQR(G323))); - R32 = khalf*(2*(G121*G131 + G122*G231 + G133*G321 + G233*G322) + - gu11*(-PDstandard4th11g32 + PDstandard4th12g31 + PDstandard4th13g21 - PDstandard4th23g11) + - gu12*(-PDstandard4th12g32 + PDstandard4th13g22 + PDstandard4th22g31 - PDstandard4th23g21) - - 2*(G111*G132 + G131*G332 + G232*(G121 + G332) + gu23*PDstandard4th23g32) + - gu13*(PDstandard4th12g33 - PDstandard4th13g32 - PDstandard4th23g31 + PDstandard4th33g21) + - gu23*(PDstandard4th22g33 + PDstandard4th33g22)); + R23 = khalf*(2*(G112*G113 + G122*G213 + G133*G312 + G233*G322) + + gu11*(-PDstandard4th11g23 + PDstandard4th12g13 + PDstandard4th13g12 - PDstandard4th23g11) + + gu21*(-PDstandard4th12g23 + PDstandard4th13g22 + PDstandard4th22g13 - PDstandard4th23g12) - + 2*(G111*G123 + G113*G323 + G223*(G112 + G323) + gu32*PDstandard4th23g23) + + gu31*(PDstandard4th12g33 - PDstandard4th13g23 - PDstandard4th23g13 + PDstandard4th33g12) + + gu32*(PDstandard4th22g33 + PDstandard4th33g22)); - R33 = khalf*(4*G132*G231 - gu11*PDstandard4th11g33 - - 2*(G111*G133 + G133*G221 + G121*G233 + G222*G233 + G131*G333 + G232*G333 + gu12*PDstandard4th12g33) + - 2*(G133*G331 + G233*G332 + gu11*PDstandard4th13g31) + 2*gu12*PDstandard4th13g32 - gu22*PDstandard4th22g33 + - 2*gu12*PDstandard4th23g31 + 2*gu22*PDstandard4th23g32 - gu11*PDstandard4th33g11 - 2*gu12*PDstandard4th33g21 - - gu22*PDstandard4th33g22 + 2*SQR(G131) + 2*SQR(G232)); + R33 = khalf*(4*G123*G213 - gu11*PDstandard4th11g33 - + 2*(G111*G133 + G133*G212 + G112*G233 + G222*G233 + G113*G333 + G223*G333 + gu21*PDstandard4th12g33) + + 2*(G133*G313 + G233*G323 + gu11*PDstandard4th13g13) + 2*gu21*PDstandard4th13g23 - gu22*PDstandard4th22g33 + + 2*gu21*PDstandard4th23g13 + 2*gu22*PDstandard4th23g23 - gu11*PDstandard4th33g11 - 2*gu21*PDstandard4th33g12 - + gu22*PDstandard4th33g22 + 2*SQR(G113) + 2*SQR(G223)); - Km11 = gu11*K11L + gu12*K21L + gu13*K31L; + Km11 = gu11*K11L + gu21*K12L + gu31*K13L; - Km21 = gu12*K11L + gu22*K21L + gu23*K31L; + Km21 = gu21*K11L + gu22*K12L + gu32*K13L; - Km31 = gu13*K11L + gu23*K21L + gu33*K31L; + Km31 = gu31*K11L + gu32*K12L + gu33*K13L; - Km12 = gu11*K21L + gu12*K22L + gu13*K32L; + Km12 = gu11*K12L + gu21*K22L + gu31*K23L; - Km22 = gu12*K21L + gu22*K22L + gu23*K32L; + Km22 = gu21*K12L + gu22*K22L + gu32*K23L; - Km32 = gu13*K21L + gu23*K22L + gu33*K32L; + Km32 = gu31*K12L + gu32*K22L + gu33*K23L; - Km13 = gu11*K31L + gu12*K32L + gu13*K33L; + Km13 = gu11*K13L + gu21*K23L + gu31*K33L; - Km23 = gu12*K31L + gu22*K32L + gu23*K33L; + Km23 = gu21*K13L + gu22*K23L + gu32*K33L; - Km33 = gu13*K31L + gu23*K32L + gu33*K33L; + Km33 = gu31*K13L + gu32*K23L + gu33*K33L; trK = Km11 + Km22 + Km33; - g11rhsL = -2*alphaL*K11L + 2*(g11L*PDstandard4th1beta1 + g21L*PDstandard4th1beta2 + g31L*PDstandard4th1beta3) + + g11rhsL = -2*alphaL*K11L + 2*(g11L*PDstandard4th1beta1 + g12L*PDstandard4th1beta2 + g13L*PDstandard4th1beta3) + beta1L*PDstandard4th1g11 + beta2L*PDstandard4th2g11 + beta3L*PDstandard4th3g11; - g21rhsL = -2*alphaL*K21L + g22L*PDstandard4th1beta2 + g32L*PDstandard4th1beta3 + beta1L*PDstandard4th1g21 + - g11L*PDstandard4th2beta1 + g21L*(PDstandard4th1beta1 + PDstandard4th2beta2) + g31L*PDstandard4th2beta3 + - beta2L*PDstandard4th2g21 + beta3L*PDstandard4th3g21; + g12rhsL = -2*alphaL*K12L + g22L*PDstandard4th1beta2 + g23L*PDstandard4th1beta3 + beta1L*PDstandard4th1g12 + + g11L*PDstandard4th2beta1 + g12L*(PDstandard4th1beta1 + PDstandard4th2beta2) + g13L*PDstandard4th2beta3 + + beta2L*PDstandard4th2g12 + beta3L*PDstandard4th3g12; - g31rhsL = -2*alphaL*K31L + g32L*PDstandard4th1beta2 + g33L*PDstandard4th1beta3 + beta1L*PDstandard4th1g31 + - beta2L*PDstandard4th2g31 + g11L*PDstandard4th3beta1 + g21L*PDstandard4th3beta2 + - g31L*(PDstandard4th1beta1 + PDstandard4th3beta3) + beta3L*PDstandard4th3g31; + g13rhsL = -2*alphaL*K13L + g23L*PDstandard4th1beta2 + g33L*PDstandard4th1beta3 + beta1L*PDstandard4th1g13 + + beta2L*PDstandard4th2g13 + g11L*PDstandard4th3beta1 + g12L*PDstandard4th3beta2 + + g13L*(PDstandard4th1beta1 + PDstandard4th3beta3) + beta3L*PDstandard4th3g13; g22rhsL = -2*alphaL*K22L + beta1L*PDstandard4th1g22 + - 2*(g21L*PDstandard4th2beta1 + g22L*PDstandard4th2beta2 + g32L*PDstandard4th2beta3) + beta2L*PDstandard4th2g22 + + 2*(g12L*PDstandard4th2beta1 + g22L*PDstandard4th2beta2 + g23L*PDstandard4th2beta3) + beta2L*PDstandard4th2g22 + beta3L*PDstandard4th3g22; - g32rhsL = -2*alphaL*K32L + beta1L*PDstandard4th1g32 + g31L*PDstandard4th2beta1 + g33L*PDstandard4th2beta3 + - beta2L*PDstandard4th2g32 + g21L*PDstandard4th3beta1 + g22L*PDstandard4th3beta2 + - g32L*(PDstandard4th2beta2 + PDstandard4th3beta3) + beta3L*PDstandard4th3g32; + g23rhsL = -2*alphaL*K23L + beta1L*PDstandard4th1g23 + g13L*PDstandard4th2beta1 + g33L*PDstandard4th2beta3 + + beta2L*PDstandard4th2g23 + g12L*PDstandard4th3beta1 + g22L*PDstandard4th3beta2 + + g23L*(PDstandard4th2beta2 + PDstandard4th3beta3) + beta3L*PDstandard4th3g23; g33rhsL = -2*alphaL*K33L + beta1L*PDstandard4th1g33 + beta2L*PDstandard4th2g33 + - 2*(g31L*PDstandard4th3beta1 + g32L*PDstandard4th3beta2 + g33L*PDstandard4th3beta3) + beta3L*PDstandard4th3g33; + 2*(g13L*PDstandard4th3beta1 + g23L*PDstandard4th3beta2 + g33L*PDstandard4th3beta3) + beta3L*PDstandard4th3g33; K11rhsL = -PDstandard4th11alpha + G111*PDstandard4th1alpha + - 2*(K11L*PDstandard4th1beta1 + K21L*PDstandard4th1beta2 + K31L*PDstandard4th1beta3) + beta1L*PDstandard4th1K11 + + 2*(K11L*PDstandard4th1beta1 + K12L*PDstandard4th1beta2 + K13L*PDstandard4th1beta3) + beta1L*PDstandard4th1K11 + G211*PDstandard4th2alpha + beta2L*PDstandard4th2K11 + G311*PDstandard4th3alpha + beta3L*PDstandard4th3K11 + - alphaL*(-2*(K11L*Km11 + K21L*Km21 + K31L*Km31) + R11 + K11L*trK); + alphaL*(-2*(K11L*Km11 + K12L*Km21 + K13L*Km31) + R11 + K11L*trK); - K21rhsL = -PDstandard4th12alpha + G121*PDstandard4th1alpha + K22L*PDstandard4th1beta2 + K32L*PDstandard4th1beta3 + - beta1L*PDstandard4th1K21 + G221*PDstandard4th2alpha + K11L*PDstandard4th2beta1 + - K21L*(PDstandard4th1beta1 + PDstandard4th2beta2) + K31L*PDstandard4th2beta3 + beta2L*PDstandard4th2K21 + - G321*PDstandard4th3alpha + beta3L*PDstandard4th3K21 + - alphaL*(-2*(K11L*Km12 + K21L*Km22 + K31L*Km32) + R21 + K21L*trK); + K12rhsL = -PDstandard4th12alpha + G112*PDstandard4th1alpha + K22L*PDstandard4th1beta2 + K23L*PDstandard4th1beta3 + + beta1L*PDstandard4th1K12 + G212*PDstandard4th2alpha + K11L*PDstandard4th2beta1 + + K12L*(PDstandard4th1beta1 + PDstandard4th2beta2) + K13L*PDstandard4th2beta3 + beta2L*PDstandard4th2K12 + + G312*PDstandard4th3alpha + beta3L*PDstandard4th3K12 + + alphaL*(-2*(K11L*Km12 + K12L*Km22 + K13L*Km32) + R12 + K12L*trK); - K31rhsL = -PDstandard4th13alpha + G131*PDstandard4th1alpha + K32L*PDstandard4th1beta2 + K33L*PDstandard4th1beta3 + - beta1L*PDstandard4th1K31 + G231*PDstandard4th2alpha + beta2L*PDstandard4th2K31 + G331*PDstandard4th3alpha + - K11L*PDstandard4th3beta1 + K21L*PDstandard4th3beta2 + K31L*(PDstandard4th1beta1 + PDstandard4th3beta3) + - beta3L*PDstandard4th3K31 + alphaL*(-2*(K11L*Km13 + K21L*Km23 + K31L*Km33) + R31 + K31L*trK); + K13rhsL = -PDstandard4th13alpha + G113*PDstandard4th1alpha + K23L*PDstandard4th1beta2 + K33L*PDstandard4th1beta3 + + beta1L*PDstandard4th1K13 + G213*PDstandard4th2alpha + beta2L*PDstandard4th2K13 + G313*PDstandard4th3alpha + + K11L*PDstandard4th3beta1 + K12L*PDstandard4th3beta2 + K13L*(PDstandard4th1beta1 + PDstandard4th3beta3) + + beta3L*PDstandard4th3K13 + alphaL*(-2*(K11L*Km13 + K12L*Km23 + K13L*Km33) + R13 + K13L*trK); K22rhsL = G122*PDstandard4th1alpha + beta1L*PDstandard4th1K22 - PDstandard4th22alpha + G222*PDstandard4th2alpha + - 2*(K21L*PDstandard4th2beta1 + K22L*PDstandard4th2beta2 + K32L*PDstandard4th2beta3) + beta2L*PDstandard4th2K22 + + 2*(K12L*PDstandard4th2beta1 + K22L*PDstandard4th2beta2 + K23L*PDstandard4th2beta3) + beta2L*PDstandard4th2K22 + G322*PDstandard4th3alpha + beta3L*PDstandard4th3K22 + - alphaL*(-2*(K21L*Km12 + K22L*Km22 + K32L*Km32) + R22 + K22L*trK); + alphaL*(-2*(K12L*Km12 + K22L*Km22 + K23L*Km32) + R22 + K22L*trK); - K32rhsL = G132*PDstandard4th1alpha + beta1L*PDstandard4th1K32 - PDstandard4th23alpha + G232*PDstandard4th2alpha + - K31L*PDstandard4th2beta1 + K33L*PDstandard4th2beta3 + beta2L*PDstandard4th2K32 + G332*PDstandard4th3alpha + - K21L*PDstandard4th3beta1 + K22L*PDstandard4th3beta2 + K32L*(PDstandard4th2beta2 + PDstandard4th3beta3) + - beta3L*PDstandard4th3K32 + alphaL*(-2*(K21L*Km13 + K22L*Km23 + K32L*Km33) + R32 + K32L*trK); + K23rhsL = G123*PDstandard4th1alpha + beta1L*PDstandard4th1K23 - PDstandard4th23alpha + G223*PDstandard4th2alpha + + K13L*PDstandard4th2beta1 + K33L*PDstandard4th2beta3 + beta2L*PDstandard4th2K23 + G323*PDstandard4th3alpha + + K12L*PDstandard4th3beta1 + K22L*PDstandard4th3beta2 + K23L*(PDstandard4th2beta2 + PDstandard4th3beta3) + + beta3L*PDstandard4th3K23 + alphaL*(-2*(K12L*Km13 + K22L*Km23 + K23L*Km33) + R23 + K23L*trK); K33rhsL = G133*PDstandard4th1alpha + beta1L*PDstandard4th1K33 + G233*PDstandard4th2alpha + beta2L*PDstandard4th2K33 - PDstandard4th33alpha + G333*PDstandard4th3alpha + - 2*(K31L*PDstandard4th3beta1 + K32L*PDstandard4th3beta2 + K33L*PDstandard4th3beta3) + beta3L*PDstandard4th3K33 + - alphaL*(-2*(K31L*Km13 + K32L*Km23 + K33L*Km33) + R33 + K33L*trK); + 2*(K13L*PDstandard4th3beta1 + K23L*PDstandard4th3beta2 + K33L*PDstandard4th3beta3) + beta3L*PDstandard4th3K33 + + alphaL*(-2*(K13L*Km13 + K23L*Km23 + K33L*Km33) + R33 + K33L*trK); alpharhsL = 0; @@ -510,16 +510,16 @@ void ML_ADM_RHS_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL normal[ beta2rhs[index] = beta2rhsL; beta3rhs[index] = beta3rhsL; g11rhs[index] = g11rhsL; - g21rhs[index] = g21rhsL; + g12rhs[index] = g12rhsL; + g13rhs[index] = g13rhsL; g22rhs[index] = g22rhsL; - g31rhs[index] = g31rhsL; - g32rhs[index] = g32rhsL; + g23rhs[index] = g23rhsL; g33rhs[index] = g33rhsL; K11rhs[index] = K11rhsL; - K21rhs[index] = K21rhsL; + K12rhs[index] = K12rhsL; + K13rhs[index] = K13rhsL; K22rhs[index] = K22rhsL; - K31rhs[index] = K31rhsL; - K32rhs[index] = K32rhsL; + K23rhs[index] = K23rhsL; K33rhs[index] = K33rhsL; /* Copy local copies back to subblock grid functions */ diff --git a/ML_ADM/src/ML_ADM_constraints.c b/ML_ADM/src/ML_ADM_constraints.c index 420fbe7..8dd52b2 100644 --- a/ML_ADM/src/ML_ADM_constraints.c +++ b/ML_ADM/src/ML_ADM_constraints.c @@ -95,20 +95,20 @@ void ML_ADM_constraints_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL /* Declare shorthands */ CCTK_REAL detg = INITVALUE; - CCTK_REAL G111 = INITVALUE, G121 = INITVALUE, G122 = INITVALUE, G131 = INITVALUE, G132 = INITVALUE, G133 = INITVALUE; - CCTK_REAL G211 = INITVALUE, G221 = INITVALUE, G222 = INITVALUE, G231 = INITVALUE, G232 = INITVALUE, G233 = INITVALUE; - CCTK_REAL G311 = INITVALUE, G321 = INITVALUE, G322 = INITVALUE, G331 = INITVALUE, G332 = INITVALUE, G333 = INITVALUE; - CCTK_REAL gu11 = INITVALUE, gu12 = INITVALUE, gu13 = INITVALUE, gu22 = INITVALUE, gu23 = INITVALUE, gu33 = INITVALUE; + CCTK_REAL G111 = INITVALUE, G112 = INITVALUE, G113 = INITVALUE, G122 = INITVALUE, G123 = INITVALUE, G133 = INITVALUE; + CCTK_REAL G211 = INITVALUE, G212 = INITVALUE, G213 = INITVALUE, G222 = INITVALUE, G223 = INITVALUE, G233 = INITVALUE; + CCTK_REAL G311 = INITVALUE, G312 = INITVALUE, G313 = INITVALUE, G322 = INITVALUE, G323 = INITVALUE, G333 = INITVALUE; + CCTK_REAL gu11 = INITVALUE, gu21 = INITVALUE, gu22 = INITVALUE, gu31 = INITVALUE, gu32 = INITVALUE, gu33 = INITVALUE; CCTK_REAL Km11 = INITVALUE, Km12 = INITVALUE, Km13 = INITVALUE, Km21 = INITVALUE, Km22 = INITVALUE, Km23 = INITVALUE; CCTK_REAL Km31 = INITVALUE, Km32 = INITVALUE, Km33 = INITVALUE; - CCTK_REAL R11 = INITVALUE, R21 = INITVALUE, R22 = INITVALUE, R31 = INITVALUE, R32 = INITVALUE, R33 = INITVALUE; + CCTK_REAL R11 = INITVALUE, R12 = INITVALUE, R13 = INITVALUE, R22 = INITVALUE, R23 = INITVALUE, R33 = INITVALUE; CCTK_REAL trK = INITVALUE; CCTK_REAL trR = INITVALUE; /* Declare local copies of grid functions */ - CCTK_REAL g11L = INITVALUE, g21L = INITVALUE, g22L = INITVALUE, g31L = INITVALUE, g32L = INITVALUE, g33L = INITVALUE; + CCTK_REAL g11L = INITVALUE, g12L = INITVALUE, g13L = INITVALUE, g22L = INITVALUE, g23L = INITVALUE, g33L = INITVALUE; CCTK_REAL HL = INITVALUE; - CCTK_REAL K11L = INITVALUE, K21L = INITVALUE, K22L = INITVALUE, K31L = INITVALUE, K32L = INITVALUE, K33L = INITVALUE; + CCTK_REAL K11L = INITVALUE, K12L = INITVALUE, K13L = INITVALUE, K22L = INITVALUE, K23L = INITVALUE, K33L = INITVALUE; CCTK_REAL M1L = INITVALUE, M2L = INITVALUE, M3L = INITVALUE; /* Declare precomputed derivatives*/ @@ -124,16 +124,26 @@ void ML_ADM_constraints_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL CCTK_REAL PDstandard4th23g11 = INITVALUE; CCTK_REAL PDstandard4th31g11 = INITVALUE; CCTK_REAL PDstandard4th32g11 = INITVALUE; - CCTK_REAL PDstandard4th1g21 = INITVALUE; - CCTK_REAL PDstandard4th2g21 = INITVALUE; - CCTK_REAL PDstandard4th3g21 = INITVALUE; - CCTK_REAL PDstandard4th33g21 = INITVALUE; - CCTK_REAL PDstandard4th12g21 = INITVALUE; - CCTK_REAL PDstandard4th13g21 = INITVALUE; - CCTK_REAL PDstandard4th21g21 = INITVALUE; - CCTK_REAL PDstandard4th23g21 = INITVALUE; - CCTK_REAL PDstandard4th31g21 = INITVALUE; - CCTK_REAL PDstandard4th32g21 = INITVALUE; + CCTK_REAL PDstandard4th1g12 = INITVALUE; + CCTK_REAL PDstandard4th2g12 = INITVALUE; + CCTK_REAL PDstandard4th3g12 = INITVALUE; + CCTK_REAL PDstandard4th33g12 = INITVALUE; + CCTK_REAL PDstandard4th12g12 = INITVALUE; + CCTK_REAL PDstandard4th13g12 = INITVALUE; + CCTK_REAL PDstandard4th21g12 = INITVALUE; + CCTK_REAL PDstandard4th23g12 = INITVALUE; + CCTK_REAL PDstandard4th31g12 = INITVALUE; + CCTK_REAL PDstandard4th32g12 = INITVALUE; + CCTK_REAL PDstandard4th1g13 = INITVALUE; + CCTK_REAL PDstandard4th2g13 = INITVALUE; + CCTK_REAL PDstandard4th3g13 = INITVALUE; + CCTK_REAL PDstandard4th22g13 = INITVALUE; + CCTK_REAL PDstandard4th12g13 = INITVALUE; + CCTK_REAL PDstandard4th13g13 = INITVALUE; + CCTK_REAL PDstandard4th21g13 = INITVALUE; + CCTK_REAL PDstandard4th23g13 = INITVALUE; + CCTK_REAL PDstandard4th31g13 = INITVALUE; + CCTK_REAL PDstandard4th32g13 = INITVALUE; CCTK_REAL PDstandard4th1g22 = INITVALUE; CCTK_REAL PDstandard4th2g22 = INITVALUE; CCTK_REAL PDstandard4th3g22 = INITVALUE; @@ -145,26 +155,16 @@ void ML_ADM_constraints_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL CCTK_REAL PDstandard4th23g22 = INITVALUE; CCTK_REAL PDstandard4th31g22 = INITVALUE; CCTK_REAL PDstandard4th32g22 = INITVALUE; - CCTK_REAL PDstandard4th1g31 = INITVALUE; - CCTK_REAL PDstandard4th2g31 = INITVALUE; - CCTK_REAL PDstandard4th3g31 = INITVALUE; - CCTK_REAL PDstandard4th22g31 = INITVALUE; - CCTK_REAL PDstandard4th12g31 = INITVALUE; - CCTK_REAL PDstandard4th13g31 = INITVALUE; - CCTK_REAL PDstandard4th21g31 = INITVALUE; - CCTK_REAL PDstandard4th23g31 = INITVALUE; - CCTK_REAL PDstandard4th31g31 = INITVALUE; - CCTK_REAL PDstandard4th32g31 = INITVALUE; - CCTK_REAL PDstandard4th1g32 = INITVALUE; - CCTK_REAL PDstandard4th2g32 = INITVALUE; - CCTK_REAL PDstandard4th3g32 = INITVALUE; - CCTK_REAL PDstandard4th11g32 = INITVALUE; - CCTK_REAL PDstandard4th12g32 = INITVALUE; - CCTK_REAL PDstandard4th13g32 = INITVALUE; - CCTK_REAL PDstandard4th21g32 = INITVALUE; - CCTK_REAL PDstandard4th23g32 = INITVALUE; - CCTK_REAL PDstandard4th31g32 = INITVALUE; - CCTK_REAL PDstandard4th32g32 = INITVALUE; + CCTK_REAL PDstandard4th1g23 = INITVALUE; + CCTK_REAL PDstandard4th2g23 = INITVALUE; + CCTK_REAL PDstandard4th3g23 = INITVALUE; + CCTK_REAL PDstandard4th11g23 = INITVALUE; + CCTK_REAL PDstandard4th12g23 = INITVALUE; + CCTK_REAL PDstandard4th13g23 = INITVALUE; + CCTK_REAL PDstandard4th21g23 = INITVALUE; + CCTK_REAL PDstandard4th23g23 = INITVALUE; + CCTK_REAL PDstandard4th31g23 = INITVALUE; + CCTK_REAL PDstandard4th32g23 = INITVALUE; CCTK_REAL PDstandard4th1g33 = INITVALUE; CCTK_REAL PDstandard4th2g33 = INITVALUE; CCTK_REAL PDstandard4th3g33 = INITVALUE; @@ -178,32 +178,32 @@ void ML_ADM_constraints_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL CCTK_REAL PDstandard4th32g33 = INITVALUE; CCTK_REAL PDstandard4th2K11 = INITVALUE; CCTK_REAL PDstandard4th3K11 = INITVALUE; - CCTK_REAL PDstandard4th1K21 = INITVALUE; - CCTK_REAL PDstandard4th2K21 = INITVALUE; - CCTK_REAL PDstandard4th3K21 = INITVALUE; + CCTK_REAL PDstandard4th1K12 = INITVALUE; + CCTK_REAL PDstandard4th2K12 = INITVALUE; + CCTK_REAL PDstandard4th3K12 = INITVALUE; + CCTK_REAL PDstandard4th1K13 = INITVALUE; + CCTK_REAL PDstandard4th2K13 = INITVALUE; + CCTK_REAL PDstandard4th3K13 = INITVALUE; CCTK_REAL PDstandard4th1K22 = INITVALUE; CCTK_REAL PDstandard4th3K22 = INITVALUE; - CCTK_REAL PDstandard4th1K31 = INITVALUE; - CCTK_REAL PDstandard4th2K31 = INITVALUE; - CCTK_REAL PDstandard4th3K31 = INITVALUE; - CCTK_REAL PDstandard4th1K32 = INITVALUE; - CCTK_REAL PDstandard4th2K32 = INITVALUE; - CCTK_REAL PDstandard4th3K32 = INITVALUE; + CCTK_REAL PDstandard4th1K23 = INITVALUE; + CCTK_REAL PDstandard4th2K23 = INITVALUE; + CCTK_REAL PDstandard4th3K23 = INITVALUE; CCTK_REAL PDstandard4th1K33 = INITVALUE; CCTK_REAL PDstandard4th2K33 = INITVALUE; /* Assign local copies of grid functions */ g11L = g11[index]; - g21L = g21[index]; + g12L = g12[index]; + g13L = g13[index]; g22L = g22[index]; - g31L = g31[index]; - g32L = g32[index]; + g23L = g23[index]; g33L = g33[index]; K11L = K11[index]; - K21L = K21[index]; + K12L = K12[index]; + K13L = K13[index]; K22L = K22[index]; - K31L = K31[index]; - K32L = K32[index]; + K23L = K23[index]; K33L = K33[index]; /* Assign local copies of subblock grid functions */ @@ -217,33 +217,33 @@ void ML_ADM_constraints_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL PDstandard4th22g11 = PDstandard4th22(g11, i, j, k); PDstandard4th33g11 = PDstandard4th33(g11, i, j, k); PDstandard4th23g11 = PDstandard4th23(g11, i, j, k); - PDstandard4th1g21 = PDstandard4th1(g21, i, j, k); - PDstandard4th2g21 = PDstandard4th2(g21, i, j, k); - PDstandard4th3g21 = PDstandard4th3(g21, i, j, k); - PDstandard4th33g21 = PDstandard4th33(g21, i, j, k); - PDstandard4th12g21 = PDstandard4th12(g21, i, j, k); - PDstandard4th13g21 = PDstandard4th13(g21, i, j, k); - PDstandard4th23g21 = PDstandard4th23(g21, i, j, k); + PDstandard4th1g12 = PDstandard4th1(g12, i, j, k); + PDstandard4th2g12 = PDstandard4th2(g12, i, j, k); + PDstandard4th3g12 = PDstandard4th3(g12, i, j, k); + PDstandard4th33g12 = PDstandard4th33(g12, i, j, k); + PDstandard4th12g12 = PDstandard4th12(g12, i, j, k); + PDstandard4th13g12 = PDstandard4th13(g12, i, j, k); + PDstandard4th23g12 = PDstandard4th23(g12, i, j, k); + PDstandard4th1g13 = PDstandard4th1(g13, i, j, k); + PDstandard4th2g13 = PDstandard4th2(g13, i, j, k); + PDstandard4th3g13 = PDstandard4th3(g13, i, j, k); + PDstandard4th22g13 = PDstandard4th22(g13, i, j, k); + PDstandard4th12g13 = PDstandard4th12(g13, i, j, k); + PDstandard4th13g13 = PDstandard4th13(g13, i, j, k); + PDstandard4th23g13 = PDstandard4th23(g13, i, j, k); PDstandard4th1g22 = PDstandard4th1(g22, i, j, k); PDstandard4th2g22 = PDstandard4th2(g22, i, j, k); PDstandard4th3g22 = PDstandard4th3(g22, i, j, k); PDstandard4th11g22 = PDstandard4th11(g22, i, j, k); PDstandard4th33g22 = PDstandard4th33(g22, i, j, k); PDstandard4th13g22 = PDstandard4th13(g22, i, j, k); - PDstandard4th1g31 = PDstandard4th1(g31, i, j, k); - PDstandard4th2g31 = PDstandard4th2(g31, i, j, k); - PDstandard4th3g31 = PDstandard4th3(g31, i, j, k); - PDstandard4th22g31 = PDstandard4th22(g31, i, j, k); - PDstandard4th12g31 = PDstandard4th12(g31, i, j, k); - PDstandard4th13g31 = PDstandard4th13(g31, i, j, k); - PDstandard4th23g31 = PDstandard4th23(g31, i, j, k); - PDstandard4th1g32 = PDstandard4th1(g32, i, j, k); - PDstandard4th2g32 = PDstandard4th2(g32, i, j, k); - PDstandard4th3g32 = PDstandard4th3(g32, i, j, k); - PDstandard4th11g32 = PDstandard4th11(g32, i, j, k); - PDstandard4th12g32 = PDstandard4th12(g32, i, j, k); - PDstandard4th13g32 = PDstandard4th13(g32, i, j, k); - PDstandard4th23g32 = PDstandard4th23(g32, i, j, k); + PDstandard4th1g23 = PDstandard4th1(g23, i, j, k); + PDstandard4th2g23 = PDstandard4th2(g23, i, j, k); + PDstandard4th3g23 = PDstandard4th3(g23, i, j, k); + PDstandard4th11g23 = PDstandard4th11(g23, i, j, k); + PDstandard4th12g23 = PDstandard4th12(g23, i, j, k); + PDstandard4th13g23 = PDstandard4th13(g23, i, j, k); + PDstandard4th23g23 = PDstandard4th23(g23, i, j, k); PDstandard4th1g33 = PDstandard4th1(g33, i, j, k); PDstandard4th2g33 = PDstandard4th2(g33, i, j, k); PDstandard4th3g33 = PDstandard4th3(g33, i, j, k); @@ -252,177 +252,177 @@ void ML_ADM_constraints_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK_REAL PDstandard4th12g33 = PDstandard4th12(g33, i, j, k); PDstandard4th2K11 = PDstandard4th2(K11, i, j, k); PDstandard4th3K11 = PDstandard4th3(K11, i, j, k); - PDstandard4th1K21 = PDstandard4th1(K21, i, j, k); - PDstandard4th2K21 = PDstandard4th2(K21, i, j, k); - PDstandard4th3K21 = PDstandard4th3(K21, i, j, k); + PDstandard4th1K12 = PDstandard4th1(K12, i, j, k); + PDstandard4th2K12 = PDstandard4th2(K12, i, j, k); + PDstandard4th3K12 = PDstandard4th3(K12, i, j, k); + PDstandard4th1K13 = PDstandard4th1(K13, i, j, k); + PDstandard4th2K13 = PDstandard4th2(K13, i, j, k); + PDstandard4th3K13 = PDstandard4th3(K13, i, j, k); PDstandard4th1K22 = PDstandard4th1(K22, i, j, k); PDstandard4th3K22 = PDstandard4th3(K22, i, j, k); - PDstandard4th1K31 = PDstandard4th1(K31, i, j, k); - PDstandard4th2K31 = PDstandard4th2(K31, i, j, k); - PDstandard4th3K31 = PDstandard4th3(K31, i, j, k); - PDstandard4th1K32 = PDstandard4th1(K32, i, j, k); - PDstandard4th2K32 = PDstandard4th2(K32, i, j, k); - PDstandard4th3K32 = PDstandard4th3(K32, i, j, k); + PDstandard4th1K23 = PDstandard4th1(K23, i, j, k); + PDstandard4th2K23 = PDstandard4th2(K23, i, j, k); + PDstandard4th3K23 = PDstandard4th3(K23, i, j, k); PDstandard4th1K33 = PDstandard4th1(K33, i, j, k); PDstandard4th2K33 = PDstandard4th2(K33, i, j, k); /* Precompute derivatives (old style) */ /* Calculate temporaries and grid functions */ - detg = 2*g21L*g31L*g32L + g33L*(g11L*g22L - SQR(g21L)) - g22L*SQR(g31L) - g11L*SQR(g32L); + detg = 2*g12L*g13L*g23L + g33L*(g11L*g22L - SQR(g12L)) - g22L*SQR(g13L) - g11L*SQR(g23L); - gu11 = INV(detg)*(g22L*g33L - SQR(g32L)); + gu11 = INV(detg)*(g22L*g33L - SQR(g23L)); - gu12 = (g31L*g32L - g21L*g33L)*INV(detg); + gu21 = (g13L*g23L - g12L*g33L)*INV(detg); - gu13 = (-(g22L*g31L) + g21L*g32L)*INV(detg); + gu31 = (-(g13L*g22L) + g12L*g23L)*INV(detg); - gu22 = INV(detg)*(g11L*g33L - SQR(g31L)); + gu22 = INV(detg)*(g11L*g33L - SQR(g13L)); - gu23 = (g21L*g31L - g11L*g32L)*INV(detg); + gu32 = (g12L*g13L - g11L*g23L)*INV(detg); - gu33 = INV(detg)*(g11L*g22L - SQR(g21L)); + gu33 = INV(detg)*(g11L*g22L - SQR(g12L)); - G111 = khalf*(gu11*PDstandard4th1g11 + 2*(gu12*PDstandard4th1g21 + gu13*PDstandard4th1g31) - gu12*PDstandard4th2g11 - - gu13*PDstandard4th3g11); + G111 = khalf*(gu11*PDstandard4th1g11 + 2*(gu21*PDstandard4th1g12 + gu31*PDstandard4th1g13) - gu21*PDstandard4th2g11 - + gu31*PDstandard4th3g11); - G211 = khalf*(gu12*PDstandard4th1g11 + 2*(gu22*PDstandard4th1g21 + gu23*PDstandard4th1g31) - gu22*PDstandard4th2g11 - - gu23*PDstandard4th3g11); + G211 = khalf*(gu21*PDstandard4th1g11 + 2*(gu22*PDstandard4th1g12 + gu32*PDstandard4th1g13) - gu22*PDstandard4th2g11 - + gu32*PDstandard4th3g11); - G311 = khalf*(gu13*PDstandard4th1g11 + 2*(gu23*PDstandard4th1g21 + gu33*PDstandard4th1g31) - gu23*PDstandard4th2g11 - + G311 = khalf*(gu31*PDstandard4th1g11 + 2*(gu32*PDstandard4th1g12 + gu33*PDstandard4th1g13) - gu32*PDstandard4th2g11 - gu33*PDstandard4th3g11); - G121 = khalf*(gu12*PDstandard4th1g22 + gu11*PDstandard4th2g11 + - gu13*(PDstandard4th1g32 + PDstandard4th2g31 - PDstandard4th3g21)); + G112 = khalf*(gu21*PDstandard4th1g22 + gu11*PDstandard4th2g11 + + gu31*(PDstandard4th1g23 + PDstandard4th2g13 - PDstandard4th3g12)); - G221 = khalf*(gu22*PDstandard4th1g22 + gu12*PDstandard4th2g11 + - gu23*(PDstandard4th1g32 + PDstandard4th2g31 - PDstandard4th3g21)); + G212 = khalf*(gu22*PDstandard4th1g22 + gu21*PDstandard4th2g11 + + gu32*(PDstandard4th1g23 + PDstandard4th2g13 - PDstandard4th3g12)); - G321 = khalf*(gu23*PDstandard4th1g22 + gu13*PDstandard4th2g11 + - gu33*(PDstandard4th1g32 + PDstandard4th2g31 - PDstandard4th3g21)); + G312 = khalf*(gu32*PDstandard4th1g22 + gu31*PDstandard4th2g11 + + gu33*(PDstandard4th1g23 + PDstandard4th2g13 - PDstandard4th3g12)); - G131 = khalf*(gu13*PDstandard4th1g33 + gu11*PDstandard4th3g11 + - gu12*(PDstandard4th1g32 - PDstandard4th2g31 + PDstandard4th3g21)); + G113 = khalf*(gu31*PDstandard4th1g33 + gu11*PDstandard4th3g11 + + gu21*(PDstandard4th1g23 - PDstandard4th2g13 + PDstandard4th3g12)); - G231 = khalf*(gu23*PDstandard4th1g33 + gu12*PDstandard4th3g11 + - gu22*(PDstandard4th1g32 - PDstandard4th2g31 + PDstandard4th3g21)); + G213 = khalf*(gu32*PDstandard4th1g33 + gu21*PDstandard4th3g11 + + gu22*(PDstandard4th1g23 - PDstandard4th2g13 + PDstandard4th3g12)); - G331 = khalf*(gu33*PDstandard4th1g33 + gu13*PDstandard4th3g11 + - gu23*(PDstandard4th1g32 - PDstandard4th2g31 + PDstandard4th3g21)); + G313 = khalf*(gu33*PDstandard4th1g33 + gu31*PDstandard4th3g11 + + gu32*(PDstandard4th1g23 - PDstandard4th2g13 + PDstandard4th3g12)); - G122 = khalf*(gu11*(-PDstandard4th1g22 + 2*PDstandard4th2g21) + gu12*PDstandard4th2g22 + - gu13*(2*PDstandard4th2g32 - PDstandard4th3g22)); + G122 = khalf*(gu11*(-PDstandard4th1g22 + 2*PDstandard4th2g12) + gu21*PDstandard4th2g22 + + gu31*(2*PDstandard4th2g23 - PDstandard4th3g22)); - G222 = khalf*(gu12*(-PDstandard4th1g22 + 2*PDstandard4th2g21) + gu22*PDstandard4th2g22 + - gu23*(2*PDstandard4th2g32 - PDstandard4th3g22)); + G222 = khalf*(gu21*(-PDstandard4th1g22 + 2*PDstandard4th2g12) + gu22*PDstandard4th2g22 + + gu32*(2*PDstandard4th2g23 - PDstandard4th3g22)); - G322 = khalf*(gu13*(-PDstandard4th1g22 + 2*PDstandard4th2g21) + gu23*PDstandard4th2g22 + - gu33*(2*PDstandard4th2g32 - PDstandard4th3g22)); + G322 = khalf*(gu31*(-PDstandard4th1g22 + 2*PDstandard4th2g12) + gu32*PDstandard4th2g22 + + gu33*(2*PDstandard4th2g23 - PDstandard4th3g22)); - G132 = khalf*(gu13*PDstandard4th2g33 + gu11*(-PDstandard4th1g32 + PDstandard4th2g31 + PDstandard4th3g21) + - gu12*PDstandard4th3g22); + G123 = khalf*(gu31*PDstandard4th2g33 + gu11*(-PDstandard4th1g23 + PDstandard4th2g13 + PDstandard4th3g12) + + gu21*PDstandard4th3g22); - G232 = khalf*(gu23*PDstandard4th2g33 + gu12*(-PDstandard4th1g32 + PDstandard4th2g31 + PDstandard4th3g21) + + G223 = khalf*(gu32*PDstandard4th2g33 + gu21*(-PDstandard4th1g23 + PDstandard4th2g13 + PDstandard4th3g12) + gu22*PDstandard4th3g22); - G332 = khalf*(gu33*PDstandard4th2g33 + gu13*(-PDstandard4th1g32 + PDstandard4th2g31 + PDstandard4th3g21) + - gu23*PDstandard4th3g22); + G323 = khalf*(gu33*PDstandard4th2g33 + gu31*(-PDstandard4th1g23 + PDstandard4th2g13 + PDstandard4th3g12) + + gu32*PDstandard4th3g22); - G133 = khalf*(-(gu11*PDstandard4th1g33) - gu12*PDstandard4th2g33 + 2*gu11*PDstandard4th3g31 + - 2*gu12*PDstandard4th3g32 + gu13*PDstandard4th3g33); + G133 = khalf*(-(gu11*PDstandard4th1g33) - gu21*PDstandard4th2g33 + 2*gu11*PDstandard4th3g13 + + 2*gu21*PDstandard4th3g23 + gu31*PDstandard4th3g33); - G233 = khalf*(-(gu12*PDstandard4th1g33) - gu22*PDstandard4th2g33 + 2*gu12*PDstandard4th3g31 + - 2*gu22*PDstandard4th3g32 + gu23*PDstandard4th3g33); + G233 = khalf*(-(gu21*PDstandard4th1g33) - gu22*PDstandard4th2g33 + 2*gu21*PDstandard4th3g13 + + 2*gu22*PDstandard4th3g23 + gu32*PDstandard4th3g33); - G333 = khalf*(-(gu13*PDstandard4th1g33) - gu23*PDstandard4th2g33 + 2*gu13*PDstandard4th3g31 + - 2*gu23*PDstandard4th3g32 + gu33*PDstandard4th3g33); + G333 = khalf*(-(gu31*PDstandard4th1g33) - gu32*PDstandard4th2g33 + 2*gu31*PDstandard4th3g13 + + 2*gu32*PDstandard4th3g23 + gu33*PDstandard4th3g33); R11 = khalf*(-(gu22*PDstandard4th11g22) - 2*(G111*G122 + G111*G133 + G211*G222 + G211*G233 + G311*G322 + G311*G333 + - gu23*PDstandard4th11g32) - gu33*PDstandard4th11g33 + 2*gu22*PDstandard4th12g21 + 2*gu23*PDstandard4th12g31 + - 2*gu23*PDstandard4th13g21 + 2*gu33*PDstandard4th13g31 - gu22*PDstandard4th22g11 - 2*gu23*PDstandard4th23g11 - - gu33*PDstandard4th33g11 + 2*SQR(G121) + 2*SQR(G131) + 2*SQR(G221) + 2*SQR(G231) + 2*SQR(G321) + 2*SQR(G331)); - - R21 = khalf*(2*(G131*G132 + G231*G232 + G331*G332) - 2*(G121*G133 + G221*G233 + G321*G333 + gu12*PDstandard4th12g21) - - gu23*PDstandard4th12g32 - gu33*PDstandard4th12g33 + - gu13*(PDstandard4th11g32 - PDstandard4th12g31 - PDstandard4th13g21) + gu23*PDstandard4th13g22 + - gu33*PDstandard4th13g32 + gu12*(PDstandard4th11g22 + PDstandard4th22g11) + gu23*PDstandard4th22g31 + - gu13*PDstandard4th23g11 - gu23*PDstandard4th23g21 + gu33*PDstandard4th23g31 - gu33*PDstandard4th33g21); - - R31 = khalf*(2*(G121*G132 + G221*G232 + G321*G332) - 2*(G122*G131 + G222*G231 + G322*G331 + gu13*PDstandard4th13g31) + - gu12*(PDstandard4th11g32 - PDstandard4th12g31 - PDstandard4th13g21 + PDstandard4th23g11) + - gu22*(PDstandard4th12g32 - PDstandard4th13g22 - PDstandard4th22g31 + PDstandard4th23g21) + - gu13*(PDstandard4th11g33 + PDstandard4th33g11) + - gu23*(PDstandard4th12g33 - PDstandard4th13g32 - PDstandard4th23g31 + PDstandard4th33g21)); - - R22 = khalf*(-2*(G122*(G111 + G133) + G222*(G211 + G233) + G322*(G311 + G333) + gu13*PDstandard4th13g22) + - gu11*(-PDstandard4th11g22 + 2*PDstandard4th12g21 - PDstandard4th22g11) + - gu13*(-2*PDstandard4th22g31 + 2*(PDstandard4th12g32 + PDstandard4th23g21)) + - gu33*(-PDstandard4th22g33 + 2*PDstandard4th23g32 - PDstandard4th33g22) + - 2*(SQR(G121) + SQR(G132) + SQR(G221) + SQR(G232) + SQR(G321) + SQR(G332))); - - R32 = khalf*(2*(G121*G131 + G221*G231 + G321*G331) + - gu11*(-PDstandard4th11g32 + PDstandard4th12g31 + PDstandard4th13g21 - PDstandard4th23g11) + - gu12*(-PDstandard4th12g32 + PDstandard4th13g22 + PDstandard4th22g31 - PDstandard4th23g21) - - 2*(G111*G132 + G211*G232 + G311*G332 + gu23*PDstandard4th23g32) + - gu13*(PDstandard4th12g33 - PDstandard4th13g32 - PDstandard4th23g31 + PDstandard4th33g21) + - gu23*(PDstandard4th22g33 + PDstandard4th33g22)); - - R33 = khalf*(gu11*(-PDstandard4th11g33 + 2*PDstandard4th13g31 - PDstandard4th33g11) - + gu32*PDstandard4th11g23) - gu33*PDstandard4th11g33 + 2*gu22*PDstandard4th12g12 + 2*gu32*PDstandard4th12g13 + + 2*gu32*PDstandard4th13g12 + 2*gu33*PDstandard4th13g13 - gu22*PDstandard4th22g11 - 2*gu32*PDstandard4th23g11 - + gu33*PDstandard4th33g11 + 2*SQR(G112) + 2*SQR(G113) + 2*SQR(G212) + 2*SQR(G213) + 2*SQR(G312) + 2*SQR(G313)); + + R12 = khalf*(2*(G113*G123 + G213*G223 + G313*G323) - 2*(G112*G133 + G212*G233 + G312*G333 + gu21*PDstandard4th12g12) - + gu32*PDstandard4th12g23 - gu33*PDstandard4th12g33 + + gu31*(PDstandard4th11g23 - PDstandard4th12g13 - PDstandard4th13g12) + gu32*PDstandard4th13g22 + + gu33*PDstandard4th13g23 + gu21*(PDstandard4th11g22 + PDstandard4th22g11) + gu32*PDstandard4th22g13 + + gu31*PDstandard4th23g11 - gu32*PDstandard4th23g12 + gu33*PDstandard4th23g13 - gu33*PDstandard4th33g12); + + R13 = khalf*(2*(G112*G123 + G212*G223 + G312*G323) - 2*(G113*G122 + G213*G222 + G313*G322 + gu31*PDstandard4th13g13) + + gu21*(PDstandard4th11g23 - PDstandard4th12g13 - PDstandard4th13g12 + PDstandard4th23g11) + + gu22*(PDstandard4th12g23 - PDstandard4th13g22 - PDstandard4th22g13 + PDstandard4th23g12) + + gu31*(PDstandard4th11g33 + PDstandard4th33g11) + + gu32*(PDstandard4th12g33 - PDstandard4th13g23 - PDstandard4th23g13 + PDstandard4th33g12)); + + R22 = khalf*(-2*(G122*(G111 + G133) + G222*(G211 + G233) + G322*(G311 + G333) + gu31*PDstandard4th13g22) + + gu11*(-PDstandard4th11g22 + 2*PDstandard4th12g12 - PDstandard4th22g11) + + gu31*(-2*PDstandard4th22g13 + 2*(PDstandard4th12g23 + PDstandard4th23g12)) + + gu33*(-PDstandard4th22g33 + 2*PDstandard4th23g23 - PDstandard4th33g22) + + 2*(SQR(G112) + SQR(G123) + SQR(G212) + SQR(G223) + SQR(G312) + SQR(G323))); + + R23 = khalf*(2*(G112*G113 + G212*G213 + G312*G313) + + gu11*(-PDstandard4th11g23 + PDstandard4th12g13 + PDstandard4th13g12 - PDstandard4th23g11) + + gu21*(-PDstandard4th12g23 + PDstandard4th13g22 + PDstandard4th22g13 - PDstandard4th23g12) - + 2*(G111*G123 + G211*G223 + G311*G323 + gu32*PDstandard4th23g23) + + gu31*(PDstandard4th12g33 - PDstandard4th13g23 - PDstandard4th23g13 + PDstandard4th33g12) + + gu32*(PDstandard4th22g33 + PDstandard4th33g22)); + + R33 = khalf*(gu11*(-PDstandard4th11g33 + 2*PDstandard4th13g13 - PDstandard4th33g11) - 2*((G111 + G122)*G133 + (G211 + G222)*G233 + (G311 + G322)*G333 + - gu12*(PDstandard4th12g33 + PDstandard4th33g21)) + - gu22*(-PDstandard4th22g33 + 2*PDstandard4th23g32 - PDstandard4th33g22) + - 2*(gu12*(PDstandard4th13g32 + PDstandard4th23g31) + SQR(G131) + SQR(G132) + SQR(G231) + SQR(G232) + SQR(G331) + - SQR(G332))); + gu21*(PDstandard4th12g33 + PDstandard4th33g12)) + + gu22*(-PDstandard4th22g33 + 2*PDstandard4th23g23 - PDstandard4th33g22) + + 2*(gu21*(PDstandard4th13g23 + PDstandard4th23g13) + SQR(G113) + SQR(G123) + SQR(G213) + SQR(G223) + SQR(G313) + + SQR(G323))); - trR = gu11*R11 + gu22*R22 + 2*(gu12*R21 + gu13*R31 + gu23*R32) + gu33*R33; + trR = gu11*R11 + gu22*R22 + 2*(gu21*R12 + gu31*R13 + gu32*R23) + gu33*R33; - Km11 = gu11*K11L + gu12*K21L + gu13*K31L; + Km11 = gu11*K11L + gu21*K12L + gu31*K13L; - Km21 = gu12*K11L + gu22*K21L + gu23*K31L; + Km21 = gu21*K11L + gu22*K12L + gu32*K13L; - Km31 = gu13*K11L + gu23*K21L + gu33*K31L; + Km31 = gu31*K11L + gu32*K12L + gu33*K13L; - Km12 = gu11*K21L + gu12*K22L + gu13*K32L; + Km12 = gu11*K12L + gu21*K22L + gu31*K23L; - Km22 = gu12*K21L + gu22*K22L + gu23*K32L; + Km22 = gu21*K12L + gu22*K22L + gu32*K23L; - Km32 = gu13*K21L + gu23*K22L + gu33*K32L; + Km32 = gu31*K12L + gu32*K22L + gu33*K23L; - Km13 = gu11*K31L + gu12*K32L + gu13*K33L; + Km13 = gu11*K13L + gu21*K23L + gu31*K33L; - Km23 = gu12*K31L + gu22*K32L + gu23*K33L; + Km23 = gu21*K13L + gu22*K23L + gu32*K33L; - Km33 = gu13*K31L + gu23*K32L + gu33*K33L; + Km33 = gu31*K13L + gu32*K23L + gu33*K33L; trK = Km11 + Km22 + Km33; HL = -2*(Km12*Km21 + Km13*Km31 + Km23*Km32) + trR - SQR(Km11) - SQR(Km22) - SQR(Km33) + SQR(trK); - M1L = gu12*(-(G121*K11L) + G111*K21L - G221*K21L + G211*K22L - G321*K31L + G311*K32L - PDstandard4th1K21 + - PDstandard4th2K11) + gu22*(-(G122*K11L) + G121*K21L - G222*K21L + G221*K22L - G322*K31L + G321*K32L - - PDstandard4th1K22 + PDstandard4th2K21) + gu13* - (-(G131*K11L) - G231*K21L + G111*K31L - G331*K31L + G211*K32L + G311*K33L - PDstandard4th1K31 + PDstandard4th3K11)\ - + gu23*(G131*K21L + G231*K22L + G121*K31L + (G221 + G331)*K32L + G321*K33L - - 2*(G132*K11L + G232*K21L + G332*K31L + PDstandard4th1K32) + PDstandard4th2K31 + PDstandard4th3K21) + - gu33*(-(G133*K11L) - G233*K21L + G131*K31L - G333*K31L + G231*K32L + G331*K33L - PDstandard4th1K33 + - PDstandard4th3K31); - - M2L = gu11*(G121*K11L + (-G111 + G221)*K21L - G211*K22L + G321*K31L - G311*K32L + PDstandard4th1K21 - - PDstandard4th2K11) + gu12*(G122*K11L + (-G121 + G222)*K21L - G221*K22L + G322*K31L - G321*K32L + - PDstandard4th1K22 - PDstandard4th2K21) + gu13* - (G132*K11L + (-2*G131 + G232)*K21L + (G121 + G332)*K31L + G221*K32L + G321*K33L + PDstandard4th1K32 - - 2*(G231*K22L + G331*K32L + PDstandard4th2K31) + PDstandard4th3K21) + - gu23*(-(G132*K21L) - G232*K22L + G122*K31L + G222*K32L - G332*K32L + G322*K33L - PDstandard4th2K32 + - PDstandard4th3K22) + gu33*(-(G133*K21L) - G233*K22L + G132*K31L + G232*K32L - G333*K32L + G332*K33L - - PDstandard4th2K33 + PDstandard4th3K32); - - M3L = gu11*(G131*K11L + G231*K21L + (-G111 + G331)*K31L - G211*K32L - G311*K33L + PDstandard4th1K31 - - PDstandard4th3K11) + gu12*(G132*K11L + (G131 + G232)*K21L + G231*K22L + (-2*G121 + G332)*K31L + - (-2*G221 + G331)*K32L + PDstandard4th1K32 + PDstandard4th2K31 - 2*(G321*K33L + PDstandard4th3K21)) + - gu22*(G132*K21L + G232*K22L - G122*K31L - G222*K32L + G332*K32L - G322*K33L + PDstandard4th2K32 - - PDstandard4th3K22) + gu13*(G133*K11L + G233*K21L + (-G131 + G333)*K31L - G231*K32L - G331*K33L + - PDstandard4th1K33 - PDstandard4th3K31) + gu23* - (G133*K21L + G233*K22L - G132*K31L - G232*K32L + G333*K32L - G332*K33L + PDstandard4th2K33 - PDstandard4th3K32); + M1L = gu21*(-(G112*K11L) + G111*K12L - G212*K12L - G312*K13L + G211*K22L + G311*K23L - PDstandard4th1K12 + + PDstandard4th2K11) + gu22*(-(G122*K11L) + G112*K12L - G222*K12L - G322*K13L + G212*K22L + G312*K23L - + PDstandard4th1K22 + PDstandard4th2K12) + gu31* + (-(G113*K11L) - G213*K12L + G111*K13L - G313*K13L + G211*K23L + G311*K33L - PDstandard4th1K13 + PDstandard4th3K11)\ + + gu32*(G113*K12L + G112*K13L + G213*K22L + (G212 + G313)*K23L + G312*K33L - + 2*(G123*K11L + G223*K12L + G323*K13L + PDstandard4th1K23) + PDstandard4th2K13 + PDstandard4th3K12) + + gu33*(-(G133*K11L) - G233*K12L + G113*K13L - G333*K13L + G213*K23L + G313*K33L - PDstandard4th1K33 + + PDstandard4th3K13); + + M2L = gu11*(G112*K11L + (-G111 + G212)*K12L + G312*K13L - G211*K22L - G311*K23L + PDstandard4th1K12 - + PDstandard4th2K11) + gu21*(G122*K11L + (-G112 + G222)*K12L + G322*K13L - G212*K22L - G312*K23L + + PDstandard4th1K22 - PDstandard4th2K12) + gu31* + (G123*K11L + (-2*G113 + G223)*K12L + (G112 + G323)*K13L + G212*K23L + G312*K33L + PDstandard4th1K23 - + 2*(G213*K22L + G313*K23L + PDstandard4th2K13) + PDstandard4th3K12) + + gu32*(-(G123*K12L) + G122*K13L - G223*K22L + G222*K23L - G323*K23L + G322*K33L - PDstandard4th2K23 + + PDstandard4th3K22) + gu33*(-(G133*K12L) + G123*K13L - G233*K22L + G223*K23L - G333*K23L + G323*K33L - + PDstandard4th2K33 + PDstandard4th3K23); + + M3L = gu11*(G113*K11L + G213*K12L + (-G111 + G313)*K13L - G211*K23L - G311*K33L + PDstandard4th1K13 - + PDstandard4th3K11) + gu21*(G123*K11L + (G113 + G223)*K12L + (-2*G112 + G323)*K13L + G213*K22L + + (-2*G212 + G313)*K23L + PDstandard4th1K23 + PDstandard4th2K13 - 2*(G312*K33L + PDstandard4th3K12)) + + gu31*(G133*K11L + G233*K12L + (-G113 + G333)*K13L - G213*K23L - G313*K33L + PDstandard4th1K33 - + PDstandard4th3K13) + gu22*(G123*K12L - G122*K13L + G223*K22L - G222*K23L + G323*K23L - G322*K33L + + PDstandard4th2K23 - PDstandard4th3K22) + gu32* + (G133*K12L - G123*K13L + G233*K22L - G223*K23L + G333*K23L - G323*K33L + PDstandard4th2K33 - PDstandard4th3K23); /* Copy local copies back to grid functions */ diff --git a/ML_ADM/src/ML_ADM_convertFromADMBase.c b/ML_ADM/src/ML_ADM_convertFromADMBase.c index a634aeb..1288d06 100644 --- a/ML_ADM/src/ML_ADM_convertFromADMBase.c +++ b/ML_ADM/src/ML_ADM_convertFromADMBase.c @@ -102,14 +102,14 @@ void ML_ADM_convertFromADMBase_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CC CCTK_REAL betaxL = INITVALUE; CCTK_REAL betayL = INITVALUE; CCTK_REAL betazL = INITVALUE; - CCTK_REAL g11L = INITVALUE, g21L = INITVALUE, g22L = INITVALUE, g31L = INITVALUE, g32L = INITVALUE, g33L = INITVALUE; + CCTK_REAL g11L = INITVALUE, g12L = INITVALUE, g13L = INITVALUE, g22L = INITVALUE, g23L = INITVALUE, g33L = INITVALUE; CCTK_REAL gxxL = INITVALUE; CCTK_REAL gxyL = INITVALUE; CCTK_REAL gxzL = INITVALUE; CCTK_REAL gyyL = INITVALUE; CCTK_REAL gyzL = INITVALUE; CCTK_REAL gzzL = INITVALUE; - CCTK_REAL K11L = INITVALUE, K21L = INITVALUE, K22L = INITVALUE, K31L = INITVALUE, K32L = INITVALUE, K33L = INITVALUE; + CCTK_REAL K11L = INITVALUE, K12L = INITVALUE, K13L = INITVALUE, K22L = INITVALUE, K23L = INITVALUE, K33L = INITVALUE; CCTK_REAL kxxL = INITVALUE; CCTK_REAL kxyL = INITVALUE; CCTK_REAL kxzL = INITVALUE; @@ -149,25 +149,25 @@ void ML_ADM_convertFromADMBase_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CC /* Calculate temporaries and grid functions */ g11L = gxxL; - g21L = gxyL; + g12L = gxyL; - g31L = gxzL; + g13L = gxzL; g22L = gyyL; - g32L = gyzL; + g23L = gyzL; g33L = gzzL; K11L = kxxL; - K21L = kxyL; + K12L = kxyL; - K31L = kxzL; + K13L = kxzL; K22L = kyyL; - K32L = kyzL; + K23L = kyzL; K33L = kzzL; @@ -186,16 +186,16 @@ void ML_ADM_convertFromADMBase_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CC beta2[index] = beta2L; beta3[index] = beta3L; g11[index] = g11L; - g21[index] = g21L; + g12[index] = g12L; + g13[index] = g13L; g22[index] = g22L; - g31[index] = g31L; - g32[index] = g32L; + g23[index] = g23L; g33[index] = g33L; K11[index] = K11L; - K21[index] = K21L; + K12[index] = K12L; + K13[index] = K13L; K22[index] = K22L; - K31[index] = K31L; - K32[index] = K32L; + K23[index] = K23L; K33[index] = K33L; /* Copy local copies back to subblock grid functions */ diff --git a/ML_ADM/src/ML_ADM_convertToADMBase.c b/ML_ADM/src/ML_ADM_convertToADMBase.c index 5f010fb..87dc888 100644 --- a/ML_ADM/src/ML_ADM_convertToADMBase.c +++ b/ML_ADM/src/ML_ADM_convertToADMBase.c @@ -106,14 +106,14 @@ void ML_ADM_convertToADMBase_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK CCTK_REAL dtbetaxL = INITVALUE; CCTK_REAL dtbetayL = INITVALUE; CCTK_REAL dtbetazL = INITVALUE; - CCTK_REAL g11L = INITVALUE, g21L = INITVALUE, g22L = INITVALUE, g31L = INITVALUE, g32L = INITVALUE, g33L = INITVALUE; + CCTK_REAL g11L = INITVALUE, g12L = INITVALUE, g13L = INITVALUE, g22L = INITVALUE, g23L = INITVALUE, g33L = INITVALUE; CCTK_REAL gxxL = INITVALUE; CCTK_REAL gxyL = INITVALUE; CCTK_REAL gxzL = INITVALUE; CCTK_REAL gyyL = INITVALUE; CCTK_REAL gyzL = INITVALUE; CCTK_REAL gzzL = INITVALUE; - CCTK_REAL K11L = INITVALUE, K21L = INITVALUE, K22L = INITVALUE, K31L = INITVALUE, K32L = INITVALUE, K33L = INITVALUE; + CCTK_REAL K11L = INITVALUE, K12L = INITVALUE, K13L = INITVALUE, K22L = INITVALUE, K23L = INITVALUE, K33L = INITVALUE; CCTK_REAL kxxL = INITVALUE; CCTK_REAL kxyL = INITVALUE; CCTK_REAL kxzL = INITVALUE; @@ -130,16 +130,16 @@ void ML_ADM_convertToADMBase_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK beta2L = beta2[index]; beta3L = beta3[index]; g11L = g11[index]; - g21L = g21[index]; + g12L = g12[index]; + g13L = g13[index]; g22L = g22[index]; - g31L = g31[index]; - g32L = g32[index]; + g23L = g23[index]; g33L = g33[index]; K11L = K11[index]; - K21L = K21[index]; + K12L = K12[index]; + K13L = K13[index]; K22L = K22[index]; - K31L = K31[index]; - K32L = K32[index]; + K23L = K23[index]; K33L = K33[index]; /* Assign local copies of subblock grid functions */ @@ -153,25 +153,25 @@ void ML_ADM_convertToADMBase_Body(cGH *cctkGH, CCTK_INT dir, CCTK_INT face, CCTK /* Calculate temporaries and grid functions */ gxxL = g11L; - gxyL = g21L; + gxyL = g12L; - gxzL = g31L; + gxzL = g13L; gyyL = g22L; - gyzL = g32L; + gyzL = g23L; gzzL = g33L; kxxL = K11L; - kxyL = K21L; + kxyL = K12L; - kxzL = K31L; + kxzL = K13L; kyyL = K22L; - kyzL = K32L; + kyzL = K23L; kzzL = K33L; diff --git a/ML_ADM/src/RegisterMoL.c b/ML_ADM/src/RegisterMoL.c index a87e176..a22fb2d 100644 --- a/ML_ADM/src/RegisterMoL.c +++ b/ML_ADM/src/RegisterMoL.c @@ -16,17 +16,17 @@ void ML_ADM_RegisterVars(CCTK_ARGUMENTS) /* Register all the evolved grid functions with MoL */ ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::K11"), CCTK_VarIndex("ML_ADM::K11rhs")); - ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::K21"), CCTK_VarIndex("ML_ADM::K21rhs")); - ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::K31"), CCTK_VarIndex("ML_ADM::K31rhs")); + ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::K12"), CCTK_VarIndex("ML_ADM::K12rhs")); + ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::K13"), CCTK_VarIndex("ML_ADM::K13rhs")); ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::K22"), CCTK_VarIndex("ML_ADM::K22rhs")); - ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::K32"), CCTK_VarIndex("ML_ADM::K32rhs")); + ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::K23"), CCTK_VarIndex("ML_ADM::K23rhs")); ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::K33"), CCTK_VarIndex("ML_ADM::K33rhs")); ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::alpha"), CCTK_VarIndex("ML_ADM::alpharhs")); ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::g11"), CCTK_VarIndex("ML_ADM::g11rhs")); - ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::g21"), CCTK_VarIndex("ML_ADM::g21rhs")); - ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::g31"), CCTK_VarIndex("ML_ADM::g31rhs")); + ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::g12"), CCTK_VarIndex("ML_ADM::g12rhs")); + ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::g13"), CCTK_VarIndex("ML_ADM::g13rhs")); ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::g22"), CCTK_VarIndex("ML_ADM::g22rhs")); - ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::g32"), CCTK_VarIndex("ML_ADM::g32rhs")); + ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::g23"), CCTK_VarIndex("ML_ADM::g23rhs")); ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::g33"), CCTK_VarIndex("ML_ADM::g33rhs")); ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::beta1"), CCTK_VarIndex("ML_ADM::beta1rhs")); ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_ADM::beta2"), CCTK_VarIndex("ML_ADM::beta2rhs")); diff --git a/ML_ADM/src/RegisterSymmetries.c b/ML_ADM/src/RegisterSymmetries.c index 9a2e722..b610f81 100644 --- a/ML_ADM/src/RegisterSymmetries.c +++ b/ML_ADM/src/RegisterSymmetries.c @@ -27,12 +27,12 @@ void ML_ADM_RegisterSymmetries(CCTK_ARGUMENTS) sym[0] = -1; sym[1] = -1; sym[2] = 1; - SetCartSymVN(cctkGH, sym, "ML_ADM::K21"); + SetCartSymVN(cctkGH, sym, "ML_ADM::K12"); sym[0] = -1; sym[1] = 1; sym[2] = -1; - SetCartSymVN(cctkGH, sym, "ML_ADM::K31"); + SetCartSymVN(cctkGH, sym, "ML_ADM::K13"); sym[0] = 1; sym[1] = 1; @@ -42,7 +42,7 @@ void ML_ADM_RegisterSymmetries(CCTK_ARGUMENTS) sym[0] = 1; sym[1] = -1; sym[2] = -1; - SetCartSymVN(cctkGH, sym, "ML_ADM::K32"); + SetCartSymVN(cctkGH, sym, "ML_ADM::K23"); sym[0] = 1; sym[1] = 1; @@ -62,12 +62,12 @@ void ML_ADM_RegisterSymmetries(CCTK_ARGUMENTS) sym[0] = -1; sym[1] = -1; sym[2] = 1; - SetCartSymVN(cctkGH, sym, "ML_ADM::g21"); + SetCartSymVN(cctkGH, sym, "ML_ADM::g12"); sym[0] = -1; sym[1] = 1; sym[2] = -1; - SetCartSymVN(cctkGH, sym, "ML_ADM::g31"); + SetCartSymVN(cctkGH, sym, "ML_ADM::g13"); sym[0] = 1; sym[1] = 1; @@ -77,7 +77,7 @@ void ML_ADM_RegisterSymmetries(CCTK_ARGUMENTS) sym[0] = 1; sym[1] = -1; sym[2] = -1; - SetCartSymVN(cctkGH, sym, "ML_ADM::g32"); + SetCartSymVN(cctkGH, sym, "ML_ADM::g23"); sym[0] = 1; sym[1] = 1; |