Skip to content

OpenBC FFT Solver: Fix a 2d mode bug. #4671

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

Merged
merged 1 commit into from
Sep 23, 2025
Merged

OpenBC FFT Solver: Fix a 2d mode bug. #4671

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 10 additions & 18 deletions Src/FFT/AMReX_FFT_R2C.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,11 +491,7 @@ R2C<T,D,C>::R2C (Box const& domain, Info const& info)
#if (AMREX_SPACEDIM == 3)
if (m_info.domain_strategy == DomainStrategy::automatic) {
if (m_info.twod_mode) {
if (m_real_domain.length(2) < nprocs) {
m_info.domain_strategy = DomainStrategy::pencil;
} else {
m_info.domain_strategy = DomainStrategy::slab;
}
m_info.domain_strategy = DomainStrategy::slab;
} else {
int shortside = m_real_domain.shortside();
if (shortside < m_info.pencil_threshold*nprocs) {
Expand All @@ -505,19 +501,20 @@ R2C<T,D,C>::R2C (Box const& domain, Info const& info)
}
}
}
if (m_info.domain_strategy == DomainStrategy::slab && (m_real_domain.length(1) > 1)) {
if (m_info.twod_mode && m_real_domain.length(2) == 1) {
m_slab_decomp = false;
} else {
m_slab_decomp = true;
}

if (m_info.twod_mode) {
m_slab_decomp = true;
} else if (m_info.domain_strategy == DomainStrategy::slab && (m_real_domain.length(1) > 1)) {
m_slab_decomp = true;
}

#endif

auto const ncomp = m_info.batch_size;

auto bax = amrex::decompose(m_real_domain, nprocs,
{AMREX_D_DECL(false,!m_slab_decomp,true)}, true);
{AMREX_D_DECL(false,!m_slab_decomp,m_real_domain.length(2)>1)}, true);

DistributionMapping dmx = detail::make_iota_distromap(bax.size());
m_rx.define(bax, dmx, ncomp, 0, MFInfo().SetAlloc(false));

Expand All @@ -540,13 +537,8 @@ R2C<T,D,C>::R2C (Box const& domain, Info const& info)
//

#if (AMREX_SPACEDIM >= 2)
#if (AMREX_SPACEDIM == 2)
bool batch_on_y = false;
#else
bool batch_on_y = m_info.twod_mode && (m_real_domain.length(2) == 1);
#endif
DistributionMapping cdmy;
if ((m_real_domain.length(1) > 1) && !m_slab_decomp && !batch_on_y)
if ((m_real_domain.length(1) > 1) && !m_slab_decomp)
{
auto cbay = amrex::decompose(m_spectral_domain_y, nprocs,
{AMREX_D_DECL(false,true,true)}, true);
Expand Down
Loading