From 195d51bfd43b486c2968a7dc4558b67bc5ca819b Mon Sep 17 00:00:00 2001 From: william Date: Tue, 18 Mar 2014 09:07:35 +0000 Subject: [PATCH] STYLE: twoPhaseEulerFoam: updated interfacial model headers to reflect changes in the definition of K --- .../dragModels/dragModel/dragModel.H | 9 ++------- .../heatTransferModels/RanzMarshall/RanzMarshall.H | 2 +- .../heatTransferModel/heatTransferModel.H | 11 +++-------- .../noTurbulentDispersion/noTurbulentDispersion.H | 2 +- .../constantVirtualMassCoefficient.H | 2 +- .../virtualMassModels/noVirtualMass/noVirtualMass.H | 3 ++- .../virtualMassModel/virtualMassModel.H | 11 +++-------- .../wallLubricationModel/wallLubricationModel.H | 2 +- 8 files changed, 14 insertions(+), 28 deletions(-) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H index 954d60c3..54c78441 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H @@ -134,13 +134,8 @@ public: virtual tmp CdRe() const = 0; //- The drag function K used in the momentum equation - // ddt(alpha1*rho1*U1) + ... = ... alpha1*alpha2*K*(U1-U2) - // ddt(alpha2*rho2*U2) + ... = ... alpha1*alpha2*K*(U2-U1) - // ********************************** NB! ***************************** - // for numerical reasons alpha1 and alpha2 has been extracted from the - // drag function K, so you MUST divide K by alpha1*alpha2 when - // implemnting the drag function - // ********************************** NB! ***************************** + // ddt(alpha1*rho1*U1) + ... = ... K*(U1-U2) + // ddt(alpha2*rho2*U2) + ... = ... K*(U2-U1) virtual tmp K() const; //- Dummy write for regIOobject diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H index a52ff75b..04ce5c90 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H @@ -47,7 +47,7 @@ namespace heatTransferModels { /*---------------------------------------------------------------------------*\ - Class RanzMarshall Declaration + Class RanzMarshall Declaration \*---------------------------------------------------------------------------*/ class RanzMarshall diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H index e0d1cba7..5e16e572 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H @@ -46,7 +46,7 @@ namespace Foam class phasePair; /*---------------------------------------------------------------------------*\ - Class heatTransferModel Declaration + Class heatTransferModel Declaration \*---------------------------------------------------------------------------*/ class heatTransferModel @@ -115,13 +115,8 @@ public: // Member Functions //- The heat transfer function K used in the enthalpy equation - // ddt(alpha1*rho1*ha) + ... = ... alpha1*alpha2*K*(Ta - Tb) - // ddt(alpha2*rho2*hb) + ... = ... alpha1*alpha2*K*(Tb - Ta) - // ********************************** NB!***************************** - // for numerical reasons alpha1 and alpha2 has been extracted from the - // heat transfer function K, so you MUST divide K by alpha1*alpha2 when - // implementing the heat transfer function - // ********************************** NB!***************************** + // ddt(alpha1*rho1*ha) + ... = ... K*(Ta - Tb) + // ddt(alpha2*rho2*hb) + ... = ... K*(Tb - Ta) virtual tmp K() const = 0; }; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H index 7c9adf6d..19c12a23 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H @@ -47,7 +47,7 @@ namespace turbulentDispersionModels { /*---------------------------------------------------------------------------*\ - Class noTurbulentDispersion Declaration + Class noTurbulentDispersion Declaration \*---------------------------------------------------------------------------*/ class noTurbulentDispersion diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H index 8ce2b691..cb20c4e3 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H @@ -48,7 +48,7 @@ namespace virtualMassModels { /*---------------------------------------------------------------------------*\ - Class constantVirtualMassCoefficient Declaration + Class constantVirtualMassCoefficient Declaration \*---------------------------------------------------------------------------*/ class constantVirtualMassCoefficient diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H index a8733e5f..90f60e29 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H @@ -47,7 +47,7 @@ namespace virtualMassModels { /*---------------------------------------------------------------------------*\ - Class noVirtualMass Declaration + Class noVirtualMass Declaration \*---------------------------------------------------------------------------*/ class noVirtualMass @@ -80,6 +80,7 @@ public: //- Virtual mass coefficient virtual tmp Cvm() const; + //- The virtual mass function K used in the momentum equation virtual tmp K() const; }; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H index bfaf4573..65ea9fd5 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H @@ -47,7 +47,7 @@ namespace Foam class phasePair; /*---------------------------------------------------------------------------*\ - Class virtualMassModel Declaration + Class virtualMassModel Declaration \*---------------------------------------------------------------------------*/ class virtualMassModel @@ -120,13 +120,8 @@ public: virtual tmp Cvm() const = 0; //- The virtual mass function K used in the momentum equation - // ddt(alpha1*rho1*U1) + ... = ... alpha1*alpha2*K*(DU1_Dt - DU2_Dt) - // ddt(alpha2*rho2*U2) + ... = ... alpha1*alpha2*K*(DU1_Dt - DU2_Dt) - // ********************************** NB! ***************************** - // for numerical reasons alpha1 and alpha2 has been extracted from the - // virtual mass function K, so you MUST divide K by alpha1*alpha2 when - // implemnting the virtual mass function - // ********************************** NB! ***************************** + // ddt(alpha1*rho1*U1) + ... = ... K*(DU1_Dt - DU2_Dt) + // ddt(alpha2*rho2*U2) + ... = ... K*(DU1_Dt - DU2_Dt) virtual tmp K() const; // Dummy write for regIOobject diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H index ee234197..04fd4729 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H @@ -47,7 +47,7 @@ namespace Foam class phasePair; /*---------------------------------------------------------------------------*\ - Class wallLubricationModel Declaration + Class wallLubricationModel Declaration \*---------------------------------------------------------------------------*/ class wallLubricationModel