Skip to content

Commit 4ad6069

Browse files
AMLattanziAMLattanzi
authored
WPS tiled diffusion (#1008)
* Local FABs on each tile for diffusion. * AMReX submodule update. * Fix copy of s_ij to tau_ij without terrain.
1 parent e635ac1 commit 4ad6069

File tree

7 files changed

+149
-153
lines changed

7 files changed

+149
-153
lines changed

‎Source/Diffusion/ComputeStrain_N.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using namespace amrex;
44

55
void
6-
ComputeStrain_N(Box& bxcc, Box& tbxxy, Box& tbxxz, Box& tbxyz,
6+
ComputeStrain_N(Box bxcc, Box tbxxy, Box tbxxz, Box tbxyz,
77
const Array4<const Real>& u, const Array4<const Real>& v, const Array4<const Real>& w,
88
Array4<Real>& tau11, Array4<Real>& tau22, Array4<Real>& tau33,
99
Array4<Real>& tau12, Array4<Real>& tau13, Array4<Real>& tau23,

‎Source/Diffusion/ComputeStrain_T.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using namespace amrex;
55

66
void
7-
ComputeStrain_T(Box& bxcc, Box& tbxxy, Box& tbxxz, Box& tbxyz,
7+
ComputeStrain_T(Box bxcc, Box tbxxy, Box tbxxz, Box tbxyz,
88
const Array4<const Real>& u, const Array4<const Real>& v, const Array4<const Real>& w,
99
Array4<Real>& tau11, Array4<Real>& tau22, Array4<Real>& tau33,
1010
Array4<Real>& tau12, Array4<Real>& tau13,

‎Source/Diffusion/ComputeStress_N.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using namespace amrex;
44

55
void
6-
ComputeStressConsVisc_N(Box& bxcc, Box& tbxxy, Box& tbxxz, Box& tbxyz, Real mu_eff,
6+
ComputeStressConsVisc_N(Box bxcc, Box tbxxy, Box tbxxz, Box tbxyz, Real mu_eff,
77
Array4<Real>& tau11, Array4<Real>& tau22, Array4<Real>& tau33,
88
Array4<Real>& tau12, Array4<Real>& tau13, Array4<Real>& tau23,
99
const Array4<const Real>& er_arr)
@@ -34,7 +34,7 @@ ComputeStressConsVisc_N(Box& bxcc, Box& tbxxy, Box& tbxxz, Box& tbxyz, Real mu_e
3434

3535

3636
void
37-
ComputeStressVarVisc_N(Box& bxcc, Box& tbxxy, Box& tbxxz, Box& tbxyz, Real mu_eff,
37+
ComputeStressVarVisc_N(Box bxcc, Box tbxxy, Box tbxxz, Box tbxyz, Real mu_eff,
3838
const Array4<const Real>& mu_turb,
3939
Array4<Real>& tau11, Array4<Real>& tau22, Array4<Real>& tau33,
4040
Array4<Real>& tau12, Array4<Real>& tau13, Array4<Real>& tau23,

‎Source/Diffusion/ComputeStress_T.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using namespace amrex;
55

66
void
7-
ComputeStressConsVisc_T(Box& bxcc, Box& tbxxy, Box& tbxxz, Box& tbxyz, Real mu_eff,
7+
ComputeStressConsVisc_T(Box bxcc, Box tbxxy, Box tbxxz, Box tbxyz, Real mu_eff,
88
Array4<Real>& tau11, Array4<Real>& tau22, Array4<Real>& tau33,
99
Array4<Real>& tau12, Array4<Real>& tau13,
1010
Array4<Real>& tau21, Array4<Real>& tau23,
@@ -19,6 +19,7 @@ ComputeStressConsVisc_T(Box& bxcc, Box& tbxxy, Box& tbxxz, Box& tbxyz, Real mu_e
1919
// Boxes are copied here for extrapolations in the second block operations
2020
//***********************************************************************************
2121
Box bxcc2 = bxcc;
22+
bxcc2.grow(IntVect(-1,-1,0));
2223

2324
// First block: compute S-D
2425
//***********************************************************************************
@@ -227,7 +228,7 @@ ComputeStressConsVisc_T(Box& bxcc, Box& tbxxy, Box& tbxxz, Box& tbxyz, Real mu_e
227228

228229

229230
void
230-
ComputeStressVarVisc_T(Box& bxcc, Box& tbxxy, Box& tbxxz, Box& tbxyz, Real mu_eff,
231+
ComputeStressVarVisc_T(Box bxcc, Box tbxxy, Box tbxxz, Box tbxyz, Real mu_eff,
231232
const Array4<const Real>& mu_turb,
232233
Array4<Real>& tau11, Array4<Real>& tau22, Array4<Real>& tau33,
233234
Array4<Real>& tau12, Array4<Real>& tau13,

‎Source/Diffusion/Diffusion.H

+6-6
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ void DiffusionSrcForState_T (const amrex::Box& bx, const amrex::Box& domain, int
9898

9999

100100

101-
void ComputeStressConsVisc_N(amrex::Box& bxcc, amrex::Box& tbxxy, amrex::Box& tbxxz, amrex::Box& tbxyz, amrex::Real mu_eff,
101+
void ComputeStressConsVisc_N(amrex::Box bxcc, amrex::Box tbxxy, amrex::Box tbxxz, amrex::Box tbxyz, amrex::Real mu_eff,
102102
amrex::Array4<amrex::Real>& tau11, amrex::Array4<amrex::Real>& tau22, amrex::Array4<amrex::Real>& tau33,
103103
amrex::Array4<amrex::Real>& tau12, amrex::Array4<amrex::Real>& tau13, amrex::Array4<amrex::Real>& tau23,
104104
const amrex::Array4<const amrex::Real>& er_arr);
105105

106-
void ComputeStressConsVisc_T(amrex::Box& bxcc, amrex::Box& tbxxy, amrex::Box& tbxxz, amrex::Box& tbxyz, amrex::Real mu_eff,
106+
void ComputeStressConsVisc_T(amrex::Box bxcc, amrex::Box tbxxy, amrex::Box tbxxz, amrex::Box tbxyz, amrex::Real mu_eff,
107107
amrex::Array4<amrex::Real>& tau11, amrex::Array4<amrex::Real>& tau22, amrex::Array4<amrex::Real>& tau33,
108108
amrex::Array4<amrex::Real>& tau12, amrex::Array4<amrex::Real>& tau13,
109109
amrex::Array4<amrex::Real>& tau21, amrex::Array4<amrex::Real>& tau23,
@@ -114,13 +114,13 @@ void ComputeStressConsVisc_T(amrex::Box& bxcc, amrex::Box& tbxxy, amrex::Box& tb
114114

115115

116116

117-
void ComputeStressVarVisc_N(amrex::Box& bxcc, amrex::Box& tbxxy, amrex::Box& tbxxz, amrex::Box& tbxyz, amrex::Real mu_eff,
117+
void ComputeStressVarVisc_N(amrex::Box bxcc, amrex::Box tbxxy, amrex::Box tbxxz, amrex::Box tbxyz, amrex::Real mu_eff,
118118
const amrex::Array4<const amrex::Real>& mu_turb,
119119
amrex::Array4<amrex::Real>& tau11, amrex::Array4<amrex::Real>& tau22, amrex::Array4<amrex::Real>& tau33,
120120
amrex::Array4<amrex::Real>& tau12, amrex::Array4<amrex::Real>& tau13, amrex::Array4<amrex::Real>& tau23,
121121
const amrex::Array4<const amrex::Real>& er_arr);
122122

123-
void ComputeStressVarVisc_T(amrex::Box& bxcc, amrex::Box& tbxxy, amrex::Box& tbxxz, amrex::Box& tbxyz, amrex::Real mu_eff,
123+
void ComputeStressVarVisc_T(amrex::Box bxcc, amrex::Box tbxxy, amrex::Box tbxxz, amrex::Box tbxyz, amrex::Real mu_eff,
124124
const amrex::Array4<const amrex::Real>& mu_turb,
125125
amrex::Array4<amrex::Real>& tau11, amrex::Array4<amrex::Real>& tau22, amrex::Array4<amrex::Real>& tau33,
126126
amrex::Array4<amrex::Real>& tau12, amrex::Array4<amrex::Real>& tau13,
@@ -132,7 +132,7 @@ void ComputeStressVarVisc_T(amrex::Box& bxcc, amrex::Box& tbxxy, amrex::Box& tbx
132132

133133

134134

135-
void ComputeStrain_N(amrex::Box& bxcc, amrex::Box& tbxxy, amrex::Box& tbxxz, amrex::Box& tbxyz,
135+
void ComputeStrain_N(amrex::Box bxcc, amrex::Box tbxxy, amrex::Box tbxxz, amrex::Box tbxyz,
136136
const amrex::Array4<const amrex::Real>& u,
137137
const amrex::Array4<const amrex::Real>& v,
138138
const amrex::Array4<const amrex::Real>& w,
@@ -141,7 +141,7 @@ void ComputeStrain_N(amrex::Box& bxcc, amrex::Box& tbxxy, amrex::Box& tbxxz, amr
141141
const amrex::BCRec* bc_ptr, const amrex::GpuArray<amrex::Real, AMREX_SPACEDIM>& cellSizeInv,
142142
const amrex::Array4<const amrex::Real>& mf_m, const amrex::Array4<const amrex::Real>& mf_u, const amrex::Array4<const amrex::Real>& mf_v);
143143

144-
void ComputeStrain_T(amrex::Box& bxcc, amrex::Box& tbxxy, amrex::Box& tbxxz, amrex::Box& tbxyz,
144+
void ComputeStrain_T(amrex::Box bxcc, amrex::Box tbxxy, amrex::Box tbxxz, amrex::Box tbxyz,
145145
const amrex::Array4<const amrex::Real>& u,
146146
const amrex::Array4<const amrex::Real>& v,
147147
const amrex::Array4<const amrex::Real>& w,

0 commit comments

Comments
 (0)