replaced user_1 with new direction_dependent BCType in amrex

Exawind · Jun 6, 2024 · 676e7a0 · 676e7a0
1 parent d1667ae
commit 676e7a0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/amr-wind/boundary_conditions/BCInterface.cpp b/amr-wind/boundary_conditions/BCInterface.cpp
@@ -225,9 +225,9 @@ void BCVelocity::set_bcrec()
 
         case BC::mass_inflow_outflow:
             if (side == amrex::Orientation::low) {
-                set_bcrec_lo(dir, amrex::BCType::user_1);
+                set_bcrec_lo(dir, amrex::BCType::direction_dependent);
             } else {
-                set_bcrec_hi(dir, amrex::BCType::user_1);
+                set_bcrec_hi(dir, amrex::BCType::direction_dependent);
             }
             break;
 
@@ -326,9 +326,9 @@ void BCScalar::set_bcrec()
 
         case BC::mass_inflow_outflow:
             if (side == amrex::Orientation::low) {
-                set_bcrec_lo(dir, amrex::BCType::user_1);
+                set_bcrec_lo(dir, amrex::BCType::direction_dependent);
             } else {
-                set_bcrec_hi(dir, amrex::BCType::user_1);
+                set_bcrec_hi(dir, amrex::BCType::direction_dependent);
             }
             break;
 

diff --git a/amr-wind/convection/incflo_godunov_ppm.H b/amr-wind/convection/incflo_godunov_ppm.H
@@ -31,7 +31,7 @@ AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void Godunov_trans_xbc(
     // Low X
     if (i <= domlo) {
         if (bclo == BCType::ext_dir ||
-            (bclo == BCType::user_1 && velp >= 0.0)) {
+            (bclo == BCType::direction_dependent && velp >= 0.0)) {
             //Print() << "trans_xbc_domlo_extdir triggered at " << i << " " << j << " " << k << " " << n
             //        << "  as uedge is " << velp << std::endl;
             // IAMR does this but it breaks lo/hi symmetry
@@ -43,7 +43,7 @@ AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void Godunov_trans_xbc(
         } else if (
             bclo == BCType::foextrap || bclo == BCType::hoextrap ||
             bclo == BCType::reflect_even ||
-            (bclo == BCType::user_1 && velp < 0.0)) {
+            (bclo == BCType::direction_dependent && velp < 0.0)) {
             //Print() << "trans_xbc_domlo_foextrap triggered at " << i << " " << j << " " << k << " " << n
             //        << "  as uedge is " << velp << std::endl;
             lo = hi;
@@ -57,7 +57,7 @@ AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void Godunov_trans_xbc(
     // High X
     if (i > domhi) {
         if (bchi == BCType::ext_dir ||
-            (bchi == BCType::user_1 && velm <= 0.0)) {     // is this correct use of uedge here??
+            (bchi == BCType::direction_dependent && velm <= 0.0)) {     // is this correct use of uedge here??
             //Print() << "trans_xbc_domhi_extdir triggered at " << i << " " << j << " " << k << " " << n
             //        << "  as uedge is " << velm << std::endl;
             // IAMR does this but it breaks lo/hi symmetry
@@ -69,7 +69,7 @@ AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void Godunov_trans_xbc(
         } else if (
             bchi == BCType::foextrap || bchi == BCType::hoextrap ||
             bchi == BCType::reflect_even ||
-            (bchi == BCType::user_1 && velm > 0.0)) {
+            (bchi == BCType::direction_dependent && velm > 0.0)) {
             //Print() << "trans_xbc_domhi_foextrap triggered at " << i << " " << j << " " << k << " " << n
             //        << "  as uedge is " << velm << std::endl;
             hi = lo;
@@ -217,7 +217,7 @@ AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void Godunov_cc_xbc_lo(
 
     if (i == domlo) {
         if ((bclo == BCType::ext_dir && uedge(i, j, k) >= 0.) ||
-            (bclo == BCType::user_1 && uedge(i, j, k) >= 0.)) {
+            (bclo == BCType::direction_dependent && uedge(i, j, k) >= 0.)) {
             //Print() << "cc_xbc_lo_extdir triggered at " << i << " " << j << " " << k << " " << n
             //        << "  as uedge is " << uedge(i,j,k) << std::endl;
             hi = s(domlo - 1, j, k, n);
@@ -226,7 +226,7 @@ AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void Godunov_cc_xbc_lo(
             bclo == BCType::foextrap || bclo == BCType::hoextrap ||
             bclo == BCType::reflect_even ||
             (bclo == BCType::ext_dir && uedge(i, j, k) < 0) ||
-            (bclo == BCType::user_1 && uedge(i, j, k) < 0)) {
+            (bclo == BCType::direction_dependent && uedge(i, j, k) < 0)) {
             //Print() << "cc_xbc_lo_foextrap triggered at " << i << " " << j << " " << k << " " << n
             //        << "  as uedge is " << uedge(i,j,k) << std::endl;
             lo = hi;
@@ -256,7 +256,7 @@ AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void Godunov_cc_xbc_hi(
 
     if (i == domhi + 1) {
         if ((bchi == BCType::ext_dir && uedge(i, j, k) <= 0.) ||
-            (bchi == BCType::user_1 && uedge(i, j, k) <= 0.)) {
+            (bchi == BCType::direction_dependent && uedge(i, j, k) <= 0.)) {
             //Print() << "cc_xbc_hi_extdir triggered at " << i << " " << j << " " << k << " " << n
             //        << "  as uedge is " << uedge(i,j,k) << std::endl;
             lo = s(domhi + 1, j, k, n);
@@ -265,7 +265,7 @@ AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void Godunov_cc_xbc_hi(
             bchi == BCType::foextrap || bchi == BCType::hoextrap ||
             bchi == BCType::reflect_even ||
             (bchi == BCType::ext_dir && uedge(i, j, k) > 0) ||
-            (bchi == BCType::user_1 && uedge(i, j, k) > 0)) {
+            (bchi == BCType::direction_dependent && uedge(i, j, k) > 0)) {
             //Print() << "cc_xbc_hi_foextrap triggered at " << i << " " << j << " " << k << " " << n
             //        << "  as uedge is " << uedge(i,j,k) << std::endl;
             hi = lo;

diff --git a/amr-wind/convection/incflo_godunov_weno.H b/amr-wind/convection/incflo_godunov_weno.H
@@ -72,7 +72,7 @@ AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void Godunov_weno_xbc(
     using namespace amrex;
 
     if (bclo == BCType::ext_dir || bclo == BCType::hoextrap
-     || (bclo == BCType::user_1 && velm >= 0.0)) {
+     || (bclo == BCType::direction_dependent && velm >= 0.0)) {
         if (i == domlo) {
             //Print() << "weno_xbc_domlo_extdir   triggered at " << i << " " << j << " " << k << " " << n
             //        << "  as velm is " << velm << std::endl;
@@ -92,7 +92,7 @@ AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void Godunov_weno_xbc(
     }
 
     if (bchi == BCType::ext_dir || bchi == BCType::hoextrap
-     || (bchi == BCType::user_1 && velp <= 0.0)) {
+     || (bchi == BCType::direction_dependent && velp <= 0.0)) {
         if (i == domhi) {
             //Print() << "weno_xbc_domhi_extdir   triggered at " << i << " " << j << " " << k << " " << n
             //        << "  as velp is " << velp << std::endl;
@@ -132,7 +132,7 @@ AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void Godunov_weno_ybc(
     using namespace amrex;
 
     if (bclo == BCType::ext_dir || bclo == BCType::hoextrap
-     || (bclo == BCType::user_1 && velm >= 0.0)) {
+     || (bclo == BCType::direction_dependent && velm >= 0.0)) {
         if (j == domlo) {
             sp = -0.2 * s(i, domlo - 1, k, n) + 0.75 * s(i, domlo, k, n) +
                  0.5 * s(i, domlo + 1, k, n) - 0.05 * s(i, domlo + 2, k, n);
@@ -149,7 +149,7 @@ AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void Godunov_weno_ybc(
     }
 
     if (bchi == BCType::ext_dir || bchi == BCType::hoextrap
-     || (bchi == BCType::user_1 && velp <= 0.0)) {
+     || (bchi == BCType::direction_dependent && velp <= 0.0)) {
         if (j == domhi) {
             sm = -0.2 * s(i, domhi + 1, k, n) + 0.75 * s(i, domhi, k, n) +
                  0.5 * s(i, domhi - 1, k, n) - 0.05 * s(i, domhi - 2, k, n);
@@ -186,7 +186,7 @@ AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void Godunov_weno_zbc(
     using namespace amrex;
 
     if (bclo == BCType::ext_dir || bclo == BCType::hoextrap
-     || (bclo == BCType::user_1 && velm >= 0.0)) {
+     || (bclo == BCType::direction_dependent && velm >= 0.0)) {
         if (k == domlo) {
             sp = -0.2 * s(i, j, domlo - 1, n) + 0.75 * s(i, j, domlo, n) +
                  0.5 * s(i, j, domlo + 1, n) - 0.05 * s(i, j, domlo + 2, n);
@@ -203,7 +203,7 @@ AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void Godunov_weno_zbc(
     }
 
     if (bchi == BCType::ext_dir || bchi == BCType::hoextrap
-     || (bchi == BCType::user_1 && velp <= 0.0)) {
+     || (bchi == BCType::direction_dependent && velp <= 0.0)) {
         if (k == domhi) {
             sm = -0.2 * s(i, j, domhi + 1, n) + 0.75 * s(i, j, domhi, n) +
                  0.5 * s(i, j, domhi - 1, n) - 0.05 * s(i, j, domhi - 2, n);

diff --git a/amr-wind/core/FieldBCOps.H b/amr-wind/core/FieldBCOps.H
@@ -165,7 +165,7 @@ struct DirichletOp
                 // Check if this boundary is a dirichlet or mixed type
                 const auto bctyp = (ori.isLow() ? bc.lo(idir) : bc.hi(idir));
                 if ((bctyp != amrex::BCType::ext_dir)
-                 && (bctyp != amrex::BCType::user_1)) {
+                 && (bctyp != amrex::BCType::direction_dependent)) {
                     continue;
                 }