Skip to content

Commit

Permalink
fixup: reuse model interfaces for stress
Browse files Browse the repository at this point in the history
  • Loading branch information
@streeve
streeve committed Jan 22, 2025
1 parent 1ce668c commit 6d13301
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 45 deletions.
51 changes: 22 additions & 29 deletions src/force/CabanaPD_Force_LPS.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,15 +268,13 @@ class Force<MemorySpace, ForceModel<LPS, Elastic, NoFracture>>
double rx, ry, rz;
getDistanceComponents( x, u, i, j, xi, r, s, rx, ry, rz );

const double coeff =
( model.theta_coeff *
( theta( i ) / m( i ) + theta( j ) / m( j ) ) +
model.s_coeff * s * ( 1.0 / m( i ) + 1.0 / m( j ) ) ) *
model.influence_function( xi ) * xi * vol( j ) * vol( j );
double coeff = model.forceCoeff( s, xi, vol( j ), m( i ), m( j ),
theta( i ), theta( j ) );
coeff *= vol( j );

double fx_i = coeff * rx / r;
double fy_i = coeff * ry / r;
double fz_i = coeff * rz / r;
const double fx_i = coeff * rx / r;
const double fy_i = coeff * ry / r;
const double fz_i = coeff * rz / r;

// Update stress tensor components
stress( i, 0, 0 ) += fx_i * rx;
Expand Down Expand Up @@ -576,18 +574,15 @@ class Force<MemorySpace, ForceModel<LPS, Elastic, Fracture>>
double rx, ry, rz;
getDistanceComponents( x, u, i, j, xi, r, s, rx, ry, rz );

const double coeff =
( model.theta_coeff *
( theta( i ) / m( i ) + theta( j ) / m( j ) ) +
model.s_coeff * s *
( 1.0 / m( i ) + 1.0 / m( j ) ) ) *
model.influence_function( xi ) * xi * vol( j ) *
vol( j );
double coeff =
model.forceCoeff( s, xi, vol( j ), m( i ), m( j ),
theta( i ), theta( j ) );
coeff *= vol( j );

double muij = mu( i, n );
double fx_i = muij * coeff * rx / r;
double fy_i = muij * coeff * ry / r;
double fz_i = muij * coeff * rz / r;
const double muij = mu( i, n );
const double fx_i = muij * coeff * rx / r;
const double fy_i = muij * coeff * ry / r;
const double fz_i = muij * coeff * rz / r;

// Update stress tensor components
stress( i, 0, 0 ) += fx_i * rx;
Expand Down Expand Up @@ -745,7 +740,7 @@ class Force<MemorySpace, ForceModel<LinearLPS, Elastic, NoFracture>>
const auto x = particles.sliceReferencePosition();
const auto u = particles.sliceDisplacement();
const auto vol = particles.sliceVolume();
const auto linear_theta = particles.sliceDilatation();
const auto theta = particles.sliceDilatation();
const auto m = particles.sliceWeightedVolume();
auto stress = particles.sliceStress();

Expand All @@ -757,15 +752,13 @@ class Force<MemorySpace, ForceModel<LinearLPS, Elastic, NoFracture>>
getLinearizedDistanceComponents( x, u, i, j, xi, linear_s, xi_x,
xi_y, xi_z );

const double coeff =
( model.theta_coeff * ( linear_theta( i ) / m( i ) +
linear_theta( j ) / m( j ) ) +
model.s_coeff * linear_s * ( 1.0 / m( i ) + 1.0 / m( j ) ) ) *
model.influence_function( xi ) * xi * vol( j ) * vol( j );

double fx_i = coeff * xi_x / xi;
double fy_i = coeff * xi_y / xi;
double fz_i = coeff * xi_z / xi;
double coeff = model.forceCoeff( linear_s, xi, vol( j ), m( i ),
m( j ), theta( i ), theta( j ) );
coeff *= vol( j );

const double fx_i = coeff * xi_x / xi;
const double fy_i = coeff * xi_y / xi;
const double fz_i = coeff * xi_z / xi;

// Update stress tensor components
stress( i, 0, 0 ) += fx_i * xi_x;
Expand Down
37 changes: 21 additions & 16 deletions src/force/CabanaPD_Force_PMB.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,11 @@ class Force<MemorySpace, ForceModel<PMB, Elastic, NoFracture, ModelParams...>>

model.thermalStretch( s, i, j );

const double coeff = 0.5 * model.c * s * vol( j ) * vol( j );
double fx_i = coeff * rx / r;
double fy_i = coeff * ry / r;
double fz_i = coeff * rz / r;
double coeff = model.forceCoeff( s, vol( j ) );
coeff *= 0.5 * vol( j );
const double fx_i = coeff * rx / r;
const double fy_i = coeff * ry / r;
const double fz_i = coeff * rz / r;

stress( i, 0, 0 ) += fx_i * rx;
stress( i, 1, 1 ) += fy_i * ry;
Expand Down Expand Up @@ -405,11 +406,12 @@ class Force<MemorySpace, ForceModel<PMB, Elastic, Fracture, ModelParams...>>

model.thermalStretch( s, i, j );

const double coeff =
mu( i, n ) * 0.5 * model.c * s * vol( j ) * vol( j );
double fx_i = coeff * rx / r;
double fy_i = coeff * ry / r;
double fz_i = coeff * rz / r;
double coeff = mu( i, n ) * model.forceCoeff( s, vol( j ) );
coeff *= 0.5 * vol( j );

const double fx_i = coeff * rx / r;
const double fy_i = coeff * ry / r;
const double fz_i = coeff * rz / r;

stress( i, 0, 0 ) += fx_i * rx;
stress( i, 1, 1 ) += fy_i * ry;
Expand Down Expand Up @@ -562,17 +564,20 @@ class Force<MemorySpace,
auto stress_full = KOKKOS_LAMBDA( const int i, const int j )
{
// Get the bond distance, displacement, and stretch
double xi, r, s;
double xi, r, linear_s;
double rx, ry, rz;
getLinearizedDistanceComponents( x, u, i, j, xi, r, s, rx, ry, rz );
getLinearizedDistanceComponents( x, u, i, j, xi, r, linear_s, rx,
ry, rz );

model.thermalStretch( s, i, j );
model.thermalStretch( linear_s, i, j );

// Linear PMB specific coefficient
const double coeff = 0.5 * model.c * s * vol( j ) * vol( j );
double fx_i = coeff * rx / r;
double fy_i = coeff * ry / r;
double fz_i = coeff * rz / r;
double coeff = 0.5 * model.forceCoeff( linear_s, vol( j ) );
coeff *= vol( j );

const double fx_i = coeff * rx / r;
const double fy_i = coeff * ry / r;
const double fz_i = coeff * rz / r;

// Update stress tensor components
stress( i, 0, 0 ) += fx_i * rx;
Expand Down

0 comments on commit 6d13301

Please sign in to comment.