From c7397cf4d3de2e9e96b5e12de3e162a25d5964fd Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Wed, 2 Aug 2023 21:09:50 -0700 Subject: [PATCH] Fix a bug in EB tensor solver's cross term Found by clang-tidy misc-redundant-expression. --- Src/LinearSolvers/MLMG/AMReX_MLEBTensor_3D_K.H | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/LinearSolvers/MLMG/AMReX_MLEBTensor_3D_K.H b/Src/LinearSolvers/MLMG/AMReX_MLEBTensor_3D_K.H index 55586e26ce8..2113d38ed50 100644 --- a/Src/LinearSolvers/MLMG/AMReX_MLEBTensor_3D_K.H +++ b/Src/LinearSolvers/MLMG/AMReX_MLEBTensor_3D_K.H @@ -823,8 +823,8 @@ void mlebtensor_cross_terms (Box const& box, Array4 const& Ax, if (apz(i,j,k+1) > Real(0.0) && apz(i,j,k+1) < Real(1.0)) { int ii = i + (fcz(i,j,k+1,0) >= Real(0.0) ? 1 : -1); int jj = j + (fcz(i,j,k+1,1) >= Real(0.0) ? 1 : -1); - Real fracx = (ccm(ii,j,k) || ccm(ii,j,k)) ? std::abs(fcz(i,j,k+1,0)) : Real(0.0); - Real fracy = (ccm(i,jj,k) || ccm(i,jj,k)) ? std::abs(fcz(i,j,k+1,1)) : Real(0.0); + Real fracx = (ccm(ii,j,k) || ccm(ii,j,k+1)) ? std::abs(fcz(i,j,k+1,0)) : Real(0.0); + Real fracy = (ccm(i,jj,k) || ccm(i,jj,k+1)) ? std::abs(fcz(i,j,k+1,1)) : Real(0.0); fzp_0 = (Real(1.0)-fracx)*(Real(1.0)-fracy) * fzp_0 + fracx*(Real(1.0)-fracy) * fz(ii,j ,k+1,0) + fracy*(Real(1.0)-fracx) * fz(i ,jj,k+1,0)