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

the need to provide neighborLength in domain dictionary is lifted. Now it is optional

Browse Source
This commit is contained in:
HRN
2025-02-03 23:49:11 +03:30
parent fac5576df1
commit 63bd9c9993
30 changed files with 106 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
DEMSystems/grainDEMSystem/grainDEMSystem.cpp
View File

@ -78,9 +78,14 @@ pFlow::grainDEMSystem::grainDEMSystem(
REPORT(0)<< "\nCreating surface geometry for grainDEMSystem . . . "<<END_REPORT;
geometry_ = geometry::create(Control(), Property());
REPORT(0)<<"Reading shape dictionary ..."<<END_REPORT;
grains_ = makeUnique<grainShape>(
pFlow::shapeFile__,
&Control().caseSetup(),
Property() );
REPORT(0)<<"\nReading grain particles . . ."<<END_REPORT;
particles_ = makeUnique<grainFluidParticles>(Control(), Property());
particles_ = makeUnique<grainFluidParticles>(Control(), grains_());
insertion_ = makeUnique<grainInsertion>(

2
DEMSystems/grainDEMSystem/grainDEMSystem.hpp
View File

@ -46,6 +46,8 @@ protected:
uniquePtr<geometry> geometry_ = nullptr;
uniquePtr<grainShape> grains_ = nullptr;
uniquePtr<grainFluidParticles> particles_ = nullptr;
uniquePtr<grainInsertion> insertion_ = nullptr;

4
DEMSystems/grainDEMSystem/grainFluidParticles.cpp
View File

@ -35,8 +35,8 @@ void pFlow::grainFluidParticles::checkHostMemory()
pFlow::grainFluidParticles::grainFluidParticles(
systemControl &control,
const property &prop)
: grainParticles(control, prop),
const grainShape& grains)
: grainParticles(control, grains),
fluidForce_(
objectFile(
"fluidForce",

2
DEMSystems/grainDEMSystem/grainFluidParticles.hpp
View File

@ -59,7 +59,7 @@ protected:
public:
/// construct from systemControl and property
grainFluidParticles(systemControl &control, const property& prop);
grainFluidParticles(systemControl &control, const grainShape& grains);
~grainFluidParticles() override = default;

8
DEMSystems/sphereDEMSystem/sphereDEMSystem.cpp
View File

@ -74,13 +74,19 @@ pFlow::sphereDEMSystem::sphereDEMSystem(
property_ = makeUnique<property>(
propertyFile__,
Control().caseSetup().path());
REPORT(0)<< "\nCreating surface geometry for sphereDEMSystem . . . "<<END_REPORT;
geometry_ = geometry::create(Control(), Property());
REPORT(0)<<"Reading shapes dictionary..."<<END_REPORT;
spheres_ = makeUnique<sphereShape>(
pFlow::shapeFile__,
&Control().caseSetup(),
Property());
REPORT(0)<<"\nReading sphere particles . . ."<<END_REPORT;
particles_ = makeUnique<sphereFluidParticles>(Control(), Property());
particles_ = makeUnique<sphereFluidParticles>(Control(), spheres_());
insertion_ = makeUnique<sphereInsertion>(

2
DEMSystems/sphereDEMSystem/sphereDEMSystem.hpp
View File

@ -46,6 +46,8 @@ protected:
uniquePtr<geometry> geometry_ = nullptr;
uniquePtr<sphereShape> spheres_ = nullptr;
uniquePtr<sphereFluidParticles> particles_ = nullptr;
uniquePtr<sphereInsertion> insertion_ = nullptr;

4
DEMSystems/sphereDEMSystem/sphereFluidParticles.cpp
View File

@ -32,8 +32,8 @@ void pFlow::sphereFluidParticles::checkHostMemory()
pFlow::sphereFluidParticles::sphereFluidParticles(
systemControl &control,
const property &prop)
: sphereParticles(control, prop),
const sphereShape& shpShape)
: sphereParticles(control, shpShape),
fluidForce_(
objectFile(
"fluidForce",

2
DEMSystems/sphereDEMSystem/sphereFluidParticles.hpp
View File

@ -66,7 +66,7 @@ protected:
public:
/// construct from systemControl and property
sphereFluidParticles(systemControl &control, const property& prop);
sphereFluidParticles(systemControl &control, const sphereShape& shpShape);
/// before iteration step
bool beforeIteration() override;