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,11 +18,11 @@ Licence:
|
||||
|
||||
-----------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef __linearCF_H__
|
||||
#define __linearCF_H__
|
||||
#ifndef __linearCF_hpp__
|
||||
#define __linearCF_hpp__
|
||||
|
||||
#include "types.H"
|
||||
#include "symArrays.H"
|
||||
#include "types.hpp"
|
||||
#include "symArrays.hpp"
|
||||
|
||||
namespace pFlow::cfModels
|
||||
{
|
||||
@ -172,7 +172,7 @@ protected:
|
||||
public:
|
||||
|
||||
|
||||
TypeNameNV(modelName());
|
||||
TypeInfoNV(modelName());
|
||||
|
||||
INLINE_FUNCTION_HD
|
||||
linear(){}
|
@ -18,10 +18,10 @@ Licence:
|
||||
|
||||
-----------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef __nonLinearCF_H__
|
||||
#define __nonLinearCF_H__
|
||||
#ifndef __nonLinearCF_hpp__
|
||||
#define __nonLinearCF_hpp__
|
||||
|
||||
#include "types.H"
|
||||
#include "types.hpp"
|
||||
|
||||
namespace pFlow::cfModels
|
||||
{
|
||||
@ -164,7 +164,7 @@ protected:
|
||||
|
||||
public:
|
||||
|
||||
TypeNameNV(modelName());
|
||||
TypeInfoNV(modelName());
|
||||
|
||||
INLINE_FUNCTION_HD
|
||||
nonLinear(){}
|
@ -18,10 +18,10 @@ Licence:
|
||||
|
||||
-----------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef __nonLinearModCF_H__
|
||||
#define __nonLinearModCF_H__
|
||||
#ifndef __nonLinearModCF_hpp__
|
||||
#define __nonLinearModCF_hpp__
|
||||
|
||||
#include "types.H"
|
||||
#include "types.hpp"
|
||||
|
||||
namespace pFlow::cfModels
|
||||
{
|
||||
@ -148,7 +148,7 @@ protected:
|
||||
|
||||
public:
|
||||
|
||||
TypeNameNV(modelName());
|
||||
TypeInfoNV(modelName());
|
||||
|
||||
INLINE_FUNCTION_HD
|
||||
nonLinearMod(){}
|
||||
@ -266,4 +266,4 @@ public:
|
||||
|
||||
} //pFlow::CFModels
|
||||
|
||||
#endif //__nonLinearModCF_H__
|
||||
#endif //__nonLinearModCF_hpp__
|
@ -18,14 +18,14 @@ Licence:
|
||||
|
||||
-----------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef __contactForceModels_H__
|
||||
#define __contactForceModels_H__
|
||||
#ifndef __contactForceModels_hpp__
|
||||
#define __contactForceModels_hpp__
|
||||
|
||||
|
||||
#include "linearCF.H"
|
||||
#include "nonLinearCF.H"
|
||||
#include "normalRolling.H"
|
||||
#include "nonLinearMod.H"
|
||||
#include "linearCF.hpp"
|
||||
#include "nonLinearCF.hpp"
|
||||
#include "normalRolling.hpp"
|
||||
#include "nonLinearMod.hpp"
|
||||
|
||||
|
||||
namespace pFlow::cfModels
|
||||
@ -45,4 +45,4 @@ using nonLimitedNonLinearModNormalRolling = normalRolling<nonLinearMod<false>>;
|
||||
|
||||
|
||||
|
||||
#endif //__contactForceModels_H__
|
||||
#endif //__contactForceModels_hpp__
|
@ -18,8 +18,8 @@ Licence:
|
||||
|
||||
-----------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef __normalRolling_H__
|
||||
#define __normalRolling_H__
|
||||
#ifndef __normalRolling_hpp__
|
||||
#define __normalRolling_hpp__
|
||||
|
||||
|
||||
namespace pFlow::cfModels
|
||||
@ -58,7 +58,7 @@ public:
|
||||
|
||||
public:
|
||||
|
||||
TypeNameNV(word("normal<"+contactForceModel::TYPENAME()+">"));
|
||||
TypeInfoNV(word("normal<"+contactForceModel::TYPENAME()+">"));
|
||||
|
||||
|
||||
normalRolling(int32 nMaterial, const ViewType1D<real>& rho, const dictionary& dict)
|
Reference in New Issue
Block a user