mirror of
https://github.com/PhasicFlow/phasicFlow.git
synced 2025-06-12 16:26:23 +00:00
bug remove for GPU run after CPU MPI parallelization
- specialization of VectorSingle for word - dummyFile creation to solve write to file in MPI mode
This commit is contained in:
@ -35,12 +35,10 @@ Licence:
|
||||
#include "commandLine.hpp"
|
||||
//#include "readControlDict.hpp"
|
||||
|
||||
using namespace pFlow;
|
||||
|
||||
int main( int argc, char* argv[] )
|
||||
{
|
||||
|
||||
commandLine cmds(
|
||||
pFlow::commandLine cmds(
|
||||
"iterateGeometry",
|
||||
"Performs simulation without particles, only geometry is solved");
|
||||
|
||||
@ -55,8 +53,8 @@ commandLine cmds(
|
||||
|
||||
|
||||
// this should be palced in each main
|
||||
processors::initProcessors(argc, argv);
|
||||
initialize_pFlowProcessors();
|
||||
pFlow::processors::initProcessors(argc, argv);
|
||||
pFlow::initialize_pFlowProcessors();
|
||||
#include "initialize_Control.hpp"
|
||||
|
||||
#include "setProperty.hpp"
|
||||
@ -71,7 +69,7 @@ initialize_pFlowProcessors();
|
||||
|
||||
// this should be palced in each main
|
||||
#include "finalize.hpp"
|
||||
processors::finalizeProcessors();
|
||||
pFlow::processors::finalizeProcessors();
|
||||
|
||||
}
|
||||
|
||||
|
@ -20,6 +20,6 @@ Licence:
|
||||
|
||||
//
|
||||
REPORT(0)<<"\nReading sphere particles . . ."<<END_REPORT;
|
||||
sphereParticles sphParticles(Control, proprties);
|
||||
pFlow::sphereParticles sphParticles(Control, proprties);
|
||||
|
||||
WARNING<<"Particle insertion has not been set yet!"<<END_WARNING;
|
||||
|
@ -36,7 +36,7 @@ Licence:
|
||||
#include "systemControl.hpp"
|
||||
#include "commandLine.hpp"
|
||||
|
||||
using namespace pFlow;
|
||||
|
||||
|
||||
/**
|
||||
* DEM solver for simulating granular flow of cohesion-less particles.
|
||||
@ -47,7 +47,7 @@ using namespace pFlow;
|
||||
int main( int argc, char* argv[])
|
||||
{
|
||||
|
||||
commandLine cmds(
|
||||
pFlow::commandLine cmds(
|
||||
"sphereGranFlow",
|
||||
"DEM solver for non-cohesive spherical particles with particle insertion "
|
||||
"mechanism and moving geometry");
|
||||
@ -57,8 +57,8 @@ bool isCoupling = false;
|
||||
if(!cmds.parse(argc, argv)) return 0;
|
||||
|
||||
// this should be palced in each main
|
||||
processors::initProcessors(argc, argv);
|
||||
initialize_pFlowProcessors();
|
||||
pFlow::processors::initProcessors(argc, argv);
|
||||
pFlow::initialize_pFlowProcessors();
|
||||
#include "initialize_Control.hpp"
|
||||
|
||||
#include "setProperty.hpp"
|
||||
@ -82,7 +82,7 @@ initialize_pFlowProcessors();
|
||||
|
||||
// this should be palced in each main
|
||||
#include "finalize.hpp"
|
||||
processors::finalizeProcessors();
|
||||
pFlow::processors::finalizeProcessors();
|
||||
|
||||
|
||||
}
|
||||
|
@ -20,7 +20,7 @@ Licence:
|
||||
|
||||
//
|
||||
REPORT(0)<<"\nReading sphere particles . . ."<<END_REPORT;
|
||||
sphereParticles sphParticles(Control, proprties);
|
||||
pFlow::sphereParticles sphParticles(Control, proprties);
|
||||
|
||||
//
|
||||
REPORT(0)<<"\nCreating particle insertion object . . ."<<END_REPORT;
|
||||
@ -36,12 +36,12 @@ REPORT(0)<<"\nCreating particle insertion object . . ."<<END_REPORT;
|
||||
sphParticles.shapes()
|
||||
);*/
|
||||
|
||||
auto sphInsertion = sphereInsertion(
|
||||
auto sphInsertion = pFlow::sphereInsertion(
|
||||
sphParticles,
|
||||
sphParticles.spheres());
|
||||
|
||||
REPORT(0)<<"\nCreating interaction model for sphere-sphere contact and sphere-wall contact . . ."<<END_REPORT;
|
||||
auto interactionPtr = interaction::create(
|
||||
auto interactionPtr = pFlow::interaction::create(
|
||||
Control,
|
||||
sphParticles,
|
||||
surfGeometry
|
||||
|
@ -40,12 +40,8 @@ Licence:
|
||||
#include "interaction.hpp"
|
||||
#include "Insertions.hpp"
|
||||
|
||||
|
||||
|
||||
//#include "readControlDict.hpp"
|
||||
|
||||
using namespace pFlow;
|
||||
|
||||
/**
|
||||
* DEM solver for simulating granular flow of cohesion-less particles.
|
||||
*
|
||||
@ -55,7 +51,7 @@ using namespace pFlow;
|
||||
int main( int argc, char* argv[])
|
||||
{
|
||||
|
||||
commandLine cmds(
|
||||
pFlow::commandLine cmds(
|
||||
"sphereGranFlow",
|
||||
"DEM solver for non-cohesive spherical particles with particle insertion "
|
||||
"mechanism and moving geometry");
|
||||
@ -65,13 +61,12 @@ bool isCoupling = false;
|
||||
if(!cmds.parse(argc, argv)) return 0;
|
||||
|
||||
// this should be palced in each main
|
||||
processors::initProcessors(argc, argv);
|
||||
initialize_pFlowProcessors();
|
||||
pFlow::processors::initProcessors(argc, argv);
|
||||
pFlow::initialize_pFlowProcessors();
|
||||
#include "initialize_Control.hpp"
|
||||
|
||||
#include "setProperty.hpp"
|
||||
#include "setSurfaceGeometry.hpp"
|
||||
|
||||
|
||||
#include "createDEMComponents.hpp"
|
||||
|
||||
@ -117,7 +112,7 @@ initialize_pFlowProcessors();
|
||||
|
||||
// this should be palced in each main
|
||||
#include "finalize.hpp"
|
||||
processors::finalizeProcessors();
|
||||
pFlow::processors::finalizeProcessors();
|
||||
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user