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

Merge remote-tracking branch 'origin/main' into coupling

Browse Source
This commit is contained in:
hamidrezanorouzi
2022-12-10 11:36:36 +03:30
parent 371c491d2b 8cc47b1c47
commit 080f7dea7d
393 changed files with 1683 additions and 1677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DEMSystems/sphereDEMSystem/sphereDEMSystem.C → DEMSystems/sphereDEMSystem/sphereDEMSystem.cpp
View File

@ -18,7 +18,7 @@ Licence:
-----------------------------------------------------------------------------*/
#include "sphereDEMSystem.H"
#include "sphereDEMSystem.hpp"
pFlow::sphereDEMSystem::sphereDEMSystem(int argc, char* argv[])

20
DEMSystems/sphereDEMSystem/sphereDEMSystem.H → DEMSystems/sphereDEMSystem/sphereDEMSystem.hpp
View File

@ -18,19 +18,19 @@ Licence:
-----------------------------------------------------------------------------*/
#ifndef __sphereDEMSystem_H__
#define __sphereDEMSystem_H__
#ifndef __sphereDEMSystem_hpp__
#define __sphereDEMSystem_hpp__
#include <array>
#include "systemControl.H"
#include "property.H"
#include "uniquePtr.H"
#include "geometry.H"
#include "sphereParticles.H"
#include "interaction.H"
#include "Insertions.H"
#include "readControlDict.H"
#include "systemControl.hpp"
#include "property.hpp"
#include "uniquePtr.hpp"
#include "geometry.hpp"
#include "sphereParticles.hpp"
#include "interaction.hpp"
#include "Insertions.hpp"
#include "readControlDict.hpp"