From b9b9e355164930c0f72d7da302ab16b53f4d7d73 Mon Sep 17 00:00:00 2001 From: Ann Almgren Date: Sat, 31 Aug 2024 09:38:46 -0700 Subject: [PATCH 1/2] fix probtype 1102 --- src/prob/prob_bc.H | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/prob/prob_bc.H b/src/prob/prob_bc.H index 7fcd9380..68d43b87 100644 --- a/src/prob/prob_bc.H +++ b/src/prob/prob_bc.H @@ -239,8 +239,17 @@ struct IncfloVelFill norm_vel = 16.0 * (x*x*x*x - 2.0 * x*x*x + x*x); } - if ( (bc.hi(dir) == amrex::BCType::ext_dir) || - (bc.hi(dir) == amrex::BCType::direction_dependent && norm_vel <= 0.) ) +#if (AMREX_SPACEDIM == 3) + if (1102 == probtype && j > domain_box.bigEnd(1)) + { + int half_num_cells = domain_box.length(2) / 2; + if (k <= half_num_cells) { + vel(i,j,k,dcomp+nc) = -bcv_vel[amrex::Orientation(amrex::Direction::y,amrex::Orientation::high)][orig_comp+nc]; + } + } +#endif + else if ( (bc.hi(dir) == amrex::BCType::ext_dir) || + (bc.hi(dir) == amrex::BCType::direction_dependent && norm_vel <= 0.) ) { if (nc == dir) { vel(i,j,k,dcomp+nc) = norm_vel; From ef0899c92d5834b84244b972b601f18fdb850a20 Mon Sep 17 00:00:00 2001 From: Ann Almgren Date: Sat, 31 Aug 2024 09:52:52 -0700 Subject: [PATCH 2/2] make compiler happy --- src/prob/prob_bc.H | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src/prob/prob_bc.H b/src/prob/prob_bc.H index 68d43b87..74c4878e 100644 --- a/src/prob/prob_bc.H +++ b/src/prob/prob_bc.H @@ -240,7 +240,7 @@ struct IncfloVelFill } #if (AMREX_SPACEDIM == 3) - if (1102 == probtype && j > domain_box.bigEnd(1)) + if (1102 == probtype) { int half_num_cells = domain_box.length(2) / 2; if (k <= half_num_cells) { @@ -248,23 +248,26 @@ struct IncfloVelFill } } #endif - else if ( (bc.hi(dir) == amrex::BCType::ext_dir) || - (bc.hi(dir) == amrex::BCType::direction_dependent && norm_vel <= 0.) ) + if (1102 != probtype) { - if (nc == dir) { - vel(i,j,k,dcomp+nc) = norm_vel; - } else if (nc == td1) { - vel(i,j,k,dcomp+nc) = tang_vel1; + if ( (bc.hi(dir) == amrex::BCType::ext_dir) || + (bc.hi(dir) == amrex::BCType::direction_dependent && norm_vel <= 0.) ) + { + if (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; + } else if (nc == td2) { + vel(i,j,k,dcomp+nc) = tang_vel2; #endif + } } - } - 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); - } + 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); + } + } // not 1102 } // high j #if (AMREX_SPACEDIM == 3)