Skip to content

Fix out-of-bounds error in IncfloVelFill when doing u_mac fillpatch #146

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
asalmgren merged 6 commits into from
Jun 3, 2025
Merged

Fix out-of-bounds error in IncfloVelFill when doing u_mac fillpatch #146

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1c9bb68
Fix out-of-bounds error in IncfloVelFill when doing u_mac fillpatch
cgilet May 29, 2025
af0f448
Get correct bc value when only doing one component (i.e. MAC vel)
cgilet Jun 2, 2025
375fbe3
Some probtypes change norm_vel and need to keep that.
cgilet Jun 2, 2025
0cd6512
Merge remote-tracking branch 'upstream/development' into fix_IncfloVe…
cgilet Jun 2, 2025
6f11561
If direction_dependent BC flows into domain, take the normal vel
cgilet Jun 3, 2025
d2d5ba7
Merge branch 'development' into fix_IncfloVelFill
asalmgren Jun 3, 2025
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
129 changes: 30 additions & 99 deletions src/prob/prob_bc.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,7 @@ struct IncfloVelFill
if (i < domain_box.smallEnd(0))
{
int dir = 0;
amrex::Real norm_vel = bcv_vel[amrex::Orientation(amrex::Direction::x,amrex::Orientation::low)][orig_comp+dir];

int td1 = (dir+1)%AMREX_SPACEDIM;
amrex::Real tang_vel1 = bcv_vel[amrex::Orientation(amrex::Direction::x,amrex::Orientation::low)][orig_comp+td1];

#if (AMREX_SPACEDIM == 3)
int td2 = (dir+2)%AMREX_SPACEDIM;
amrex::Real tang_vel2 = bcv_vel[amrex::Orientation(amrex::Direction::x,amrex::Orientation::low)][orig_comp+td2];
#endif
amrex::Real norm_vel = bcv_vel[amrex::Orientation(amrex::Direction::x,amrex::Orientation::low)][dir];

// This may modify the normal velocity for specific problems
if (42 == probtype)
Expand Down Expand Up @@ -93,19 +85,15 @@ struct IncfloVelFill
else if ( (bc.lo(dir) == amrex::BCType::ext_dir) ||
(bc.lo(dir) == amrex::BCType::direction_dependent && norm_vel >= 0.) )
{
if (nc == dir) {
if ( orig_comp+nc == dir ) {
vel(i,j,k,dcomp+nc) = norm_vel;
} else if (nc == td1) {
vel(i,j,k,dcomp+nc) = tang_vel1;
#if (AMREX_SPACEDIM == 3)
} else if (nc == td2) {
vel(i,j,k,dcomp+nc) = tang_vel2;
#endif
} else {
vel(i,j,k,dcomp+nc) = bcv_vel[amrex::Orientation(amrex::Direction::x,amrex::Orientation::low)][orig_comp+nc];
}
}
else if (bc.lo(dir) == amrex::BCType::direction_dependent && norm_vel < 0.)
{
vel(i,j,k,dcomp+nc) = vel(i+1,j,k,dcomp+nc);
vel(i,j,k,dcomp+nc) = vel(domain_box.smallEnd(0),j,k,dcomp+nc);
}
} // low i

Expand All @@ -115,15 +103,7 @@ struct IncfloVelFill
if (i > domain_box.bigEnd(0))
{
int dir = 0;
amrex::Real norm_vel = bcv_vel[amrex::Orientation(amrex::Direction::x,amrex::Orientation::high)][orig_comp+dir];

int td1 = (dir+1)%AMREX_SPACEDIM;
amrex::Real tang_vel1 = bcv_vel[amrex::Orientation(amrex::Direction::x,amrex::Orientation::high)][orig_comp+td1];

#if (AMREX_SPACEDIM == 3)
int td2 = (dir+2)%AMREX_SPACEDIM;
amrex::Real tang_vel2 = bcv_vel[amrex::Orientation(amrex::Direction::x,amrex::Orientation::high)][orig_comp+td2];
#endif
amrex::Real norm_vel = bcv_vel[amrex::Orientation(amrex::Direction::x,amrex::Orientation::high)][dir];

// This may modify the normal velocity for specific problems
if (42 == probtype)
Expand All @@ -147,41 +127,25 @@ struct IncfloVelFill
else if ( (bc.hi(dir) == amrex::BCType::ext_dir) ||
(bc.hi(dir) == amrex::BCType::direction_dependent && norm_vel <= 0.) )
{
if (nc == dir) {
if ( orig_comp+nc == dir ) {
vel(i,j,k,dcomp+nc) = norm_vel;
} else if (nc == td1) {
vel(i,j,k,dcomp+nc) = tang_vel1;
#if (AMREX_SPACEDIM == 3)
} else if (nc == td2) {
vel(i,j,k,dcomp+nc) = tang_vel2;
#endif
} else {
vel(i,j,k,dcomp+nc) = bcv_vel[amrex::Orientation(amrex::Direction::x,amrex::Orientation::high)][orig_comp+nc];
}
}
else if (bc.hi(dir) == amrex::BCType::direction_dependent && norm_vel > 0.)
{
vel(i,j,k,dcomp+nc) = vel(i-1,j,k,dcomp+nc);
vel(i,j,k,dcomp+nc) = vel(domain_box.bigEnd(0),j,k,dcomp+nc);
}

} // high i

{
}

// **********************************************************************************************
// LOW J
// **********************************************************************************************
if (j < domain_box.smallEnd(1))
{
int dir = 1;
amrex::Real norm_vel = bcv_vel[amrex::Orientation(amrex::Direction::y,amrex::Orientation::low)][orig_comp+dir];

int td1 = (dir+1)%AMREX_SPACEDIM;
amrex::Real tang_vel1 = bcv_vel[amrex::Orientation(amrex::Direction::y,amrex::Orientation::low)][orig_comp+td1];

#if (AMREX_SPACEDIM == 3)
int td2 = (dir+2)%AMREX_SPACEDIM;
amrex::Real tang_vel2 = bcv_vel[amrex::Orientation(amrex::Direction::y,amrex::Orientation::low)][orig_comp+td2];
#endif
amrex::Real norm_vel = bcv_vel[amrex::Orientation(amrex::Direction::y,amrex::Orientation::low)][dir];

// This may modify the normal velocity for specific problems
#if (AMREX_SPACEDIM == 3)
Expand All @@ -200,19 +164,15 @@ struct IncfloVelFill
if ( (bc.lo(dir) == amrex::BCType::ext_dir) ||
(bc.lo(dir) == amrex::BCType::direction_dependent && norm_vel >= 0.) )
{
if (nc == dir) {
if ( orig_comp+nc == dir ) {
vel(i,j,k,dcomp+nc) = norm_vel;
} else if (nc == td1) {
vel(i,j,k,dcomp+nc) = tang_vel1;
#if (AMREX_SPACEDIM == 3)
} else if (nc == td2) {
vel(i,j,k,dcomp+nc) = tang_vel2;
#endif
} else {
vel(i,j,k,dcomp+nc) = bcv_vel[amrex::Orientation(amrex::Direction::y,amrex::Orientation::low)][orig_comp+nc];
}
}
else if (bc.lo(dir) == amrex::BCType::direction_dependent && norm_vel < 0.)
{
vel(i,j,k,dcomp+nc) = vel(i,j+1,k,dcomp+nc);
vel(i,j,k,dcomp+nc) = vel(i,domain_box.smallEnd(1),k,dcomp+nc);
}
} // low j

Expand All @@ -222,15 +182,7 @@ struct IncfloVelFill
if (j > domain_box.bigEnd(1))
{
int dir = 1;
amrex::Real norm_vel = bcv_vel[amrex::Orientation(amrex::Direction::y,amrex::Orientation::high)][orig_comp+dir];

int td1 = (dir+1)%AMREX_SPACEDIM;
amrex::Real tang_vel1 = bcv_vel[amrex::Orientation(amrex::Direction::y,amrex::Orientation::high)][orig_comp+td1];

#if (AMREX_SPACEDIM == 3)
int td2 = (dir+2)%AMREX_SPACEDIM;
amrex::Real tang_vel2 = bcv_vel[amrex::Orientation(amrex::Direction::y,amrex::Orientation::high)][orig_comp+td2];
#endif
amrex::Real norm_vel = bcv_vel[amrex::Orientation(amrex::Direction::y,amrex::Orientation::high)][dir];

// This may modify the normal velocity for specific problems
if (16 == probtype)
Expand All @@ -253,19 +205,15 @@ struct IncfloVelFill
if ( (bc.hi(dir) == amrex::BCType::ext_dir) ||
(bc.hi(dir) == amrex::BCType::direction_dependent && norm_vel <= 0.) )
{
if (nc == dir) {
if ( orig_comp+nc == dir ) {
vel(i,j,k,dcomp+nc) = norm_vel;
} else if (nc == td1) {
vel(i,j,k,dcomp+nc) = tang_vel1;
#if (AMREX_SPACEDIM == 3)
} else if (nc == td2) {
vel(i,j,k,dcomp+nc) = tang_vel2;
#endif
} else {
vel(i,j,k,dcomp+nc) = bcv_vel[amrex::Orientation(amrex::Direction::y,amrex::Orientation::high)][orig_comp+nc];
}
}
else if (bc.hi(dir) == amrex::BCType::direction_dependent && norm_vel > 0.)
{
vel(i,j,k,dcomp+nc) = vel(i,j-1,k,dcomp+nc);
vel(i,j,k,dcomp+nc) = vel(i,domain_box.bigEnd(1),k,dcomp+nc);
}
} // not 1102
} // high j
Expand All @@ -277,13 +225,7 @@ struct IncfloVelFill
if (k < domain_box.smallEnd(2))
{
int dir = 2;
amrex::Real norm_vel = bcv_vel[amrex::Orientation(amrex::Direction::z,amrex::Orientation::low)][orig_comp+dir];

int td1 = (dir+1)%AMREX_SPACEDIM;
amrex::Real tang_vel1 = bcv_vel[amrex::Orientation(amrex::Direction::z,amrex::Orientation::low)][orig_comp+td1];

int td2 = (dir+2)%AMREX_SPACEDIM;
amrex::Real tang_vel2 = bcv_vel[amrex::Orientation(amrex::Direction::z,amrex::Orientation::low)][orig_comp+td2];
amrex::Real norm_vel = bcv_vel[amrex::Orientation(amrex::Direction::z,amrex::Orientation::low)][dir];

// This may modify the normal velocity for specific problems
if (33 == probtype)
Expand All @@ -300,19 +242,16 @@ struct IncfloVelFill
if ( (bc.lo(dir) == amrex::BCType::ext_dir) ||
(bc.lo(dir) == amrex::BCType::direction_dependent && norm_vel <= 0.) )
{
if (nc == dir) {
if ( orig_comp+nc == dir ) {
vel(i,j,k,dcomp+nc) = norm_vel;
} else if (nc == td1) {
vel(i,j,k,dcomp+nc) = tang_vel1;
} else if (nc == td2) {
vel(i,j,k,dcomp+nc) = tang_vel2;
} else {
vel(i,j,k,dcomp+nc) = bcv_vel[amrex::Orientation(amrex::Direction::z,amrex::Orientation::low)][orig_comp+nc];
}
}
else if (bc.lo(dir) == amrex::BCType::direction_dependent && norm_vel > 0.)
{
vel(i,j,k,dcomp+nc) = vel(i,j,k+1,dcomp+nc);
vel(i,j,k,dcomp+nc) = vel(i,j,domain_box.smallEnd(2),dcomp+nc);
}

} // low k

// **********************************************************************************************
Expand All @@ -321,28 +260,20 @@ struct IncfloVelFill
if (k > domain_box.bigEnd(2))
{
int dir = 2;
amrex::Real norm_vel = bcv_vel[amrex::Orientation(amrex::Direction::z,amrex::Orientation::high)][orig_comp+dir];

int td1 = (dir+1)%AMREX_SPACEDIM;
amrex::Real tang_vel1 = bcv_vel[amrex::Orientation(amrex::Direction::z,amrex::Orientation::high)][orig_comp+td1];

int td2 = (dir+2)%AMREX_SPACEDIM;
amrex::Real tang_vel2 = bcv_vel[amrex::Orientation(amrex::Direction::z,amrex::Orientation::high)][orig_comp+td2];
amrex::Real norm_vel = bcv_vel[amrex::Orientation(amrex::Direction::z,amrex::Orientation::high)][dir];

if ( (bc.hi(dir) == amrex::BCType::ext_dir) ||
(bc.hi(dir) == amrex::BCType::direction_dependent && norm_vel <= 0.) )
{
if (nc == dir) {
if ( orig_comp+nc == dir ) {
vel(i,j,k,dcomp+nc) = norm_vel;
} else if (nc == td1) {
vel(i,j,k,dcomp+nc) = tang_vel1;
} else if (nc == td2) {
vel(i,j,k,dcomp+nc) = tang_vel2;
} else {
vel(i,j,k,dcomp+nc) = bcv_vel[amrex::Orientation(amrex::Direction::z,amrex::Orientation::high)][orig_comp+nc];
}
}
else if (bc.hi(dir) == amrex::BCType::direction_dependent && norm_vel > 0.)
{
vel(i,j,k,dcomp+nc) = vel(i,j,k-1,dcomp+nc);
vel(i,j,k,dcomp+nc) = vel(i,j,domain_box.bigEnd(2),dcomp+nc);
}
} // high k
#endif // 3d
Expand Down