From e1d4e5d41ddb5e95792da4ad0c2e1c19704579bb Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 27 Sep 2012 12:30:21 +0100 Subject: [PATCH] ENH: Added new particle lift force models to particle tables --- .../intermediate/parcels/include/makeParcelForces.H | 5 +++++ .../intermediate/parcels/include/makeThermoParcelForces.H | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelForces.H b/src/lagrangian/intermediate/parcels/include/makeParcelForces.H index 7658900598..9516b16a00 100644 --- a/src/lagrangian/intermediate/parcels/include/makeParcelForces.H +++ b/src/lagrangian/intermediate/parcels/include/makeParcelForces.H @@ -31,6 +31,9 @@ License #include "SphereDragForce.H" #include "NonSphereDragForce.H" +#include "SaffmanMeiLiftForce.H" +#include "TomiyamaLiftForce.H" + #include "GravityForce.H" #include "NonInertialFrameForce.H" #include "ParamagneticForce.H" @@ -45,6 +48,8 @@ License makeParticleForceModel(CloudType); \ makeParticleForceModelType(SphereDragForce, CloudType); \ makeParticleForceModelType(NonSphereDragForce, CloudType); \ + makeParticleForceModelType(SaffmanMeiLiftForce, CloudType); \ + makeParticleForceModelType(TomiyamaLiftForce, CloudType); \ makeParticleForceModelType(GravityForce, CloudType); \ makeParticleForceModelType(NonInertialFrameForce, CloudType); \ makeParticleForceModelType(ParamagneticForce, CloudType); \ diff --git a/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H b/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H index dff1f464a1..29b3d6acfe 100644 --- a/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H +++ b/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H @@ -31,6 +31,9 @@ License #include "SphereDragForce.H" #include "NonSphereDragForce.H" +#include "SaffmanMeiLiftForce.H" +#include "TomiyamaLiftForce.H" + #include "BrownianMotionForce.H" #include "GravityForce.H" #include "NonInertialFrameForce.H" @@ -46,6 +49,8 @@ License makeParticleForceModel(CloudType); \ makeParticleForceModelType(SphereDragForce, CloudType); \ makeParticleForceModelType(NonSphereDragForce, CloudType); \ + makeParticleForceModelType(SaffmanMeiLiftForce, CloudType); \ + makeParticleForceModelType(TomiyamaLiftForce, CloudType); \ makeParticleForceModelType(BrownianMotionForce, CloudType); \ makeParticleForceModelType(GravityForce, CloudType); \ makeParticleForceModelType(NonInertialFrameForce, CloudType); \