diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake b/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake index 421f05ab35..8f1133699c 100755 --- a/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake +++ b/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake @@ -3,8 +3,8 @@ cd ${0%/*} || exit 1 # run from this directory set -x wmake libso phaseModel -wmake libso multiphaseSystem wmake libso interfacialModels +wmake libso multiphaseSystem wmake libso kineticTheoryModels wmake diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options index d4cfc30136..8fc20e8623 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options @@ -1,4 +1,4 @@ -EXE_INC = -ggdb3 \ +EXE_INC = \ -IphaseModel/lnInclude \ -ImultiphaseSystem/lnInclude \ /*-IkineticTheoryModels/lnInclude*/ \ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H b/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H index 1d12ba871d..1ee149c48e 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H @@ -33,7 +33,7 @@ forAllIter(PtrDictionary, fluid.phases(), iter) + (alpha/phase.rho())*fluid.Svm(phase) ) ); - mrfZones.addCoriolis(UEqns[phasei]); + mrfZones.addCoriolis(alpha, UEqns[phasei]); UEqns[phasei].relax(); phasei++; diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options index e956bfdc91..231ff8a2ce 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options @@ -1,4 +1,4 @@ -EXE_INC = -ggdb3 \ +EXE_INC = \ -I../phaseModel/lnInclude \ -I../interfacialModels/lnInclude \ -IalphaContactAngle \ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C index fc4351037b..3382504153 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C @@ -56,9 +56,6 @@ void Foam::multiphaseSystem::calcAlphas() void Foam::multiphaseSystem::solveAlphas() { - word alphaScheme("div(phi,alpha)"); - word alpharScheme("div(phirb,alpha)"); - surfaceScalarField phic(mag(phi_/mesh_.magSf())); PtrList phiAlphaCorrs(phases_.size()); @@ -67,6 +64,7 @@ void Foam::multiphaseSystem::solveAlphas() forAllIter(PtrDictionary, phases_, iter) { phaseModel& phase1 = iter(); + volScalarField& alpha1 = phase1; phase1.phiAlpha() = dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0); @@ -80,7 +78,7 @@ void Foam::multiphaseSystem::solveAlphas() ( phi_, phase1, - alphaScheme + "div(phi," + alpha1.name() + ')' ) ) ); @@ -90,6 +88,7 @@ void Foam::multiphaseSystem::solveAlphas() forAllIter(PtrDictionary, phases_, iter2) { phaseModel& phase2 = iter2(); + volScalarField& alpha2 = phase2; if (&phase2 == &phase1) continue; @@ -100,11 +99,16 @@ void Foam::multiphaseSystem::solveAlphas() *nHatf(phase1, phase2) ); + word phirScheme + ( + "div(phir," + alpha2.name() + ',' + alpha1.name() + ')' + ); + phiAlphaCorr += fvc::flux ( - -fvc::flux(-phir, phase2, alpharScheme), + -fvc::flux(-phir, phase2, phirScheme), phase1, - alpharScheme + phirScheme ); } diff --git a/src/OpenFOAM/matrices/solution/solution.C b/src/OpenFOAM/matrices/solution/solution.C index aa4676f7e5..dde12a8553 100644 --- a/src/OpenFOAM/matrices/solution/solution.C +++ b/src/OpenFOAM/matrices/solution/solution.C @@ -57,9 +57,9 @@ void Foam::solution::read(const dictionary& dict) if (dict.found("relaxationFactors")) { const dictionary& relaxDict(dict.subDict("relaxationFactors")); - if (relaxDict.found("variables")) + if (relaxDict.found("fields")) { - fieldRelaxDict_ = relaxDict.subDict("variables"); + fieldRelaxDict_ = relaxDict.subDict("fields"); eqnRelaxDict_ = relaxDict.subDict("equations"); } else diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files index 1a17d3dcab..ba4f80b0bb 100644 --- a/src/finiteVolume/Make/files +++ b/src/finiteVolume/Make/files @@ -133,7 +133,6 @@ $(derivedFvPatchFields)/fan/fanFvPatchFields.C $(derivedFvPatchFields)/fanPressure/fanPressureFvPatchScalarField.C $(derivedFvPatchFields)/buoyantPressure/buoyantPressureFvPatchScalarField.C $(derivedFvPatchFields)/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C -$(derivedFvPatchFields)/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.C $(derivedFvPatchFields)/fixedInternalValueFvPatchField/fixedInternalValueFvPatchFields.C $(derivedFvPatchFields)/fixedNormalSlip/fixedNormalSlipFvPatchFields.C $(derivedFvPatchFields)/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H index cc4062356f..59e4e14204 100644 --- a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H +++ b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H @@ -73,10 +73,6 @@ inline bool Foam::pimpleControl::loop() if (nOuterCorr_ != 1) { Info<< algorithmName_ << ": iteration " << corr_ + 1 << endl; - } - - if (corr_ != 0) - { storePrevIterFields(); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.C deleted file mode 100644 index be534fb8fa..0000000000 --- a/src/finiteVolume/fields/fvPatchFields/derived/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.C +++ /dev/null @@ -1,177 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "multiphaseFixedFluxPressureFvPatchScalarField.H" -#include "fvPatchFieldMapper.H" -#include "volFields.H" -#include "surfaceFields.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::multiphaseFixedFluxPressureFvPatchScalarField:: -multiphaseFixedFluxPressureFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF -) -: - fixedGradientFvPatchScalarField(p, iF), - UName_("U"), - phiName_("phi"), - rhoName_("rho") -{} - - -Foam::multiphaseFixedFluxPressureFvPatchScalarField:: -multiphaseFixedFluxPressureFvPatchScalarField -( - const multiphaseFixedFluxPressureFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fixedGradientFvPatchScalarField(ptf, p, iF, mapper), - UName_(ptf.UName_), - phiName_(ptf.phiName_), - rhoName_(ptf.rhoName_) -{} - - -Foam::multiphaseFixedFluxPressureFvPatchScalarField:: -multiphaseFixedFluxPressureFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedGradientFvPatchScalarField(p, iF), - UName_(dict.lookupOrDefault("U", "U")), - phiName_(dict.lookupOrDefault("phi", "phi")), - rhoName_(dict.lookupOrDefault("rho", "rho")) -{ - if (dict.found("gradient")) - { - gradient() = scalarField("gradient", dict, p.size()); - fixedGradientFvPatchScalarField::updateCoeffs(); - fixedGradientFvPatchScalarField::evaluate(); - } - else - { - fvPatchField::operator=(patchInternalField()); - gradient() = 0.0; - } -} - - -Foam::multiphaseFixedFluxPressureFvPatchScalarField:: -multiphaseFixedFluxPressureFvPatchScalarField -( - const multiphaseFixedFluxPressureFvPatchScalarField& wbppsf -) -: - fixedGradientFvPatchScalarField(wbppsf), - UName_(wbppsf.UName_), - phiName_(wbppsf.phiName_), - rhoName_(wbppsf.rhoName_) -{} - - -Foam::multiphaseFixedFluxPressureFvPatchScalarField:: -multiphaseFixedFluxPressureFvPatchScalarField -( - const multiphaseFixedFluxPressureFvPatchScalarField& wbppsf, - const DimensionedField& iF -) -: - fixedGradientFvPatchScalarField(wbppsf, iF), - UName_(wbppsf.UName_), - phiName_(wbppsf.phiName_), - rhoName_(wbppsf.rhoName_) -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -void Foam::multiphaseFixedFluxPressureFvPatchScalarField::updateCoeffs() -{ - if (updated()) - { - return; - } - - const fvPatchField& Up = - patch().lookupPatchField(UName_); - - const surfaceScalarField& phi = - db().lookupObject(phiName_); - - fvsPatchField phip = - patch().patchField(phi); - - if (phi.dimensions() == dimDensity*dimVelocity*dimArea) - { - const fvPatchField& rhop = - patch().lookupPatchField(rhoName_); - - phip /= rhop; - } - - const fvsPatchField& Dpp = - patch().lookupPatchField("Dp"); - - gradient() = (phip - (patch().Sf() & Up))/patch().magSf()/Dpp; - - fixedGradientFvPatchScalarField::updateCoeffs(); -} - - -void Foam::multiphaseFixedFluxPressureFvPatchScalarField::write -( - Ostream& os -) const -{ - fvPatchScalarField::write(os); - writeEntryIfDifferent(os, "U", "U", UName_); - writeEntryIfDifferent(os, "phi", "phi", phiName_); - writeEntryIfDifferent(os, "rho", "rho", rhoName_); - gradient().writeEntry("gradient", os); -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - makePatchTypeField - ( - fvPatchScalarField, - multiphaseFixedFluxPressureFvPatchScalarField - ); -} - -// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.H deleted file mode 100644 index b97001a5c0..0000000000 --- a/src/finiteVolume/fields/fvPatchFields/derived/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.H +++ /dev/null @@ -1,154 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::multiphaseFixedFluxPressureFvPatchScalarField - -Description - Foam::multiphaseFixedFluxPressureFvPatchScalarField - -SourceFiles - multiphaseFixedFluxPressureFvPatchScalarField.C - -\*---------------------------------------------------------------------------*/ - -#ifndef multiphaseFixedFluxPressureFvPatchScalarFields_H -#define multiphaseFixedFluxPressureFvPatchScalarFields_H - -#include "fvPatchFields.H" -#include "fixedGradientFvPatchFields.H" -#include "Switch.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class multiphaseFixedFluxPressureFvPatch Declaration -\*---------------------------------------------------------------------------*/ - -class multiphaseFixedFluxPressureFvPatchScalarField -: - public fixedGradientFvPatchScalarField -{ - // Private data - - //- Name of the velocity field - word UName_; - - //- Name of the flux transporting the field - word phiName_; - - //- Name of the density field used to normalise the mass flux - // if neccessary - word rhoName_; - - -public: - - //- Runtime type information - TypeName("multiphaseFixedFluxPressure"); - - - // Constructors - - //- Construct from patch and internal field - multiphaseFixedFluxPressureFvPatchScalarField - ( - const fvPatch&, - const DimensionedField& - ); - - //- Construct from patch, internal field and dictionary - multiphaseFixedFluxPressureFvPatchScalarField - ( - const fvPatch&, - const DimensionedField&, - const dictionary& - ); - - //- Construct by mapping given - // multiphaseFixedFluxPressureFvPatchScalarField onto a new patch - multiphaseFixedFluxPressureFvPatchScalarField - ( - const multiphaseFixedFluxPressureFvPatchScalarField&, - const fvPatch&, - const DimensionedField&, - const fvPatchFieldMapper& - ); - - //- Construct as copy - multiphaseFixedFluxPressureFvPatchScalarField - ( - const multiphaseFixedFluxPressureFvPatchScalarField& - ); - - //- Construct and return a clone - virtual tmp clone() const - { - return tmp - ( - new multiphaseFixedFluxPressureFvPatchScalarField(*this) - ); - } - - //- Construct as copy setting internal field reference - multiphaseFixedFluxPressureFvPatchScalarField - ( - const multiphaseFixedFluxPressureFvPatchScalarField&, - const DimensionedField& - ); - - //- Construct and return a clone setting internal field reference - virtual tmp clone - ( - const DimensionedField& iF - ) const - { - return tmp - ( - new multiphaseFixedFluxPressureFvPatchScalarField(*this, iF) - ); - } - - - // Member functions - - //- Update the coefficients associated with the patch field - virtual void updateCoeffs(); - - //- Write - virtual void write(Ostream&) const; -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/polyMesh/boundary b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/polyMesh/boundary index d095df6d18..962b9afbae 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/polyMesh/boundary +++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/polyMesh/boundary @@ -31,7 +31,7 @@ FoamFile } region0_to_wallFilmRegion_wallFilmFaces { - type directMappedWall; + type mappedWall; nFaces 1100; startFace 68110; sampleMode nearestPatchFace; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/extrudeToRegionMeshDict index 3f479896a9..92b3f984e1 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/extrudeToRegionMeshDict +++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/extrudeToRegionMeshDict @@ -26,7 +26,7 @@ nLayers 1; expansionRatio 1; -adaptMesh yes; // apply directMapped to both regions +adaptMesh yes; // apply mapped to both regions linearNormalCoeffs { diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T index 3a51985a8d..070a82b341 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T @@ -29,7 +29,7 @@ boundaryField wallFilm { type zeroGradient; -// type directMapped; +// type mapped; // fieldName Tsf; // average 300; // setAverage no; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U index 500f49a3e0..f996f5adf1 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U @@ -30,7 +30,7 @@ boundaryField { type fixedValue; value uniform (0 0 0); -// type directMapped; +// type mapped; // fieldName Usf; // average (0 0 0); // setAverage no; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict index 6dc270ec3c..d227805e92 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict @@ -22,7 +22,7 @@ dictionaryReplacement { wallFilm { - type directMapped; + type mapped; fieldName Tsf; average 300; setAverage no; @@ -37,7 +37,7 @@ dictionaryReplacement { wallFilm { - type directMapped; + type mapped; fieldName Usf; average (0 0 0); setAverage no; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/extrudeToRegionMeshDict index 0a2be0f2ab..35ce583303 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/extrudeToRegionMeshDict +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/extrudeToRegionMeshDict @@ -30,7 +30,7 @@ nLayers 1; expansionRatio 1; -adaptMesh yes; // apply directMapped to both regions +adaptMesh yes; // apply mapped to both regions linearNormalCoeffs { diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/polyMesh/boundary b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/polyMesh/boundary index 70205845d7..006c08790d 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/polyMesh/boundary +++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/polyMesh/boundary @@ -37,7 +37,7 @@ FoamFile } region0_to_wallFilmRegion_wallFilmFaces { - type directMappedWall; + type mappedWall; nFaces 43200; startFace 130020; sampleMode nearestPatchFace; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/extrudeToRegionMeshDict index 3f479896a9..92b3f984e1 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/extrudeToRegionMeshDict +++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/extrudeToRegionMeshDict @@ -26,7 +26,7 @@ nLayers 1; expansionRatio 1; -adaptMesh yes; // apply directMapped to both regions +adaptMesh yes; // apply mapped to both regions linearNormalCoeffs { diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/extrudeToRegionMeshDict index 3f479896a9..92b3f984e1 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/extrudeToRegionMeshDict +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/extrudeToRegionMeshDict @@ -26,7 +26,7 @@ nLayers 1; expansionRatio 1; -adaptMesh yes; // apply directMapped to both regions +adaptMesh yes; // apply mapped to both regions linearNormalCoeffs { diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphas b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphas index fc0a0cff80..833c25f034 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphas +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphas @@ -17,7 +17,7 @@ FoamFile dimensions [0 0 0 0 0 0 0]; -internalField nonuniform List +internalField nonuniform List 1875 ( 1 diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes index fe3f1e6de4..feb67860ae 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes @@ -29,8 +29,8 @@ divSchemes { default none; - div(phi,alpha) Gauss upwind; //limitedLinear01 1; - div(phirb,alpha) Gauss upwind; + "div\(phi,alpha.*\)" Gauss vanLeer; + "div\(phir,alpha.*,alpha.*\)" Gauss vanLeer; "div\(phiAlpha.*,U.*\)" Gauss limitedLinearV 1; div(Rc) Gauss linear; @@ -39,7 +39,7 @@ divSchemes laplacianSchemes { - default Gauss linear uncorrected; + default Gauss linear corrected; } interpolationSchemes @@ -49,7 +49,7 @@ interpolationSchemes snGradSchemes { - default uncorrected; + default corrected; } fluxRequired diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p index 318a5d779c..7d12a33956 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p @@ -22,25 +22,25 @@ boundaryField { leftWall { - type buoyantPressure; + type multiphaseFixedFluxPressure; value uniform 0; } rightWall { - type buoyantPressure; + type multiphaseFixedFluxPressure; value uniform 0; } lowerWall { - type buoyantPressure; + type multiphaseFixedFluxPressure; value uniform 0; } atmosphere { - type fixedValue; //totalPressure; + type totalPressure; p0 uniform 0; U Uair; phi phiair; diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes index cd9e871aaf..5a4bb79d96 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes @@ -27,12 +27,12 @@ gradSchemes divSchemes { - div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss vanLeer; + "div\(phi,alpha.*\)" Gauss vanLeer; + "div\(phir,alpha.*,alpha.*\)" Gauss vanLeer; - "div\(phiAlpha.*,U.*\)" Gauss upwind; + "div\(phiAlpha.*,U.*\)" Gauss limitedLinearV 1; div(Rc) Gauss linear; - "div\(phi.*,U.*\)" Gauss upwind; + "div\(phi.*,U.*\)" Gauss limitedLinearV 1; } laplacianSchemes