Skip to content

Commit

Permalink
modify the class name and some typos
Browse files Browse the repository at this point in the history
  • Loading branch information
ShuoguoZhangTUM committed Aug 1, 2023
1 parent e2df0b8 commit 0fa1521
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ namespace SPH
namespace fluid_dynamics
{
//=================================================================================================//
FreeSurfaceWettingIndicationComplex::
FreeSurfaceWettingIndicationComplex(BaseInnerRelation &inner_relation,
NonWettingSurfaceIndication::
NonWettingSurfaceIndication(BaseInnerRelation &inner_relation,
BaseContactRelation &contact_relation, Real threshold, Real criterion)
: FreeSurfaceIndicationComplex(inner_relation, contact_relation, threshold), wetting_criterion(criterion)
{
Expand All @@ -17,9 +17,9 @@ FreeSurfaceWettingIndicationComplex::
}
}
//=================================================================================================//
FreeSurfaceWettingIndicationComplex::
FreeSurfaceWettingIndicationComplex(ComplexRelation &complex_relation, Real threshold, Real criterion)
: FreeSurfaceWettingIndicationComplex(complex_relation.getInnerRelation(),
NonWettingSurfaceIndication::
NonWettingSurfaceIndication(ComplexRelation &complex_relation, Real threshold, Real criterion)
: NonWettingSurfaceIndication(complex_relation.getInnerRelation(),
complex_relation.getContactRelation(), threshold, criterion) {}

//=================================================================================================//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,19 @@ namespace SPH
namespace fluid_dynamics
{
/**
* @class WettingCoupledFreeSurfaceIndicationComplex
* @brief indicate the interfacial fluid particles near the fluid-structure intersurface.
* @class NonWettingSurfaceIndication
* @brief Non wetting surface particles include free-surface ones and interfacial ones near the non-wetted structure.
* @brief Even the position divergence of interfacial fluid pariticles has satisfied with the threshold of spatial-temporal
identification approach to be identified as internal ones,they will remain as free-surface ones if without
any wetted neighboring solid particles.
*/
class FreeSurfaceWettingIndicationComplex : public FreeSurfaceIndicationComplex
class NonWettingSurfaceIndication : public FreeSurfaceIndicationComplex
{
public:
FreeSurfaceWettingIndicationComplex(BaseInnerRelation &inner_relation,
NonWettingSurfaceIndication(BaseInnerRelation &inner_relation,
BaseContactRelation &contact_relation, Real threshold = 0.75, Real criterion = 0.99);
explicit FreeSurfaceWettingIndicationComplex(ComplexRelation &complex_relation, Real threshold = 0.75, Real criterion = 0.99);
virtual ~FreeSurfaceWettingIndicationComplex(){};
explicit NonWettingSurfaceIndication(ComplexRelation &complex_relation, Real threshold = 0.75, Real criterion = 0.99);
virtual ~NonWettingSurfaceIndication(){};

inline void interaction(size_t index_i, Real dt = 0.0)
{
Expand Down Expand Up @@ -94,7 +97,7 @@ class FreeSurfaceWettingIndicationComplex : public FreeSurfaceIndicationComplex
};

using WettingCoupledSpatialTemporalFreeSurfaceIdentificationComplex =
SpatialTemporalFreeSurfaceIdentification<FreeSurfaceWettingIndicationComplex>;
SpatialTemporalFreeSurfaceIdentification<NonWettingSurfaceIndication>;
using SpatialTemporalFreeSurfaceIdentificationComplex =
SpatialTemporalFreeSurfaceIdentification<FreeSurfaceIndicationComplex>;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Real mu_f = 8.9e-7; /**< Water dynamics viscosity. */
//----------------------------------------------------------------------
// Wetting parameters
//----------------------------------------------------------------------
Real diffusion_coff = 330.578 * pow(particle_spacing_ref,2); /**< Wetting coeffecient. */
Real diffusion_coeff = 330.578 * pow(particle_spacing_ref,2); /**< Wetting coefficient. */
Real fluid_moisture = 1.0; /**< fluid moisture. */
Real cylinder_moisture = 0.0; /**< cylinder moisture. */
Real wall_moisture = 1.0; /**< wall moisture. */
Expand Down Expand Up @@ -166,7 +166,7 @@ class WettingCylinderBodyMaterial : public DiffusionReaction<Solid>
public:
WettingCylinderBodyMaterial() : DiffusionReaction<Solid>({"Phi"}, SharedPtr<NoReaction>(), rho0_s)
{
initializeAnDiffusion<IsotropicDiffusion>("Phi", "Phi",diffusion_coff);
initializeAnDiffusion<IsotropicDiffusion>("Phi", "Phi",diffusion_coeff);
};
};
using DiffusionCylinderParticles = DiffusionReactionParticles<SolidParticles, WettingCylinderBodyMaterial>;
Expand Down

0 comments on commit 0fa1521

Please sign in to comment.