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.

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

Nodal hypre fix #1082

Merged
merged 22 commits into from
Jul 2, 2020
Merged
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6cbbab4
Fix logic for 3D interpolation of cell centroids to face centroids
asalmgren Apr 20, 2020
0f5815b
Merge branch 'development' into eb_centroid
asalmgren Apr 20, 2020
37bfcb0
Remove print statement that I left in by accident
asalmgren Apr 20, 2020
6fec6ff
Merge branch 'development' into eb_centroid
asalmgren Apr 22, 2020
98beb02
Don't use std::min on the gpu!
asalmgren Apr 22, 2020
dddc310
Merge branch 'development' of https://github.com/amrex-codes/amrex in…
asalmgren Apr 22, 2020
756fba2
Merge branch 'development' of https://github.com/amrex-codes/amrex in…
asalmgren Apr 26, 2020
6ae87aa
Merge branch 'development' of https://github.com/amrex-codes/amrex in…
asalmgren Apr 26, 2020
5526ce8
Merge branch 'development' of https://github.com/amrex-codes/amrex in…
asalmgren Apr 27, 2020
0091ec2
Merge branch 'development' of https://github.com/amrex-codes/amrex in…
asalmgren Apr 27, 2020
bccec4a
Merge branch 'development' of https://github.com/amrex-codes/amrex in…
asalmgren Apr 30, 2020
abe9357
When using hypre, limit number of possible multigrid levels by how mu…
asalmgren Jun 21, 2020
d4aa6a2
Merge branch 'development' of https://github.com/amrex-codes/amrex in…
asalmgren Jun 21, 2020
c606d2a
Merge branch 'development' of https://github.com/amrex-codes/amrex in…
asalmgren Jun 22, 2020
18b91c2
Merge branch 'development' of https://github.com/amrex-codes/amrex in…
asalmgren Jun 23, 2020
b2b384a
Merge branch 'development' of https://github.com/amrex-codes/amrex in…
asalmgren Jun 29, 2020
bb48641
Merge branch 'development' of https://github.com/amrex-codes/amrex in…
asalmgren Jun 30, 2020
ba1b047
Merge branch 'development' of https://github.com/amrex-codes/amrex in…
asalmgren Jul 1, 2020
53879cb
Merge branch 'development' of https://github.com/amrex-codes/amrex in…
asalmgren Jul 1, 2020
3716f93
Merge branch 'development' of https://github.com/amrex-codes/amrex in…
asalmgren Jul 1, 2020
2fd3a1e
Merge branch 'development' of https://github.com/amrex-codes/amrex in…
asalmgren Jul 2, 2020
d5a314d
Allow 2d nodal solver to use hypre at mglev > 0
asalmgren Jul 2, 2020
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
11 changes: 8 additions & 3 deletions Src/LinearSolvers/MLMG/AMReX_MLNodeLaplacian.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2552,13 +2552,17 @@ MLNodeLaplacian::fillIJMatrix (MFIter const& mfi, Array4<HypreNodeLap::Int const
Vector<HypreNodeLap::Int>& ncols, Vector<HypreNodeLap::Int>& rows,
Vector<HypreNodeLap::Int>& cols, Vector<Real>& mat) const
{
const int amrlev = 0;
const int mglev = m_num_mg_levels[amrlev]-1;

const Box& ndbx = mfi.validbox();
const auto lo = amrex::lbound(ndbx);
const auto hi = amrex::ubound(ndbx);

AMREX_ASSERT(m_coarsening_strategy == CoarseningStrategy::RAP);
AMREX_ALWAYS_ASSERT_WITH_MESSAGE((mglev == 0) || (m_coarsening_strategy == CoarseningStrategy::RAP),
"Coarsening strategy must be RAP to use hypre at mglev > 0");

const auto& sten = m_stencil[0][0]->array(mfi);
const auto& sten = m_stencil[amrlev][mglev]->array(mfi);

constexpr int k = 0;
for (int j = lo.y; j <= hi.y; ++j) {
Expand Down Expand Up @@ -2637,7 +2641,8 @@ MLNodeLaplacian::fillIJMatrix (MFIter const& mfi, Array4<HypreNodeLap::Int const
const auto lo = amrex::lbound(ndbx);
const auto hi = amrex::ubound(ndbx);

AMREX_ASSERT(m_coarsening_strategy == CoarseningStrategy::RAP);
AMREX_ALWAYS_ASSERT_WITH_MESSAGE((mglev == 0) || (m_coarsening_strategy == CoarseningStrategy::RAP),
"Coarsening strategy must be RAP to use hypre at mglev > 0");

const auto& sten = m_stencil[amrlev][mglev]->array(mfi);

Expand Down