From d074a649dbcaa9bf618c2f4ef0a6980a4f203781 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Mon, 19 Aug 2024 16:43:52 -0400 Subject: [PATCH] fix build --- Source/hydro/Castro_mol.cpp | 6 +++--- Source/hydro/ppm.H | 16 ++++++++-------- Source/hydro/trace_ppm.cpp | 6 ++---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Source/hydro/Castro_mol.cpp b/Source/hydro/Castro_mol.cpp index 7f8ec56896..adee235f93 100644 --- a/Source/hydro/Castro_mol.cpp +++ b/Source/hydro/Castro_mol.cpp @@ -163,9 +163,9 @@ Castro::mol_ppm_reconstruct(const Box& bx, const auto domhi = geom.Domain().hiVect3d(); const auto dx = geom.CellSizeArray(); - - bool lo_bc_test = lo_bc[idir] == Symmetry; - bool hi_bc_test = hi_bc[idir] == Symmetry; + + bool lo_bc_test = lo_bc[idir] == amrex::PhysBCType::symmetry; + bool hi_bc_test = hi_bc[idir] == amrex::PhysBCType::symmetry; bool is_axisymmetric = geom.Coord() == 1 ; diff --git a/Source/hydro/ppm.H b/Source/hydro/ppm.H index 688341c921..d34326ea6b 100644 --- a/Source/hydro/ppm.H +++ b/Source/hydro/ppm.H @@ -139,7 +139,7 @@ ppm_reconstruct(const Real* s, Real dsvl_l = 0.0_rt; if (dsl*dsr > 0.0_rt) { Real dsc = 0.5_rt * (s[i0] - s[im2]); - dsvl_l = std::copysign(1.0_rt, dsc) * amrex::min(std::abs(dsc),amrex::min(std::abs(dsl),std::abs(dsr))); + dsvl_l = std::copysign(1.0_rt, dsc) * amrex::min(std::abs(dsc), std::abs(dsl), std::abs(dsr)); } dsl = 2.0_rt * (s[i0] - s[im1]); @@ -148,7 +148,7 @@ ppm_reconstruct(const Real* s, Real dsvl_r = 0.0_rt; if (dsl*dsr > 0.0_rt) { Real dsc = 0.5_rt * (s[ip1] - s[im1]); - dsvl_r = std::copysign(1.0_rt, dsc) * amrex::min(std::abs(dsc),amrex::min(std::abs(dsl),std::abs(dsr))); + dsvl_r = std::copysign(1.0_rt, dsc) * amrex::min(std::abs(dsc), std::abs(dsl), std::abs(dsr)); } // Interpolate s to edges @@ -159,8 +159,8 @@ ppm_reconstruct(const Real* s, // Make sure sedge lies in between adjacent cell-centered values - sm = amrex::max(sm, amrex::min(s[i0], s[im1])); - sm = amrex::min(sm, amrex::max(s[i0], s[im1])); + sm = std::clamp(sm, std::min(s[i0], s[im1]), std::max(s[i0], s[im1])); + } // now we compute s_{i+1/2} -- the right interface value for zone i @@ -233,7 +233,7 @@ ppm_reconstruct(const Real* s, Real dsvl_l = 0.0_rt; if (dsl*dsr > 0.0_rt) { Real dsc = 0.5_rt * (s[ip1] - s[im1]); - dsvl_l = std::copysign(1.0_rt, dsc) * amrex::min(std::abs(dsc), amrex::min(std::abs(dsl),std::abs(dsr))); + dsvl_l = std::copysign(1.0_rt, dsc) * amrex::min(std::abs(dsc), std::abs(dsl), std::abs(dsr)); } dsl = 2.0_rt * (s[ip1] - s[i0]); @@ -242,7 +242,7 @@ ppm_reconstruct(const Real* s, Real dsvl_r = 0.0_rt; if (dsl*dsr > 0.0_rt) { Real dsc = 0.5_rt * (s[ip2] - s[i0]); - dsvl_r = std::copysign(1.0_rt, dsc) * amrex::min(std::abs(dsc), amrex::min(std::abs(dsl),std::abs(dsr))); + dsvl_r = std::copysign(1.0_rt, dsc) * amrex::min(std::abs(dsc), std::abs(dsl), std::abs(dsr)); } // Interpolate s to edges @@ -253,8 +253,8 @@ ppm_reconstruct(const Real* s, // Make sure sedge lies in between adjacent cell-centered values - sp = amrex::max(sp, amrex::min(s[ip1], s[i0])); - sp = amrex::min(sp, amrex::max(s[ip1], s[i0])); + sp = std::clamp(sp, std::min(s[ip1], s[i0]), std::max(s[ip1], s[i0])); + } // Flatten the parabola diff --git a/Source/hydro/trace_ppm.cpp b/Source/hydro/trace_ppm.cpp index 28c0f1d512..2407755a6f 100644 --- a/Source/hydro/trace_ppm.cpp +++ b/Source/hydro/trace_ppm.cpp @@ -152,8 +152,8 @@ Castro::trace_ppm(const Box& bx, const auto domlo = geom.Domain().loVect3d(); const auto domhi = geom.Domain().hiVect3d(); - bool lo_symm = lo_bc[idir] == Symmetry; - bool hi_symm = hi_bc[idir] == Symmetry; + bool lo_symm = lo_bc[idir] == amrex::PhysBCType::symmetry; + bool hi_symm = hi_bc[idir] == amrex::PhysBCType::symmetry; // Trace to left and right edges using upwind PPM @@ -651,5 +651,3 @@ Castro::trace_ppm(const Box& bx, }); } - -