xfygogo/phasicFlow
1
0
Fork 0
mirror of https://github.com/PhasicFlow/phasicFlow.git synced 2025-06-22 16:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor up to particles.hpp

Browse Source
This commit is contained in:
Hamidreza Norouzi
2024-01-21 13:26:23 -08:00
parent 46bf08fa91
commit 9c86fe8f31
38 changed files with 868 additions and 855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

217
src/Particles/particles/particles.hpp
View File

@ -23,66 +23,75 @@ Licence:
#define __particles_hpp__
#include "dynamicPointStructure.hpp"
#include "particleIdHandler.hpp"
#include "demParticles.hpp"
#include "demComponent.hpp"
namespace pFlow
{
class setFieldList;
class particles
:
public eventObserver,
public demParticles
public observer,
public demComponent
{
protected:
private:
// owner repository
Time& time_;
const word integrationMethod_;
// dynamic point structure for particles
/// dynamic point structure for particles center mass
dynamicPointStructure dynPointStruct_;
// - name of shapes - this is managed by particles
wordPointField& shapeName_;
//wordPointField& shapeName_;
// id of particles on host
int32PointField_HD& id_;
int32PointField_D id_;
// property id on device
int8PointField_D& propertyId_;
int8PointField_D propertyId_;
// diameter / boundig sphere size of particles on device
realPointField_D& diameter_;
realPointField_D diameter_;
// mass on device
realPointField_D& mass_;
// mass of particles field
realPointField_D mass_;
// - acceleration on device
realx3PointField_D& accelertion_;
realx3PointField_D accelertion_;
/// contact force field
realx3PointField_D contactForce_;
realx3PointField_D& contactForce_;
realx3PointField_D& contactTorque_;
/// contact torque field
realx3PointField_D contactTorque_;
// - object handling particle id
particleIdHandler idHandler_;
virtual uniquePtr<List<eventObserver*>> getFieldObjectList()const;
void zeroForce()
{
contactForce_.fill(zero3);
WARNING<<"fill contactTorque"<<END_WARNING;
//contactForce_.fill(zero3);
}
void zeroTorque()
{
contactTorque_.fill(zero3);
WARNING<<"fill contactTorque"<<END_WARNING;
//contactTorque_.fill(zero3);
}
protected:
inline auto& dynPointStruct()
{
return dynPointStruct_;
}
inline auto& pointPosition()
{
return dynPointStruct_.pointPosition();
}
inline
auto& velocity()
{
return dynPointStruct_.velocity();
}
public:
@ -90,166 +99,132 @@ public:
// type info
TypeInfo("particles");
particles(systemControl& control, const word& integrationMethod);
explicit particles(systemControl& control);
inline const auto& time()const {
return time_;
}
inline auto& time() {
return time_;
}
inline auto integrationMethod()const
{
return integrationMethod_;
}
inline const auto& dynPointStruct()const
{
return dynPointStruct_;
}
inline auto& dynPointStruct()
{
return dynPointStruct_;
}
inline const auto& pStruct()const{
return dynPointStruct_.pStruct();
}
inline auto& pStruct(){
return dynPointStruct_.pStruct();
}
}
inline auto size()const{
return pStruct().size();
return dynPointStruct_.size();
}
inline auto capacity() const{
return pStruct().capacity();
}
inline auto activePointsMaskD()const{
return pStruct().activePointsMaskD();
}
inline auto numActive()const
{
return pStruct().numActive();
return dynPointStruct_.capacity();
}
inline bool allActive()const{
return pStruct().allActive();
}
inline auto activeRange()const{
return pStruct().activeRange();
}
inline auto activePointsMaskH()const{
return pStruct().activePointsMaskH();
}
inline const auto& pointPosition()const{
return pStruct().pointPosition();
}
inline const auto& position()const
inline auto numActive()const
{
return pStruct().pointPosition();
return dynPointStruct_.numActive();
}
inline bool isAllActive()const
{
return dynPointStruct_.isAllActive();
}
inline const auto& pointVelocity()const{
return dynPointStruct().velocity();
inline
const auto& pointPosition()const
{
return dynPointStruct_.pointPosition();
}
inline const auto& velocity()const{
return dynPointStruct().velocity();
inline
const auto& velocity()const
{
return dynPointStruct_.velocity();
}
inline const auto& id()const{
return id_;
}
inline auto& id(){
return id_;
}
inline const auto& diameter()const{
inline
const auto& diameter()const
{
return diameter_;
}
inline auto& diameter(){
inline
auto& diameter()
{
return diameter_;
}
inline const auto& mass()const{
inline
const auto& mass()const
{
return mass_;
}
inline auto& mass() {
inline auto& mass()
{
return mass_;
}
inline const auto& accelertion()const{
return accelertion_;
}
inline auto& accelertion(){
inline
const auto& accelertion()const
{
return accelertion_;
}
inline
realx3PointField_D& contactForce()
auto& accelertion()
{
return accelertion_;
}
inline
auto& contactForce()
{
return contactForce_;
}
inline
const realx3PointField_D& contactForce() const
const auto& contactForce() const
{
return contactForce_;
}
inline
realx3PointField_D& contactTorque()
auto& contactTorque()
{
return contactTorque_;
}
inline
const realx3PointField_D& contactTorque() const
const auto& contactTorque() const
{
return contactTorque_;
}
inline const auto& propertyId()const{
inline
const auto& propertyId()const
{
return propertyId_;
}
inline auto& propertyId(){
inline
auto& propertyId()
{
return propertyId_;
}
inline const auto& shapeName()const{
/*inline const auto& shapeName()const{
return shapeName_;
}
}*/
inline auto& shapName(){
/*inline auto& shapName(){
return shapeName_;
}
}*/
bool beforeIteration() override;
virtual
/*virtual
bool insertParticles
(
const realx3Vector& position,
const wordVector& shapes,
const setFieldList& setField
) = 0;
) = 0;*/
@ -259,8 +234,8 @@ public:
virtual
const realx3PointField_D& rAcceleration() const = 0;
virtual
const realVector_D& boundingSphere()const = 0;
/*virtual
const realVector_D& boundingSphere()const = 0;*/
virtual
word shapeTypeName()const = 0;