Minor updates

This commit is contained in:
henry 2008-05-01 16:45:02 +01:00
parent 5413edb32c
commit f13d2060dc
4 changed files with 28 additions and 12 deletions

View File

@ -50,6 +50,7 @@ SourceFiles
#include "Tuple2.H"
#include "OFstream.H"
#include "Switch.H"
#include "pointFieldFwd.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -59,6 +60,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
Class forces Declaration
@ -204,6 +206,14 @@ public:
//- Calculate and return forces and moment
virtual forcesMoments calcForcesMoment() const;
//- Update for changes of mesh
virtual void updateMesh(const mapPolyMesh&)
{}
//- Update for changes of mesh
virtual void movePoints(const pointField&)
{}
};

View File

@ -171,7 +171,11 @@ bool twoPhaseMixture::read()
{
if (transportModel::read())
{
if (nuModel1_().read(*this) && nuModel2_().read(*this))
if
(
nuModel1_().read(subDict(phase1Name_))
&& nuModel2_().read(subDict(phase2Name_))
)
{
nuModel1_->viscosityProperties().lookup("rho") >> rho1_;
nuModel2_->viscosityProperties().lookup("rho") >> rho2_;

View File

@ -54,7 +54,9 @@ class twoPhaseMixture
:
public transportModel
{
// Private data
protected:
// Protected data
word phase1Name_;
word phase2Name_;
@ -141,7 +143,7 @@ public:
tmp<surfaceScalarField> muf() const;
//- Return the kinematic laminar viscosity
tmp<volScalarField> nu() const
virtual tmp<volScalarField> nu() const
{
return nu_;
}
@ -150,13 +152,13 @@ public:
tmp<surfaceScalarField> nuf() const;
//- Correct the laminar viscosity
void correct()
virtual void correct()
{
calcNu();
}
//- Read base transportProperties dictionary
bool read();
virtual bool read();
};