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

fix: update m_weights indexing in SurfaceElementStencil.hpp #3474

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix: update m_weights indexing in SurfaceElementStencil.hpp #3474

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a94c2e6
fix: update m_weight indexing in SurfaceElementStencil to enable it i…
liyangrock Dec 4, 2024
af34bfe
Merge branch 'develop' into bugfix/liyang/surface_stencil_m_weight
rrsettgast Dec 5, 2024
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
32 changes: 16 additions & 16 deletions src/coreComponents/finiteVolume/SurfaceElementStencil.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,8 @@ SurfaceElementStencilWrapper::
localIndex const esr1 = m_elementSubRegionIndices[iconn][k[1]];
localIndex const ei1 = m_elementIndices[iconn][k[1]];

real64 const t0 = m_weights[iconn][0] * coefficient[er0][esr0][ei0][0][0]; // this is a bit insane to access perm
real64 const t1 = m_weights[iconn][1] * coefficient[er1][esr1][ei1][0][0];
real64 const t0 = m_weights[iconn][k[0]] * coefficient[er0][esr0][ei0][0][0]; // this is a bit insane to access perm
real64 const t1 = m_weights[iconn][k[1]] * coefficient[er1][esr1][ei1][0][0];

real64 const harmonicWeight = t0*t1 / sumOfTrans;
real64 const arithmeticWeight = 0.25 * (t0+t1);
Expand All @@ -345,8 +345,8 @@ SurfaceElementStencilWrapper::
weight[connectionIndex][0] = value;
weight[connectionIndex][1] = -value;

real64 const dt0 = m_weights[iconn][0] * dCoeff_dVar[er0][esr0][ei0][0][0];
real64 const dt1 = m_weights[iconn][1] * dCoeff_dVar[er1][esr1][ei1][0][0];
real64 const dt0 = m_weights[iconn][k[0]] * dCoeff_dVar[er0][esr0][ei0][0][0];
real64 const dt1 = m_weights[iconn][k[1]] * dCoeff_dVar[er1][esr1][ei1][0][0];

real64 dHarmonic[2];
dHarmonic[0] = ( dt0 * t1 * sumOfTrans - dt0 * t0 * t1 ) / ( sumOfTrans * sumOfTrans );
Expand Down Expand Up @@ -384,8 +384,8 @@ SurfaceElementStencilWrapper::
{
for( k[1]=k[0]+1; k[1]<numPointsInFlux( iconn ); ++k[1] )
{
real64 const t0 = m_weights[iconn][0];
real64 const t1 = m_weights[iconn][1];
real64 const t0 = m_weights[iconn][k[0]];
real64 const t1 = m_weights[iconn][k[1]];

real64 const harmonicWeight = t0*t1 / sumOfTrans;
real64 const arithmeticWeight = 0.25 * (t0+t1);
Expand All @@ -395,8 +395,8 @@ SurfaceElementStencilWrapper::
weight[connectionIndex][0] = value;
weight[connectionIndex][1] = -value;

real64 const dt0 = m_weights[iconn][0];
real64 const dt1 = m_weights[iconn][1];
real64 const dt0 = m_weights[iconn][k[0]];
real64 const dt1 = m_weights[iconn][k[1]];

real64 dHarmonic[2];
dHarmonic[0] = ( dt0 * t1 * sumOfTrans - dt0 * t0 * t1 ) / ( sumOfTrans * sumOfTrans );
Expand Down Expand Up @@ -451,8 +451,8 @@ SurfaceElementStencilWrapper::
localIndex const esr1 = m_elementSubRegionIndices[iconn][k[1]];
localIndex const ei1 = m_elementIndices[iconn][k[1]];

real64 const t0 = m_weights[iconn][0] * coefficient[er0][esr0][ei0][0][0]; // this is a bit insane to access perm
real64 const t1 = m_weights[iconn][1] * coefficient[er1][esr1][ei1][0][0];
real64 const t0 = m_weights[iconn][k[0]] * coefficient[er0][esr0][ei0][0][0]; // this is a bit insane to access perm
real64 const t1 = m_weights[iconn][k[1]] * coefficient[er1][esr1][ei1][0][0];

real64 const harmonicWeight = t0*t1 / sumOfTrans;
real64 const arithmeticWeight = 0.25 * (t0+t1);
Expand All @@ -462,8 +462,8 @@ SurfaceElementStencilWrapper::
weight[connectionIndex][0] = value;
weight[connectionIndex][1] = -value;

real64 const dt0_dvar1 = m_weights[iconn][0] * dCoeff_dVar1[er0][esr0][ei0][0][0];
real64 const dt1_dvar1 = m_weights[iconn][1] * dCoeff_dVar1[er1][esr1][ei1][0][0];
real64 const dt0_dvar1 = m_weights[iconn][k[0]] * dCoeff_dVar1[er0][esr0][ei0][0][0];
real64 const dt1_dvar1 = m_weights[iconn][k[1]] * dCoeff_dVar1[er1][esr1][ei1][0][0];

real64 dHarmonic_dvar1[2];
dHarmonic_dvar1[0] = ( dt0_dvar1 * t1 * sumOfTrans - dt0_dvar1 * t0 * t1 ) / ( sumOfTrans * sumOfTrans );
Expand All @@ -476,8 +476,8 @@ SurfaceElementStencilWrapper::
dWeight_dVar1[connectionIndex][0] = m_meanPermCoefficient * dHarmonic_dvar1[0] + (1 - m_meanPermCoefficient) * dArithmetic_dvar1[0];
dWeight_dVar1[connectionIndex][1] = -( m_meanPermCoefficient * dHarmonic_dvar1[1] + (1 - m_meanPermCoefficient) * dArithmetic_dvar1[1] );

real64 const dt0_dvar2 = m_weights[iconn][0] * dCoeff_dVar2[er0][esr0][ei0][0][0][0];
real64 const dt1_dvar2 = m_weights[iconn][1] * dCoeff_dVar2[er1][esr1][ei1][0][0][0];
real64 const dt0_dvar2 = m_weights[iconn][k[0]] * dCoeff_dVar2[er0][esr0][ei0][0][0][0];
real64 const dt1_dvar2 = m_weights[iconn][k[1]] * dCoeff_dVar2[er1][esr1][ei1][0][0][0];

real64 dHarmonic_dvar2[2];
dHarmonic_dvar2[0] = ( dt0_dvar2 * t1 * sumOfTrans - dt0_dvar2 * t0 * t1 ) / ( sumOfTrans * sumOfTrans );
Expand Down Expand Up @@ -538,8 +538,8 @@ SurfaceElementStencilWrapper::
real64 const mult1 = ( LvArray::math::abs( LvArray::tensorOps::AiBi< 3 >( m_cellCenterToEdgeCenters[iconn][k[1]], gravityVector ) ) > MULTIPLIER_THRESHOLD )
? coefficientMultiplier[er1][esr1][ei1][0][1] : coefficientMultiplier[er1][esr1][ei1][0][0];

real64 const t0 = mult0 * m_weights[iconn][0] * coefficient[er0][esr0][ei0][0][0];
real64 const t1 = mult1 * m_weights[iconn][1] * coefficient[er1][esr1][ei1][0][0];
real64 const t0 = mult0 * m_weights[iconn][k[0]] * coefficient[er0][esr0][ei0][0][0];
real64 const t1 = mult1 * m_weights[iconn][k[1]] * coefficient[er1][esr1][ei1][0][0];

real64 const harmonicWeight = t0*t1 / sumOfTrans;
real64 const arithmeticWeight = 0.25 * (t0+t1);
Expand Down