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

correction in the macros to be compatible with OpenFOAM

Browse Source
This commit is contained in:
hamidrezanorouzi
2022-12-24 15:00:00 +03:30
parent 080f7dea7d
commit 853d50e96f
61 changed files with 670 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
solvers/sphereGranFlow/createDEMComponents.hpp
View File

@ -19,11 +19,11 @@ Licence:
-----------------------------------------------------------------------------*/
//
Report(0)<<"\nReading sphere particles . . ."<<endReport;
REPORT(0)<<"\nReading sphere particles . . ."<<endREPORT;
sphereParticles sphParticles(Control, proprties);
//
Report(0)<<"\nCreating particle insertion object . . ."<<endReport;
REPORT(0)<<"\nCreating particle insertion object . . ."<<endREPORT;
auto& sphInsertion =
Control.caseSetup().emplaceObject<sphereInsertion>(
objectFile(
@ -38,7 +38,7 @@ auto& sphInsertion =
Report(0)<<"\nCreating interaction model for sphere-sphere contact and sphere-wall contact . . ."<<endReport;
REPORT(0)<<"\nCreating interaction model for sphere-sphere contact and sphere-wall contact . . ."<<endREPORT;
auto interactionPtr = interaction::create(
Control,
sphParticles,

4
solvers/sphereGranFlow/sphereGranFlow.cpp
View File

@ -61,7 +61,7 @@ if(!cmds.parse(argc, argv)) return 0;
#include "createDEMComponents.hpp"
Report(0)<<"\nStart of time loop . . .\n"<<endReport;
REPORT(0)<<"\nStart of time loop . . .\n"<<endREPORT;
do
{
@ -98,7 +98,7 @@ if(!cmds.parse(argc, argv)) return 0;
}while(Control++);
Report(0)<<"\nEnd of time loop.\n"<<endReport;
REPORT(0)<<"\nEnd of time loop.\n"<<endREPORT;
// this should be palced in each main
#include "finalize.hpp"