mirror of
https://github.com/PhasicFlow/phasicFlow.git
synced 2025-06-22 16:28:30 +00:00
modify for coupling-cpp and hpp
This commit is contained in:
@ -18,10 +18,10 @@ Licence:
|
||||
|
||||
-----------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef __pLine_H__
|
||||
#define __pLine_H__
|
||||
#ifndef __pLine_hpp__
|
||||
#define __pLine_hpp__
|
||||
|
||||
#include "types.H"
|
||||
#include "types.hpp"
|
||||
|
||||
namespace pFlow::sphTriInteraction
|
||||
{
|
@ -18,13 +18,13 @@ Licence:
|
||||
|
||||
-----------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef __sphereInteraction_H__
|
||||
#define __sphereInteraction_H__
|
||||
#ifndef __sphereInteraction_hpp__
|
||||
#define __sphereInteraction_hpp__
|
||||
|
||||
#include "interaction.H"
|
||||
#include "sphereParticles.H"
|
||||
#include "interaction.hpp"
|
||||
#include "sphereParticles.hpp"
|
||||
|
||||
#include "sphereInteractionKernels.H"
|
||||
#include "sphereInteractionKernels.hpp"
|
||||
|
||||
namespace pFlow
|
||||
{
|
||||
@ -97,7 +97,7 @@ protected:
|
||||
|
||||
public:
|
||||
|
||||
TypeNameTemplate3("sphereInteraction", ContactForceModel, MotionModel, ContactListType);
|
||||
TypeInfoTemplate3("sphereInteraction", ContactForceModel, MotionModel, ContactListType);
|
||||
|
||||
// constructor
|
||||
|
||||
@ -221,6 +221,6 @@ public:
|
||||
|
||||
}
|
||||
|
||||
#include "sphereInteraction.C"
|
||||
#include "sphereInteraction.cpp"
|
||||
|
||||
#endif //__sphereInteraction_H__
|
||||
#endif //__sphereInteraction_hpp__
|
@ -18,11 +18,11 @@ Licence:
|
||||
|
||||
-----------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef __sphereInteractionKernels_H__
|
||||
#define __sphereInteractionKernels_H__
|
||||
#ifndef __sphereInteractionKernels_hpp__
|
||||
#define __sphereInteractionKernels_hpp__
|
||||
|
||||
|
||||
#include "sphereTriSurfaceContact.H"
|
||||
#include "sphereTriSurfaceContact.hpp"
|
||||
|
||||
namespace pFlow::sphereInteractionKernels
|
||||
{
|
||||
@ -322,4 +322,4 @@ struct pwInteractionFunctor
|
||||
|
||||
}
|
||||
|
||||
#endif //__sphereInteractionKernels_H__
|
||||
#endif //__sphereInteractionKernels_hpp__
|
@ -18,13 +18,13 @@ Licence:
|
||||
|
||||
-----------------------------------------------------------------------------*/
|
||||
|
||||
#include "sphereInteraction.H"
|
||||
#include "sphereInteraction.hpp"
|
||||
|
||||
#include "geometryMotions.H"
|
||||
#include "geometryMotions.hpp"
|
||||
|
||||
#include "contactForceModels.H"
|
||||
#include "unsortedContactList.H"
|
||||
#include "sortedContactList.H"
|
||||
#include "contactForceModels.hpp"
|
||||
#include "unsortedContactList.hpp"
|
||||
#include "sortedContactList.hpp"
|
||||
|
||||
template class pFlow::sphereInteraction<
|
||||
pFlow::cfModels::limitedLinearNormalRolling,
|
@ -19,11 +19,11 @@ Licence:
|
||||
-----------------------------------------------------------------------------*/
|
||||
|
||||
|
||||
#ifndef __sphereTriSurfaceContact_H__
|
||||
#define __sphereTriSurfaceContact_H__
|
||||
#ifndef __sphereTriSurfaceContact_hpp__
|
||||
#define __sphereTriSurfaceContact_hpp__
|
||||
|
||||
#include "triWall.H"
|
||||
#include "pLine.H"
|
||||
#include "triWall.hpp"
|
||||
#include "pLine.hpp"
|
||||
|
||||
namespace pFlow::sphTriInteraction
|
||||
{
|
||||
@ -228,4 +228,4 @@ bool isSphereInContactBothSides(
|
||||
} // pFlow::sphTriInteraction
|
||||
|
||||
|
||||
#endif //__sphereTriSurfaceContact_H__
|
||||
#endif //__sphereTriSurfaceContact_hpp__
|
@ -18,10 +18,10 @@ Licence:
|
||||
|
||||
-----------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef __triWall_H__
|
||||
#define __triWall_H__
|
||||
#ifndef __triWall_hpp__
|
||||
#define __triWall_hpp__
|
||||
|
||||
#include "types.H"
|
||||
#include "types.hpp"
|
||||
|
||||
namespace pFlow::sphTriInteraction
|
||||
{
|
Reference in New Issue
Block a user