Geometry folder is finalized

This commit is contained in:
Hamidreza Norouzi
2024-03-20 00:50:58 -07:00
parent df8bea213d
commit acfaacfe4a
7 changed files with 235 additions and 422 deletions

View File

@ -54,10 +54,14 @@ private:
const property& wallProperty_;
/// The name of motion component of each wall surface
wordField_H motionComponentName_;
wordField_H motionComponentName_{
"motionComponentName",
"motionComponentName"};
/// Material name of each wall surface
wordField_H materialName_;
wordField_H materialName_{
"materialName",
"materialName"};
/// Property id of each triangle in the set of wall surfaces
uint32TriSurfaceField_D propertyId_;
@ -81,12 +85,8 @@ private:
bool createPropertyId();
/// Initialize contact force to zero
/*void zeroForce()
{
contactForceWall_.fill(zero3);
}*/
void zeroForce();
public:
/// Type info
@ -122,10 +122,10 @@ public:
const wordVector& propName);*/
/// Destructor
virtual ~geometry() = default;
~geometry()override = default;
/// Virtual constructor
/*create_vCtor
create_vCtor
(
geometry,
systemControl,
@ -134,7 +134,7 @@ public:
const property& prop
),
(control, prop)
);*/
);
/// Virtual constructor
create_vCtor
@ -152,48 +152,6 @@ public:
);
//- Methods
/// Number of triangles in the set of surface walls
inline
auto numTriangles()const
{
return size();
}
/// Access to the points
/*inline
const auto& points()const
{
return triSurface_.points();
}*/
/// Access to the vertices
/*inline
const auto& vertices()const
{
return triSurface_.vertices();
}*/
/// Obtain an object for accessing triangles
/*inline auto getTriangleAccessor()const
{
return triSurface_.getTriangleAccessor();
}*/
/// Surface
inline
auto& surface()
{
return static_cast<multiTriSurface&>(*this);
}
/// Surface
inline
const auto& surface()const
{
return static_cast<const multiTriSurface&>(*this);
}
inline
const auto& motionComponentName()const
{
@ -201,91 +159,54 @@ public:
}
/// Access to contact force
/*inline
realx3TriSurfaceField_D& contactForceWall()
inline
auto& contactForceWall()
{
return contactForceWall_;
}
/// Access to contact force
inline
const realx3TriSurfaceField_D& contactForceWall() const
const auto& contactForceWall() const
{
return contactForceWall_;
}
/// Property ide of triangles
inline
const auto& propertyId()const
{
return propertyId_;
}
/// Access to property
inline const auto& wallProperty()const
{
return wallProperty_;
}*/
/// Owner repository
/*inline
const repository& owner()const
{
return geometryRepository_;
}*/
/// Owner repository
/*inline
repository& owner()
{
return geometryRepository_;
}*/
/// Path to the repository folder
/*inline auto path()
{
return owner().path();
}*/
}
/// The name of motion model
/*virtual
word motionModelTypeName()const = 0;*/
virtual
word motionModelTypeName()const = 0;
/// Motion model index of triangles
/*virtual
const int8Vector_HD& triMotionIndex() const =0;
virtual
const uint32Field_D& triMotionIndex() const =0;
/// Motion model index of points
virtual
const int8Vector_HD& pointMotionIndex()const = 0;
/// Property ide of triangles
const int8TriSurfaceField_D& propertyId() const
{
return propertyId_;
}*/
/// Operations before each iteration
//bool beforeIteration() override;
/// Operations after each iteration
//bool afterIteration() override;
const uint32Field_D& pointMotionIndex()const = 0;
bool beforeIteration() override
{
notImplementedFunction;
return true;
}
bool beforeIteration() override;
/// This is called in time loop. Perform the main calculations
/// when the component should evolve along time.
bool iterate() override
{
notImplementedFunction;
return true;
}
bool iterate() override;
/// This is called in time loop, after iterate.
bool afterIteration() override
{
notImplementedFunction;
return true;
}
bool afterIteration() override;
//- IO
bool read(iIstream& is, const IOPattern& iop) override;
@ -297,8 +218,10 @@ public:
//- Static members
/*static
uniquePtr<geometry> create(systemControl& control, const property& prop);*/
static
uniquePtr<geometry> create(
systemControl& control,
const property& prop);
static
uniquePtr<geometry> create(