Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

solve_cg: avoid use of MF z #3637

Merged
merged 18 commits into from
Nov 29, 2023
Merged

solve_cg: avoid use of MF z #3637

Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
41f4a99
Initial commit. Possible improvements to BiCGSTAB and CG algorithms a…
eebasso Aug 31, 2023
75a0587
Possible improvements to MLCGSolver
eebasso Sep 5, 2023
235bddc
Possible improvements to linear solver algorithms
eebasso Sep 5, 2023
d390b17
Merge branch 'development' of https://github.com/AMReX-Codes/amrex in…
eebasso Sep 21, 2023
ef3fd02
Merge branch 'development' of https://github.com/AMReX-Codes/amrex in…
eebasso Sep 21, 2023
06d6c83
Merge branch 'bicgstab' of github.com:eebasso/amrex into bicgstab
eebasso Oct 6, 2023
2cd04e3
Moved rho == 0 check in solve_cg
eebasso Oct 6, 2023
a079351
Remove commented code
eebasso Oct 6, 2023
c8e6d6d
Removed unused omega in solve_cg
eebasso Oct 9, 2023
a4017cf
More fixes
eebasso Oct 9, 2023
babd315
Merge branch 'development' of https://github.com/AMReX-Codes/amrex in…
eebasso Oct 16, 2023
7961129
More minor fixes
eebasso Oct 16, 2023
4d1a6f0
Merge branch 'development' into bicgstab
eebasso Oct 19, 2023
6eaddb1
Merge branch 'development' of https://github.com/AMReX-Codes/amrex in…
eebasso Nov 2, 2023
a3fc3e1
Avoid use of `z` MF in solve_cg
eebasso Nov 2, 2023
7f52cba
Fix typo
eebasso Nov 14, 2023
746feb4
Merge branch 'development' of https://github.com/AMReX-Codes/amrex in…
eebasso Nov 14, 2023
4fd0169
Merge branch 'development' of https://github.com/AMReX-Codes/amrex in…
eebasso Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions Src/LinearSolvers/MLMG/AMReX_MLCGSolver.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,6 @@ MLCGSolverT<MF>::solve_cg (MF& sol, const MF& rhs, RT eps_rel, RT eps_abs)

MF sorig = Lp.make(amrlev, mglev, nghost);
MF r = Lp.make(amrlev, mglev, nghost);
MF z = Lp.make(amrlev, mglev, nghost);
MF q = Lp.make(amrlev, mglev, nghost);

sorig.LocalCopy(sol,0,0,ncomp,nghost);
Expand Down Expand Up @@ -298,22 +297,20 @@ MLCGSolverT<MF>::solve_cg (MF& sol, const MF& rhs, RT eps_rel, RT eps_abs)

for (; iter <= maxiter; ++iter)
{
z.LocalCopy(r,0,0,ncomp,nghost);

RT rho = dotxy(z,r);
RT rho = dotxy(r,r);

if ( rho == 0 )
{
ret = 1; break;
}
if (iter == 1)
{
p.LocalCopy(z,0,0,ncomp,nghost);
p.LocalCopy(r,0,0,ncomp,nghost);
}
else
{
RT beta = rho/rho_1;
MF::Xpay(p, beta, z, 0, 0, ncomp, nghost); // p = z + beta * p
MF::Xpay(p, beta, r, 0, 0, ncomp, nghost); // p = r + beta * p
}
Lp.apply(amrlev, mglev, q, p, MLLinOpT<MF>::BCMode::Homogeneous, MLLinOpT<MF>::StateMode::Correction);

Expand Down