mirror of
https://github.com/PhasicFlow/phasicFlow.git
synced 2025-06-12 16:26:23 +00:00
DEMSystem updated for version 1.0
This commit is contained in:
@ -33,14 +33,14 @@ pFlow::DEMSystem::DEMSystem(
|
||||
ControlDict_()
|
||||
{
|
||||
|
||||
REPORT(0)<<"Initializing host/device execution spaces . . . \n";
|
||||
REPORT(1)<<"Host execution space is "<< greenText(DefaultHostExecutionSpace::name())<<endREPORT;
|
||||
REPORT(1)<<"Device execution space is "<<greenText(DefaultExecutionSpace::name())<<endREPORT;
|
||||
REPORT(0)<<"Initializing host/device execution spaces . . . \n";
|
||||
REPORT(1)<<"Host execution space is "<< Green_Text(DefaultHostExecutionSpace::name())<<END_REPORT;
|
||||
REPORT(1)<<"Device execution space is "<<Green_Text(DefaultExecutionSpace::name())<<END_REPORT;
|
||||
|
||||
// initialize Kokkos
|
||||
Kokkos::initialize( argc, argv );
|
||||
|
||||
REPORT(0)<<"\nCreating Control repository . . ."<<endREPORT;
|
||||
REPORT(0)<<"\nCreating Control repository . . ."<<END_REPORT;
|
||||
Control_ = makeUnique<systemControl>(
|
||||
ControlDict_.startTime(),
|
||||
ControlDict_.endTime(),
|
||||
@ -87,4 +87,3 @@ pFlow::uniquePtr<pFlow::DEMSystem>
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
@ -25,6 +25,7 @@ Licence:
|
||||
|
||||
#include "types.hpp"
|
||||
#include "span.hpp"
|
||||
#include "box.hpp"
|
||||
#include "virtualConstructor.hpp"
|
||||
#include "uniquePtr.hpp"
|
||||
#include "systemControl.hpp"
|
||||
@ -111,19 +112,31 @@ public:
|
||||
int32 numParInDomain(int32 di)const = 0;
|
||||
|
||||
virtual
|
||||
std::vector<int32> numParInDomain()const = 0;
|
||||
std::vector<int32> numParInDomains()const = 0;
|
||||
|
||||
virtual
|
||||
span<const int32> parIndexInDomain(int32 di)const = 0;
|
||||
span<const int32> parIndexInDomain(int32 domIndx)const = 0;
|
||||
|
||||
virtual
|
||||
span<real> parDiameter() = 0;
|
||||
|
||||
virtual
|
||||
span<realx3> parVelocity() = 0;
|
||||
span<realx3> acceleration()=0;
|
||||
|
||||
virtual
|
||||
span<realx3> parPosition() = 0;
|
||||
span<realx3> velocity() = 0;
|
||||
|
||||
virtual
|
||||
span<realx3> position() = 0;
|
||||
|
||||
virtual
|
||||
span<realx3> rAcceleration()=0;
|
||||
|
||||
virtual
|
||||
span<realx3> rVelocity() = 0;
|
||||
|
||||
virtual
|
||||
span<realx3> rPosition() = 0;
|
||||
|
||||
virtual
|
||||
span<realx3> parFluidForce() = 0;
|
||||
@ -153,7 +166,6 @@ public:
|
||||
bool iterate(real upToTime) = 0;
|
||||
|
||||
|
||||
|
||||
static
|
||||
uniquePtr<DEMSystem>
|
||||
create(
|
||||
@ -162,8 +174,6 @@ public:
|
||||
int argc,
|
||||
char* argv[]);
|
||||
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user