update how we locate which cell the particle is in (#1382)

erf-model · Jan 16, 2024 · 0b43210 · 0b43210
1 parent b7512bc
commit 0b43210
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/Source/Particles/ERFPCEvolve.cpp b/Source/Particles/ERFPCEvolve.cpp
@@ -130,8 +130,10 @@ void ERFPC::AdvectWithFlow ( MultiFab* a_umac,
  iv[1] += domain.smallEnd()[1];
  ParticleReal zlo, zhi;
  if (use_terrain) {
- zlo = zheight(iv[0], iv[1], iv[2]);
- zhi = zheight(iv[0], iv[1], iv[2]+1);
+ zlo = Real(0.25) * (zheight(iv[0],iv[1] ,iv[2] ) + zheight(iv[0]+1,iv[1] ,iv[2] ) +
+ zheight(iv[0],iv[1]+1,iv[2] ) + zheight(iv[0]+1,iv[1]+1,iv[2] ));
+ zhi = Real(0.25) * (zheight(iv[0],iv[1] ,iv[2]+1) + zheight(iv[0]+1,iv[1] ,iv[2]+1) +
+ zheight(iv[0],iv[1]+1,iv[2]+1) + zheight(iv[0]+1,iv[1]+1,iv[2]+1));
  } else {
  zlo = iv[2] * dx[2];
  zhi = (iv[2]+1) * dx[2];
@@ -224,8 +226,10 @@ void ERFPC::AdvectWithGravity ( int a_lev,
  iv[1] += domain.smallEnd()[1];
  ParticleReal zlo, zhi;
  if (use_terrain) {
- zlo = zheight(iv[0], iv[1], iv[2]);
- zhi = zheight(iv[0], iv[1], iv[2]+1);
+ zlo = Real(0.25) * (zheight(iv[0],iv[1] ,iv[2] ) + zheight(iv[0]+1,iv[1] ,iv[2] ) +
+ zheight(iv[0],iv[1]+1,iv[2] ) + zheight(iv[0]+1,iv[1]+1,iv[2] ));
+ zhi = Real(0.25) * (zheight(iv[0],iv[1] ,iv[2]+1) + zheight(iv[0]+1,iv[1] ,iv[2]+1) +
+ zheight(iv[0],iv[1]+1,iv[2]+1) + zheight(iv[0]+1,iv[1]+1,iv[2]+1));
  } else {
  zlo = iv[2] * dx[2];
  zhi = (iv[2]+1) * dx[2];