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

corrections for coupling

Browse Source
This commit is contained in:
hamidrezanorouzi
2022-12-30 17:33:56 +03:30
parent 853d50e96f
commit 7e858a116f
7 changed files with 164 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
DEMSystems/DEMSystem/DEMSystem.cpp
View File

@ -21,9 +21,8 @@ Licence:
#include "DEMSystem.hpp"
pFlow::coupling::DEMSystem::DEMSystem(
pFlow::DEMSystem::DEMSystem(
word demSystemName,
int32 numDomains,
const std::vector<box>& domains,
int argc,
char* argv[])
@ -39,16 +38,17 @@ pFlow::coupling::DEMSystem::DEMSystem(
ControlDict_.saveInterval(),
ControlDict_.startTimeName());
timers_ = makeUnique<Timers>(demSystemName, &Control_().timers());
}
pFlow::coupling::DEMSystem::~DEMSystem()
pFlow::DEMSystem::~DEMSystem()
{}
pFlow::uniquePtr<pFlow::coupling::DEMSystem>
pFlow::coupling::DEMSystem::create(
pFlow::uniquePtr<pFlow::DEMSystem>
pFlow::DEMSystem::create(
word demSystemName,
int32 numDomains,
const std::vector<box>& domains,
int argc,
char* argv[]
@ -56,7 +56,7 @@ pFlow::uniquePtr<pFlow::coupling::DEMSystem>
{
if( wordvCtorSelector_.search(demSystemName) )
{
return wordvCtorSelector_[demSystemName] (demSystemName, numDomains, domains, argc, argv);
return wordvCtorSelector_[demSystemName] (demSystemName, domains, argc, argv);
}
else
{

26
DEMSystems/DEMSystem/DEMSystem.hpp
View File

@ -24,13 +24,14 @@ Licence:
#include <vector>
#include "types.hpp"
#include "span.hpp"
#include "virtualConstructor.hpp"
#include "uniquePtr.hpp"
#include "systemControl.hpp"
#include "readControlDict.hpp"
namespace pFlow::coupling
namespace pFlow
{
@ -44,6 +45,7 @@ protected:
std::vector<box> domains_;
uniquePtr<Timers> timers_;
// methods
auto& Control()
@ -58,7 +60,6 @@ public:
DEMSystem(
word demSystemName,
int32 numDomains,
const std::vector<box>& domains,
int argc,
char* argv[]);
@ -74,14 +75,12 @@ public:
word,
(
word demSystemName,
int32 numDomains,
const std::vector<box>& domains,
int argc,
char* argv[]
),
(
demSystemName,
numDomains,
domains,
argc,
argv
@ -97,6 +96,11 @@ public:
return pFlow::usingDouble__;
}
Timers& timers()
{
return Control_->timers();
}
virtual
int32 numParInDomain(int32 di)const = 0;
@ -104,16 +108,26 @@ public:
std::vector<int32> numParInDomain()const = 0;
virtual
bool iterate(int32 n, real timeToWrite, word timeName) = 0;
span<const int32> parIndexInDomain(int32 di)const = 0;
virtual
bool changeDomainsSizeUpdateParticles(const std::vector<box>& domains) = 0;
virtual
bool updateParticles() = 0;
virtual
real maxBounndingSphereSize()const = 0;
virtual
bool iterate(int32 n, real timeToWrite, word timeName) = 0;
static
uniquePtr<DEMSystem>
create(
word demSystemName,
int32 numDomains,
const std::vector<box>& domains,
int argc,
char* argv[]);