From 17d36e93538947c241d1e425b3321f5a1c5e4ce3 Mon Sep 17 00:00:00 2001 From: henry Date: Thu, 10 Jun 2010 12:53:54 +0100 Subject: [PATCH 1/5] multiphaseInterFoam: changed alphaContactAngleFvPatchScalarField to multiphaseAlphaContactAngleFvPatchScalarField to avoid name clashed with the version of alphaContactAngleFvPatchScalarField in the interfaceProperties library. --- .../multiphase/multiphaseInterFoam/Make/files | 2 +- .../multiphaseInterFoam/Make/options | 6 ++-- .../multiphaseInterFoam/createFields.H | 2 +- .../multiphaseInterFoam/multiphaseInterFoam.C | 2 +- ...haseAlphaContactAngleFvPatchScalarField.C} | 29 ++++++++++------- ...haseAlphaContactAngleFvPatchScalarField.H} | 32 +++++++++---------- .../multiphaseMixture/multiphaseMixture.C | 11 ++++--- .../multiphaseMixture/multiphaseMixture.H | 2 +- 8 files changed, 45 insertions(+), 41 deletions(-) rename applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/{alphaContactAngle/alphaContactAngleFvPatchScalarField.C => multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.C} (76%) rename applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/{alphaContactAngle/alphaContactAngleFvPatchScalarField.H => multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.H} (84%) diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Make/files b/applications/solvers/multiphase/multiphaseInterFoam/Make/files index 0204e6cabf..4820de61a5 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/Make/files +++ b/applications/solvers/multiphase/multiphaseInterFoam/Make/files @@ -1,5 +1,5 @@ multiphaseMixture/phase/phase.C -multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C +multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.C multiphaseMixture/multiphaseMixture.C multiphaseInterFoam.C diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/Make/options index 1fc821726c..6e9363f13f 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/Make/options +++ b/applications/solvers/multiphase/multiphaseInterFoam/Make/options @@ -2,17 +2,15 @@ EXE_INC = \ -I../interFoam \ -ImultiphaseMixture \ -ImultiphaseMixture/phase \ - -ImultiphaseMixture/alphaContactAngle \ + -ImultiphaseMixture/multiphaseAlphaContactAngle \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ -linterfaceProperties \ -lincompressibleTransportModels \ - -lincompressibleTransportModels \ -lincompressibleRASModels \ -lincompressibleLESModels \ - -lfiniteVolume + -lfiniteVolume \ No newline at end of file diff --git a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H index fb64496294..6ef6882196 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H +++ b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H @@ -26,7 +26,7 @@ mesh ); -# include "createPhi.H" + #include "createPhi.H" multiphaseMixture mixture(U, phi); diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C index 1a5bed606d..546e635346 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C @@ -80,7 +80,7 @@ int main(int argc, char *argv[]) #include "continuityErrs.H" - turbulence->correct(); + //turbulence->correct(); runTime.write(); diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.C similarity index 76% rename from applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C rename to applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.C index 3cf76bab1b..9cc9b7ed07 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "alphaContactAngleFvPatchScalarField.H" +#include "multiphaseAlphaContactAngleFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" #include "fvPatchFieldMapper.H" @@ -32,7 +32,8 @@ License namespace Foam { -alphaContactAngleFvPatchScalarField::interfaceThetaProps::interfaceThetaProps +multiphaseAlphaContactAngleFvPatchScalarField::interfaceThetaProps:: +interfaceThetaProps ( Istream& is ) @@ -47,7 +48,7 @@ alphaContactAngleFvPatchScalarField::interfaceThetaProps::interfaceThetaProps Istream& operator>> ( Istream& is, - alphaContactAngleFvPatchScalarField::interfaceThetaProps& tp + multiphaseAlphaContactAngleFvPatchScalarField::interfaceThetaProps& tp ) { is >> tp.theta0_ >> tp.uTheta_ >> tp.thetaA_ >> tp.thetaR_; @@ -58,7 +59,7 @@ Istream& operator>> Ostream& operator<< ( Ostream& os, - const alphaContactAngleFvPatchScalarField::interfaceThetaProps& tp + const multiphaseAlphaContactAngleFvPatchScalarField::interfaceThetaProps& tp ) { os << tp.theta0_ << token::SPACE @@ -72,7 +73,8 @@ Ostream& operator<< // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField +multiphaseAlphaContactAngleFvPatchScalarField:: +multiphaseAlphaContactAngleFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF @@ -82,9 +84,10 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField {} -alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField +multiphaseAlphaContactAngleFvPatchScalarField:: +multiphaseAlphaContactAngleFvPatchScalarField ( - const alphaContactAngleFvPatchScalarField& gcpsf, + const multiphaseAlphaContactAngleFvPatchScalarField& gcpsf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper @@ -95,7 +98,8 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField {} -alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField +multiphaseAlphaContactAngleFvPatchScalarField:: +multiphaseAlphaContactAngleFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, @@ -109,9 +113,10 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField } -alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField +multiphaseAlphaContactAngleFvPatchScalarField:: +multiphaseAlphaContactAngleFvPatchScalarField ( - const alphaContactAngleFvPatchScalarField& gcpsf, + const multiphaseAlphaContactAngleFvPatchScalarField& gcpsf, const DimensionedField& iF ) : @@ -122,7 +127,7 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void alphaContactAngleFvPatchScalarField::write(Ostream& os) const +void multiphaseAlphaContactAngleFvPatchScalarField::write(Ostream& os) const { fvPatchScalarField::write(os); os.writeKeyword("thetaProperties") @@ -133,7 +138,7 @@ void alphaContactAngleFvPatchScalarField::write(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField(fvPatchScalarField, alphaContactAngleFvPatchScalarField); +makePatchTypeField(fvPatchScalarField, multiphaseAlphaContactAngleFvPatchScalarField); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.H b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.H similarity index 84% rename from applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.H rename to applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.H index 322d097526..ccbb146abb 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.H +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.H @@ -22,19 +22,19 @@ License along with OpenFOAM. If not, see . Class - Foam::alphaContactAngleFvPatchScalarField + Foam::multiphaseAlphaContactAngleFvPatchScalarField Description Contact-angle boundary condition for multi-phase interface-capturing simulations. Used in conjuction with multiphaseMixture. SourceFiles - alphaContactAngleFvPatchScalarField.C + multiphaseAlphaContactAngleFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef alphaContactAngleFvPatchScalarField_H -#define alphaContactAngleFvPatchScalarField_H +#ifndef multiphaseAlphaContactAngleFvPatchScalarField_H +#define multiphaseAlphaContactAngleFvPatchScalarField_H #include "zeroGradientFvPatchFields.H" #include "multiphaseMixture.H" @@ -45,10 +45,10 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class alphaContactAngleFvPatch Declaration + Class multiphaseAlphaContactAngleFvPatch Declaration \*---------------------------------------------------------------------------*/ -class alphaContactAngleFvPatchScalarField +class multiphaseAlphaContactAngleFvPatchScalarField : public zeroGradientFvPatchScalarField { @@ -132,31 +132,31 @@ private: public: //- Runtime type information - TypeName("alphaContactAngle"); + TypeName("multiphaseAlphaContactAngle"); // Constructors //- Construct from patch and internal field - alphaContactAngleFvPatchScalarField + multiphaseAlphaContactAngleFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - alphaContactAngleFvPatchScalarField + multiphaseAlphaContactAngleFvPatchScalarField ( const fvPatch&, const DimensionedField&, const dictionary& ); - //- Construct by mapping given alphaContactAngleFvPatchScalarField + //- Construct by mapping given multiphaseAlphaContactAngleFvPatchScalarField // onto a new patch - alphaContactAngleFvPatchScalarField + multiphaseAlphaContactAngleFvPatchScalarField ( - const alphaContactAngleFvPatchScalarField&, + const multiphaseAlphaContactAngleFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& @@ -167,14 +167,14 @@ public: { return tmp ( - new alphaContactAngleFvPatchScalarField(*this) + new multiphaseAlphaContactAngleFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - alphaContactAngleFvPatchScalarField + multiphaseAlphaContactAngleFvPatchScalarField ( - const alphaContactAngleFvPatchScalarField&, + const multiphaseAlphaContactAngleFvPatchScalarField&, const DimensionedField& ); @@ -186,7 +186,7 @@ public: { return tmp ( - new alphaContactAngleFvPatchScalarField(*this, iF) + new multiphaseAlphaContactAngleFvPatchScalarField(*this, iF) ); } diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C index 7af947d4a7..c6dba40e13 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "multiphaseMixture.H" -#include "alphaContactAngleFvPatchScalarField.H" +#include "multiphaseAlphaContactAngleFvPatchScalarField.H" #include "Time.H" #include "subCycle.H" #include "fvCFD.H" @@ -351,10 +351,11 @@ void Foam::multiphaseMixture::correctContactAngle forAll(boundary, patchi) { - if (isA(gbf[patchi])) + if (isA(gbf[patchi])) { - const alphaContactAngleFvPatchScalarField& acap = - refCast(gbf[patchi]); + const multiphaseAlphaContactAngleFvPatchScalarField& acap = + refCast + (gbf[patchi]); vectorField& nHatPatch = nHatb[patchi]; @@ -362,7 +363,7 @@ void Foam::multiphaseMixture::correctContactAngle mesh_.Sf().boundaryField()[patchi] /mesh_.magSf().boundaryField()[patchi]; - alphaContactAngleFvPatchScalarField::thetaPropsTable:: + multiphaseAlphaContactAngleFvPatchScalarField::thetaPropsTable:: const_iterator tp = acap.thetaProps().find(interfacePair(alpha1, alpha2)); diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H index 1d94d47e91..2a430da5b2 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H @@ -210,7 +210,7 @@ public: //- Destructor - ~multiphaseMixture() + virtual ~multiphaseMixture() {} From d53f5edf5c98d54f1eab121077de710beaba5cba Mon Sep 17 00:00:00 2001 From: henry Date: Thu, 10 Jun 2010 12:55:04 +0100 Subject: [PATCH 2/5] damBreak4phase: Tested and updated multiphaseInterFoam solver tutorial. --- .../laminar/damBreak4phase/0/U | 2 +- .../laminar/damBreak4phase/0/alphaair | 10 ++--- .../laminar/damBreak4phase/0/alphamercury | 2 +- .../laminar/damBreak4phase/0/alphaoil | 2 +- .../laminar/damBreak4phase/0/alphas | 2 +- .../laminar/damBreak4phase/0/alphawater | 2 +- .../laminar/damBreak4phase/0/p | 2 +- .../constant/polyMesh/blockMeshDict | 2 +- .../damBreak4phase/constant/polyMesh/boundary | 2 +- .../constant/transportProperties | 41 ++++++++++++++++++- .../laminar/damBreak4phase/system/fvSchemes | 2 +- .../laminar/damBreak4phase/system/fvSolution | 2 +- .../laminar/damBreak4phaseFine/0/alphas | 2 +- .../constant/polyMesh/boundary | 2 +- .../constant/transportProperties | 41 ++++++++++++++++++- .../damBreak4phaseFine/system/fvSchemes | 2 +- .../damBreak4phaseFine/system/fvSolution | 4 +- 17 files changed, 98 insertions(+), 24 deletions(-) diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/U b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/U index 95fe4a50d1..99656a7c34 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/U +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/U @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaair b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaair index 1d7db61ae0..9085d9c184 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaair +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaair @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -16,7 +16,7 @@ FoamFile dimensions [0 0 0 0 0 0 0]; -internalField nonuniform List +internalField nonuniform List 2268 ( 0 @@ -2294,19 +2294,19 @@ boundaryField { leftWall { - type alphaContactAngle; + type multiphaseAlphaContactAngle; thetaProperties ( ( water air ) 90 0 0 0 ( oil air ) 90 0 0 0 ( mercury air ) 90 0 0 0 ( water oil ) 90 0 0 0 ( water mercury ) 90 0 0 0 ( oil mercury ) 90 0 0 0 ); value uniform 0; } rightWall { - type alphaContactAngle; + type multiphaseAlphaContactAngle; thetaProperties ( ( water air ) 90 0 0 0 ( oil air ) 90 0 0 0 ( mercury air ) 90 0 0 0 ( water oil ) 90 0 0 0 ( water mercury ) 90 0 0 0 ( oil mercury ) 90 0 0 0 ); value uniform 0; } lowerWall { - type alphaContactAngle; + type multiphaseAlphaContactAngle; thetaProperties ( ( water air ) 90 0 0 0 ( oil air ) 90 0 0 0 ( mercury air ) 90 0 0 0 ( water oil ) 90 0 0 0 ( water mercury ) 90 0 0 0 ( oil mercury ) 90 0 0 0 ); value uniform 0; } diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphamercury b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphamercury index eb770a8d94..9389410632 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphamercury +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphamercury @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaoil b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaoil index c97aec687b..606e71d5b6 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaoil +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphaoil @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphas b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphas index aab82d6b24..a0f116ae89 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphas +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphas @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphawater b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphawater index fb4b3a2c33..05a6fc2edb 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphawater +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphawater @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p index 57caa25d46..b77bfe9118 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/blockMeshDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/blockMeshDict index 46ba31da89..a2553926d2 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/blockMeshDict +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/blockMeshDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary index ff361faec5..41c06d5f3f 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties index 8f819f80d1..006aaccab7 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties @@ -15,11 +15,48 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases ( water { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1e-06 ; rho rho [ 1 -3 0 0 0 0 0 ] 1000 ; } oil { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1e-06 ; rho rho [ 1 -3 0 0 0 0 0 ] 500 ; } mercury { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1.125e-07 ; rho rho [ 1 -3 0 0 0 0 0 ] 13529 ; } air { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05 ; rho rho [ 1 -3 0 0 0 0 0 ] 1 ; } ); +phases +( + water + { + transportModel Newtonian; + nu nu [ 0 2 -1 0 0 0 0 ] 1e-06; + rho rho [ 1 -3 0 0 0 0 0 ] 1000; + } + + oil + { + transportModel Newtonian; + nu nu [ 0 2 -1 0 0 0 0 ] 1e-06; + rho rho [ 1 -3 0 0 0 0 0 ] 500; + } + + mercury + { + transportModel Newtonian; + nu nu [ 0 2 -1 0 0 0 0 ] 1.125e-07; + rho rho [ 1 -3 0 0 0 0 0 ] 13529; + } + + air + { + transportModel Newtonian; + nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05; + rho rho [ 1 -3 0 0 0 0 0 ] 1; + } +); refPhase air; -sigmas ( ( air water ) 0.07 ( air oil ) 0.07 ( air mercury ) 0.07 ( water oil ) 0.07 ( water mercury ) 0.07 ( oil mercury ) 0.07 ); +sigmas +( + (air water) 0.07 + (air oil) 0.07 + (air mercury) 0.07 + (water oil) 0.07 + (water mercury) 0.07 + (oil mercury) 0.07 +); // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes index 4cb658ebde..122c8a0127 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes @@ -30,7 +30,7 @@ gradSchemes divSchemes { div(rho*phi,U) Gauss upwind; - div(phi,alpha) Gauss limitedLimitedLinear 1 -1e-05 1.00001; + div(phi,alpha) Gauss vanLeer; div(phic,alpha) Gauss interfaceCompression; } diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution index 8b11d7fe20..08294be342 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution @@ -94,7 +94,7 @@ PISO nAlphaCorr 4; nAlphaSubCycles 4; cycleAlpha yes; - cAlpha 4; + cAlpha 2; } diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphas b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphas index 1175f827f3..4184b5fb20 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphas +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphas @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary index 265dfa013f..04429b16df 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties index 8f819f80d1..006aaccab7 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties @@ -15,11 +15,48 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases ( water { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1e-06 ; rho rho [ 1 -3 0 0 0 0 0 ] 1000 ; } oil { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1e-06 ; rho rho [ 1 -3 0 0 0 0 0 ] 500 ; } mercury { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1.125e-07 ; rho rho [ 1 -3 0 0 0 0 0 ] 13529 ; } air { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05 ; rho rho [ 1 -3 0 0 0 0 0 ] 1 ; } ); +phases +( + water + { + transportModel Newtonian; + nu nu [ 0 2 -1 0 0 0 0 ] 1e-06; + rho rho [ 1 -3 0 0 0 0 0 ] 1000; + } + + oil + { + transportModel Newtonian; + nu nu [ 0 2 -1 0 0 0 0 ] 1e-06; + rho rho [ 1 -3 0 0 0 0 0 ] 500; + } + + mercury + { + transportModel Newtonian; + nu nu [ 0 2 -1 0 0 0 0 ] 1.125e-07; + rho rho [ 1 -3 0 0 0 0 0 ] 13529; + } + + air + { + transportModel Newtonian; + nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05; + rho rho [ 1 -3 0 0 0 0 0 ] 1; + } +); refPhase air; -sigmas ( ( air water ) 0.07 ( air oil ) 0.07 ( air mercury ) 0.07 ( water oil ) 0.07 ( water mercury ) 0.07 ( oil mercury ) 0.07 ); +sigmas +( + (air water) 0.07 + (air oil) 0.07 + (air mercury) 0.07 + (water oil) 0.07 + (water mercury) 0.07 + (oil mercury) 0.07 +); // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes index 4cb658ebde..122c8a0127 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes @@ -30,7 +30,7 @@ gradSchemes divSchemes { div(rho*phi,U) Gauss upwind; - div(phi,alpha) Gauss limitedLimitedLinear 1 -1e-05 1.00001; + div(phi,alpha) Gauss vanLeer; div(phic,alpha) Gauss interfaceCompression; } diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution index 8b11d7fe20..af2be2341d 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution @@ -81,7 +81,7 @@ solvers { solver smoothSolver; smoother GaussSeidel; - tolerance 1e-08; + tolerance 1e-9; relTol 0; nSweeps 1; } @@ -94,7 +94,7 @@ PISO nAlphaCorr 4; nAlphaSubCycles 4; cycleAlpha yes; - cAlpha 4; + cAlpha 2; } From 460faa33ed0c0fc951b0a5450df91ab8a5fa0697 Mon Sep 17 00:00:00 2001 From: henry Date: Thu, 10 Jun 2010 12:59:34 +0100 Subject: [PATCH 3/5] buoyantSimpleFoam buoyantCavity tutorial: Updated Update not complete. --- .../heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T | 2 +- .../heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U | 2 +- .../heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p | 2 +- .../buoyantCavity/constant/RASProperties | 2 +- .../buoyantCavity/constant/polyMesh/blockMeshDict | 2 +- .../buoyantCavity/constant/polyMesh/boundary | 2 +- .../buoyantCavity/constant/thermophysicalProperties | 2 +- .../buoyantCavity/system/controlDict | 2 +- .../buoyantSimpleFoam/buoyantCavity/system/fvSchemes | 6 +++--- .../buoyantCavity/system/fvSolution | 12 +++++++----- .../buoyantCavity/system/sampleDict | 2 +- 11 files changed, 19 insertions(+), 17 deletions(-) diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T index e270b4ef12..c15520f994 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U index 2858e65d32..3e850b913b 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p index 2eda19d6ad..19224ed2b0 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/RASProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/RASProperties index 28b914fd76..8abafb5ce5 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/RASProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/RASProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/blockMeshDict index 5dbe4b8413..3182880286 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/blockMeshDict +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/blockMeshDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/boundary index 3d13809c69..7cba6d73ec 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/boundary +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties index c1d6b112e9..6f5a818e17 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict index b0a009a45b..e250c63939 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes index 3aa1a122cc..8a7b5900c1 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -39,7 +39,7 @@ laplacianSchemes { default none; laplacian(muEff,U) Gauss linear uncorrected; - laplacian((rho*(1|A(U))),p) Gauss linear uncorrected; + laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected; laplacian(alphaEff,h) Gauss linear uncorrected; laplacian(DkEff,k) Gauss linear uncorrected; laplacian(DepsilonEff,epsilon) Gauss linear uncorrected; @@ -59,7 +59,7 @@ snGradSchemes fluxRequired { default no; - p; + p_rgh; } diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution index 451f5da1aa..2b7472975c 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution @@ -17,11 +17,11 @@ FoamFile solvers { - p + p_rgh { solver GAMG; tolerance 1e-7; - relTol 0.1; + relTol 0.01; smoother DICGaussSeidel; @@ -42,16 +42,18 @@ solvers SIMPLE { + momentumPredictor yes; nNonOrthogonalCorrectors 0; - pRefCell 0; + p_rghRefCell 0; + p_rghRefValue 100000; pRefValue 100000; convergence 1e-04; } relaxationFactors { - p 0.3; - U 0.7; + p_rgh 0.9; + U 0.3; h 0.7; "(k|epsilon|omega)" 0.7; } diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict index 9625d2cd11..e2b70a1cfe 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile From cf1fa7115f488ee66fb892ae83dba03fb77b7d6b Mon Sep 17 00:00:00 2001 From: henry Date: Thu, 10 Jun 2010 13:01:14 +0100 Subject: [PATCH 4/5] Tutorial updates -- incomplete. These changes are pushed to avoid continuous merge conflicts caused by scripted changes to all the tutorial files. --- .../hotRoom/constant/polyMesh/boundary | 2 +- .../hotRoom/system/fvSchemes | 6 ++---- .../hotRoom/system/fvSolution | 7 ++++--- .../iglooWithFridges/constant/polyMesh/boundary | 2 +- .../iglooWithFridges/system/controlDict | 2 +- .../iglooWithFridges/system/fvSchemes | 16 ++++++++-------- .../iglooWithFridges/system/fvSolution | 14 +++++++------- .../ras/throttle/constant/polyMesh/boundary | 2 +- .../cavitatingFoam/ras/throttle/system/fvSchemes | 8 ++++---- 9 files changed, 29 insertions(+), 30 deletions(-) diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/boundary index b66c382b6a..0d4d0e498d 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/boundary +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes index 5471bec4f4..7547301c0a 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes @@ -32,8 +32,6 @@ divSchemes div(phi,T) Gauss upwind; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; - div(phi,R) Gauss upwind; - div(R) Gauss linear; div((nuEff*dev(grad(U).T()))) Gauss linear; } @@ -41,7 +39,7 @@ laplacianSchemes { default none; laplacian(nuEff,U) Gauss linear corrected; - laplacian((1|A(U)),p) Gauss linear corrected; + laplacian((1|A(U)),p_rgh) Gauss linear corrected; laplacian(kappaEff,T) Gauss linear corrected; laplacian(DkEff,k) Gauss linear corrected; laplacian(DepsilonEff,epsilon) Gauss linear corrected; @@ -61,7 +59,7 @@ snGradSchemes fluxRequired { default no; - p ; + p_rgh ; } diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution index e27eae3fe5..672d6cc22c 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution @@ -17,7 +17,7 @@ FoamFile solvers { - p + p_rgh { solver PCG; preconditioner DIC; @@ -37,14 +37,15 @@ solvers SIMPLE { nNonOrthogonalCorrectors 0; - pRefCell 0; + p_rghRefCell 0; + p_rghRefValue 0; pRefValue 0; } relaxationFactors { rho 1; - p 0.7; + p_rgh 0.7; U 0.2; T 0.7; "(k|epsilon|R)" 0.7; diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary index ed36d6f6c4..e0608ea9d7 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict index 9ed612f7fd..5d61414e9e 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict @@ -23,7 +23,7 @@ startTime 0; stopAt endTime; -endTime 1000; +endTime 2000; deltaT 1; diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes index 5471bec4f4..c08ba97414 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes @@ -40,12 +40,12 @@ divSchemes laplacianSchemes { default none; - laplacian(nuEff,U) Gauss linear corrected; - laplacian((1|A(U)),p) Gauss linear corrected; - laplacian(kappaEff,T) Gauss linear corrected; - laplacian(DkEff,k) Gauss linear corrected; - laplacian(DepsilonEff,epsilon) Gauss linear corrected; - laplacian(DREff,R) Gauss linear corrected; + laplacian(nuEff,U) Gauss linear limited 0.333; + laplacian((1|A(U)),p_rgh) Gauss linear limited 0.333; + laplacian(kappaEff,T) Gauss linear limited 0.333; + laplacian(DkEff,k) Gauss linear limited 0.333; + laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333; + laplacian(DREff,R) Gauss linear limited 0.333; } interpolationSchemes @@ -55,13 +55,13 @@ interpolationSchemes snGradSchemes { - default corrected; + default limited 0.333; } fluxRequired { default no; - p ; + p_rgh ; } diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution index b04fdc8e05..0e0e41fd80 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution @@ -17,7 +17,7 @@ FoamFile solvers { - p + p_rgh { solver PCG; preconditioner DIC; @@ -25,7 +25,7 @@ solvers relTol 0.01; } - "(U|T|k|epsilon|R)" + "(U|T|k|epsilon)" { solver PBiCG; preconditioner DILU; @@ -37,17 +37,17 @@ solvers SIMPLE { nNonOrthogonalCorrectors 0; - pRefCell 0; + p_rghRefCell 0; + p_rghRefValue 0; pRefValue 0; } relaxationFactors { - rho 1; - p 0.3; - U 0.7; + p_rgh 0.8; + U 0.2; T 0.7; - "(k|epsilon|R)" 0.7; + "(k|epsilon)" 0.7; } diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary index b5008d95cd..03d26bcf3c 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes index 3aa1b53f3f..0a25b3fe77 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes @@ -28,10 +28,10 @@ interpolationSchemes divSchemes { default none; - div(phiv,rho) Gauss limitedLinear 0.2; - div(phi,U) Gauss limitedLinearV 0.2; - div(phiv,omega) Gauss limitedLinear 0.2; - div(phiv,k) Gauss limitedLinear 0.2; + div(phiv,rho) Gauss limitedLinear 1; + div(phi,U) Gauss limitedLinearV 1; + div(phiv,omega) Gauss limitedLinear 1; + div(phiv,k) Gauss limitedLinear 1; } gradSchemes From bd77d50b5ffca4683da5232f85a774df6cf3ead9 Mon Sep 17 00:00:00 2001 From: henry Date: Thu, 10 Jun 2010 13:15:04 +0100 Subject: [PATCH 5/5] Miscellaneous developments from Hilary --- .../extrudeMesh/extrudeModel/linearRadial/linearRadial.C | 4 +++- .../extrudeMesh/extrudeModel/linearRadial/linearRadial.H | 1 + .../interpolation/interpolationCell/interpolationCell.H | 2 +- .../interpolationCellPoint/interpolationCellPoint.H | 3 ++- .../volPointInterpolation/volPointInterpolation.H | 3 ++- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.C b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.C index 21c6813526..ca3631f224 100644 --- a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.C +++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.C @@ -43,7 +43,8 @@ addToRunTimeSelectionTable(extrudeModel, linearRadial, dictionary); linearRadial::linearRadial(const dictionary& dict) : extrudeModel(typeName, dict), - R_(readScalar(coeffDict_.lookup("R"))) + R_(readScalar(coeffDict_.lookup("R"))), + Rsurface_(coeffDict_.lookupOrDefault("Rsurface", -1)) {} @@ -65,6 +66,7 @@ point linearRadial::operator() // radius of the surface scalar rs = mag(surfacePoint); vector rsHat = surfacePoint/rs; + if (Rsurface_ >= 0) rs = Rsurface_; scalar r = rs + (R_ - rs)*sumThickness(layer); return r*rsHat; diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.H b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.H index 9b481dee06..9b42bb6690 100644 --- a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.H +++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.H @@ -51,6 +51,7 @@ class linearRadial // Private data scalar R_; + scalar Rsurface_; public: diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H b/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H index 994d1cae40..c16d234613 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H +++ b/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H @@ -25,7 +25,7 @@ Class Foam::interpolationCell Description - Foam::interpolationCell + Uses the cell value for any point in the cell \*---------------------------------------------------------------------------*/ diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H index b187d3ff08..ab37149b14 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H +++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H @@ -25,7 +25,8 @@ Class Foam::interpolationCellPoint Description - Foam::interpolationCellPoint + Given cell centre values and point (vertex) values decompose into + tetrahedra and linear interpolate within them. \*---------------------------------------------------------------------------*/ diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H index fb46d50a87..d850c1b68d 100644 --- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H +++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H @@ -25,7 +25,8 @@ Class Foam::volPointInterpolation Description - Foam::volPointInterpolation + Interpolate from cell centres to points (vertices) using inverse distance + weighting SourceFiles volPointInterpolation.C