Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Vectorization of RANS2P2D #1232

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Vectorization of RANS2P2D #1232

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e32dd55
Replaced initialization and obvious computation with STL algorithms
JohanMabille Sep 24, 2020
1fc615b
Use pyarray to compute data offset
JohanMabille Sep 28, 2020
b04f9c3
Code cleanup
JohanMabille Sep 29, 2020
6dbd9e2
Merge branch 'main' into RANS2P2D
cekees Jul 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Code cleanup
  • Loading branch information
@JohanMabille
JohanMabille committed Sep 29, 2020
commit b04f9c3634ec4d0e63a60ddf3dd2d96caa68a6cf
39 changes: 10 additions & 29 deletions proteus/mprans/RANS2P2D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1966,18 +1966,10 @@ namespace proteus
ck.gradTrialFromRef(&p_grad_trial_ref(k, 0, 0),jacInv,p_grad_trial);
ck_v.gradTrialFromRef(&vel_grad_trial_ref(k, 0, 0),jacInv,vel_grad_trial);

for (int i=0; i < nDOF_trial_element; i++)
{
p_trial[i] = p_trial_ref(k, i);
p_grad_trial_ib[i*nSpace + 0] = p_grad_trial[i*nSpace+0];
p_grad_trial_ib[i*nSpace + 1] = p_grad_trial[i*nSpace+1];
}
for (int i=0; i < nDOF_v_trial_element; i++)
{
vel_trial[i] = vel_trial_ref(k, i);
vel_grad_trial_ib[i*nSpace + 0] = vel_grad_trial[i*nSpace+0];
vel_grad_trial_ib[i*nSpace + 1] = vel_grad_trial[i*nSpace+1];
}
std::copy_n(p_trial_ref.data() + k*nDOF_trial_element, nDOF_trial_element, p_trial);
std::copy(std::begin(p_grad_trial), std::end(p_grad_trial), std::begin(p_grad_trial_ib));
std::copy_n(vel_trial_ref.data() + k*nDOF_v_trial_element, nDOF_v_trial_element, vel_trial);
std::copy(std::begin(vel_grad_trial), std::end(vel_grad_trial), std::begin(vel_grad_trial_ib));

if (icase == 0)
{
Expand Down Expand Up @@ -2836,7 +2828,6 @@ namespace proteus
//
for(int i=0;i<nDOF_test_element;i++)
{
register int eN_i=eN*nDOF_test_element+i;
elementResidual_p_save(eN, i) += elementResidual_p[i];
mesh_volume_conservation_element_weak += elementResidual_mesh[i];
if (!elementIsActive[eN])
Expand All @@ -2852,7 +2843,6 @@ namespace proteus
}
for(int i=0;i<nDOF_v_test_element;i++)
{
register int eN_i=eN*nDOF_v_test_element+i;
if (!elementIsActive[eN])
{
assert(elementResidual_u[i]==0.0);
Expand Down Expand Up @@ -3036,22 +3026,13 @@ namespace proteus
eN_nDOF_v_trial_element = eN*nDOF_v_trial_element;
if (boundaryFlags[ebN] < 1)
continue;
register double elementResidual_mesh[nDOF_test_element],
elementResidual_p[nDOF_test_element],
elementResidual_u[nDOF_v_test_element],
elementResidual_v[nDOF_v_test_element],
eps_rho,eps_mu;

auto elementResidual_mesh = detail::make_array<nDOF_test_element>(0.0);
auto elementResidual_p = detail::make_array<nDOF_test_element>(0.0);
auto elementResidual_u = detail::make_array<nDOF_v_test_element>(0.0);
auto elementResidual_v = detail::make_array<nDOF_v_test_element>(0.0);
register double eps_rho,eps_mu;
const double* elementResidual_w(NULL);
for (int i=0;i<nDOF_test_element;i++)
{
elementResidual_mesh[i]=0.0;
elementResidual_p[i]=0.0;
}
for (int i=0;i<nDOF_v_test_element;i++)
{
elementResidual_u[i]=0.0;
elementResidual_v[i]=0.0;
}
double element_phi[nDOF_mesh_trial_element], element_phi_s[nDOF_mesh_trial_element];
for (int j=0;j<nDOF_mesh_trial_element;j++)
{
Expand Down