diff options
Diffstat (limited to 'src/gr/Newton.cc')
| -rw-r--r-- | src/gr/Newton.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/gr/Newton.cc b/src/gr/Newton.cc index 4c2eb04..d82c752 100644 --- a/src/gr/Newton.cc +++ b/src/gr/Newton.cc @@ -33,7 +33,7 @@ using jtutil::error_exit; #include "../elliptic/Jacobian.hh" -#include "gfn.hh" +#include "gfns.hh" #include "AHFinderDirect.hh" //****************************************************************************** @@ -54,8 +54,8 @@ namespace { // bool Newton_solve(patch_system& ps, const struct cactus_grid_info& cgi, - const struct geometry_interpolator_info& gii, - const struct Jacobian_info& Jac_info, + const struct geometry_info& gi, + const struct Jacobian_info& Jacobian_info, const struct solver_info& solver_info, Jacobian& Jac) { @@ -67,7 +67,7 @@ bool Newton_solve(patch_system& ps, "Newton iteration %d", iteration); jtutil::norm<fp> H_norms; - horizon_function(ps, cgi, gii, true, &H_norms); + horizon_function(ps, cgi, gi, true, true, &H_norms); CCTK_VInfo(CCTK_THORNSTRING, " H rms-norm=%.2e, infinity-norm=%.2e", H_norms.rms_norm(), H_norms.infinity_norm()); @@ -81,11 +81,11 @@ bool Newton_solve(patch_system& ps, } // take a Newton step - horizon_Jacobian(ps, cgi, gii, Jac_info, Jac); + horizon_Jacobian(ps, cgi, gi, Jacobian_info, Jac); CCTK_VInfo(CCTK_THORNSTRING, "solving linear system for %d unknowns", Jac.NN()); - Jac.solve_linear_system(nominal_gfns::gfn__H, // rhs gridfn - nominal_gfns::gfn__Delta_h); // soln gridfn + Jac.solve_linear_system(gfns::gfn__H, // rhs gridfn + gfns::gfn__Delta_h); // soln gridfn CCTK_VInfo(CCTK_THORNSTRING, "done solving linear system"); jtutil::norm<fp> Delta_h_norms; @@ -99,11 +99,10 @@ bool Newton_solve(patch_system& ps, isigma <= p.max_isigma() ; ++isigma) { - const fp Delta_h = p.gridfn(nominal_gfns::gfn__Delta_h, - irho,isigma); + const fp Delta_h = p.gridfn(gfns::gfn__Delta_h, irho,isigma); Delta_h_norms.data(Delta_h); - p.ghosted_gridfn(ghosted_gfns::gfn__h, irho,isigma) -= Delta_h; + p.ghosted_gridfn(gfns::gfn__h, irho,isigma) -= Delta_h; } } } |