diff options
| author | jthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5> | 2002-07-18 20:00:09 +0000 |
|---|---|---|
| committer | jthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5> | 2002-07-18 20:00:09 +0000 |
| commit | f06e0f59ecdbfea59cd4b4a0c617a7c203059133 (patch) | |
| tree | 0857942700c73522f5c36d7863c665af0e7bf774 /src/gr | |
| parent | f6165749357e1a46fd09ac058c6f98e463ef2bdf (diff) | |
* metric + extrinsic curvature now live in ADMBase::
* print initial data regardless of how we compute it
* my convention has spin dimensionless, while MTW have it *mass
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@646 f88db872-0e4f-0410-b76b-b9085cfa78c5
Diffstat (limited to 'src/gr')
| -rw-r--r-- | src/gr/driver.cc | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/src/gr/driver.cc b/src/gr/driver.cc index 0783f43..546a488 100644 --- a/src/gr/driver.cc +++ b/src/gr/driver.cc @@ -122,18 +122,18 @@ cgi.gridfn_dims[2] = cctk_lsh[2]; // since we won't modify the 3-D gridfn data! But static_cast<...> // won't change const modifiers, so we just cast to fp* and let // the assignment take care of the const part... -cgi.g_dd_11_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH,0, "einstein::gxx")); -cgi.g_dd_12_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH,0, "einstein::gxy")); -cgi.g_dd_13_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH,0, "einstein::gxz")); -cgi.g_dd_22_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH,0, "einstein::gyy")); -cgi.g_dd_23_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH,0, "einstein::gyz")); -cgi.g_dd_33_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH,0, "einstein::gzz")); -cgi.K_dd_11_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH,0, "einstein::kxx")); -cgi.K_dd_12_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH,0, "einstein::kxy")); -cgi.K_dd_13_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH,0, "einstein::kxz")); -cgi.K_dd_22_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH,0, "einstein::kyy")); -cgi.K_dd_23_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH,0, "einstein::kyz")); -cgi.K_dd_33_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH,0, "einstein::kzz")); +cgi.g_dd_11_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH, 0, "ADMBase::gxx")); +cgi.g_dd_12_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH, 0, "ADMBase::gxy")); +cgi.g_dd_13_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH, 0, "ADMBase::gxz")); +cgi.g_dd_22_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH, 0, "ADMBase::gyy")); +cgi.g_dd_23_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH, 0, "ADMBase::gyz")); +cgi.g_dd_33_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH, 0, "ADMBase::gzz")); +cgi.K_dd_11_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH, 0, "ADMBase::kxx")); +cgi.K_dd_12_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH, 0, "ADMBase::kxy")); +cgi.K_dd_13_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH, 0, "ADMBase::kxz")); +cgi.K_dd_22_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH, 0, "ADMBase::kyy")); +cgi.K_dd_23_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH, 0, "ADMBase::kyz")); +cgi.K_dd_33_data = static_cast<fp*>(CCTK_VarDataPtr(cctkGH, 0, "ADMBase::kzz")); // @@ -169,21 +169,19 @@ else if (STRING_EQUAL(initial_guess_method, "ellipsoid")) initial_guess__ellipsoid__y_radius, initial_guess__ellipsoid__z_radius); else if (STRING_EQUAL(initial_guess_method, "Kerr/Kerr-Schild")) - then { - setup_Kerr_KerrSchild_horizon(ps, + then setup_Kerr_KerrSchild_horizon(ps, initial_guess__Kerr_KerrSchild__x_center, initial_guess__Kerr_KerrSchild__y_center, initial_guess__Kerr_KerrSchild__z_center, initial_guess__Kerr_KerrSchild__mass, initial_guess__Kerr_KerrSchild__spin); - ps.print_ghosted_gridfn_with_xyz(ghosted_gfns::gfn__h, - true, ghosted_gfns::gfn__h, - "h.dat", - false); // no ghost zones - } else CCTK_VWarn(-1, __LINE__, __FILE__, CCTK_THORNSTRING, "unknown initial_guess_method=\"%s\"!", initial_guess_method); /*NOTREACHED*/ +ps.print_ghosted_gridfn_with_xyz(ghosted_gfns::gfn__h, + true, ghosted_gfns::gfn__h, + "h.dat", + false); // no ghost zones // @@ -344,8 +342,8 @@ const fp r = (1.0 + sqrt(1.0 - spin*spin)) * mass; fp Kerr_x, Kerr_y, Kerr_z; p.xyz_of_r_rho_sigma(r,rho,sigma, Kerr_x,Kerr_y,Kerr_z); - const fp KS_x = Kerr_x - spin*sin(theta)*sin(phi); - const fp KS_y = Kerr_y + spin*sin(theta)*cos(phi); + const fp KS_x = Kerr_x - mass*spin*sin(theta)*sin(phi); + const fp KS_y = Kerr_y + mass*spin*sin(theta)*cos(phi); const fp KS_z = Kerr_z; p.ghosted_gridfn(ghosted_gfns::gfn__h,irho,isigma) = jtutil::hypot3(KS_x, KS_y, KS_z); |