From c6b11dd751f92a95ebaddade897276a867781da1 Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 1 Mar 2012 17:48:22 +0000 Subject: [PATCH 1/7] ENH: renumberMesh: add zoltan --- .../mesh/manipulation/renumberMesh/Allwmake | 12 +- .../manipulation/renumberMesh/Make/options | 4 +- .../manipulation/renumberMesh/renumberMesh.C | 14 + .../renumberMesh/renumberMeshDict | 7 + src/renumber/Allwmake | 16 +- src/renumber/zoltanRenumber/Make/files | 3 + src/renumber/zoltanRenumber/Make/options | 13 + src/renumber/zoltanRenumber/zoltanRenumber.C | 373 ++++++++++++++++++ src/renumber/zoltanRenumber/zoltanRenumber.H | 130 ++++++ 9 files changed, 561 insertions(+), 11 deletions(-) create mode 100644 src/renumber/zoltanRenumber/Make/files create mode 100644 src/renumber/zoltanRenumber/Make/options create mode 100644 src/renumber/zoltanRenumber/zoltanRenumber.C create mode 100644 src/renumber/zoltanRenumber/zoltanRenumber.H diff --git a/applications/utilities/mesh/manipulation/renumberMesh/Allwmake b/applications/utilities/mesh/manipulation/renumberMesh/Allwmake index f5f12d5993..250914574f 100755 --- a/applications/utilities/mesh/manipulation/renumberMesh/Allwmake +++ b/applications/utilities/mesh/manipulation/renumberMesh/Allwmake @@ -1,12 +1,20 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory -export SLOAN_LINK_FLAGS='' +export COMPILE_FLAGS='' +export LINK_FLAGS='' if [ -f "${FOAM_LIBBIN}/libSloanRenumber.so" ] then echo "Found libSloanRenumber.so -- enabling Sloan renumbering support." - export SLOAN_LINK_FLAGS="-lSloanRenumber" + export LINK_FLAGS="${LINK_FLAGS} -lSloanRenumber" +fi + +if [ "${ZOLTAN_ARCH_PATH}/lib/libzoltan.a" -a -f "${FOAM_LIBBIN}/libzoltanRenumber.so" ] +then + echo "Found libzoltanRenumber.so -- enabling zoltan renumbering support." + export COMPILE_FLAGS="-DFOAM_USE_ZOLTAN" + export LINK_FLAGS="${LINK_FLAGS} -lzoltanRenumber -L${ZOLTAN_ARCH_PATH}/lib -lzoltan" fi wmake diff --git a/applications/utilities/mesh/manipulation/renumberMesh/Make/options b/applications/utilities/mesh/manipulation/renumberMesh/Make/options index 23661b3e95..49a1c3d2e3 100644 --- a/applications/utilities/mesh/manipulation/renumberMesh/Make/options +++ b/applications/utilities/mesh/manipulation/renumberMesh/Make/options @@ -1,9 +1,11 @@ EXE_INC = \ /* -DFULLDEBUG -g -O0 */ \ + ${COMPILE_FLAGS} \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/renumber/renumberMethods/lnInclude \ + -I$(LIB_SRC)/renumber/zoltanRenumber/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude EXE_LIBS = \ @@ -12,5 +14,5 @@ EXE_LIBS = \ -lfiniteVolume \ -lgenericPatchFields \ -lrenumberMethods \ - $(SLOAN_LINK_FLAGS) \ + $(LINK_FLAGS) \ -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lmetisDecomp -lscotchDecomp diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C index 9c5d0b8de2..c0d8982880 100644 --- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C +++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C @@ -47,6 +47,11 @@ Description #include "CuthillMcKeeRenumber.H" #include "fvMeshSubset.H" +#ifdef FOAM_USE_ZOLTAN +# include "zoltanRenumber.H" +#endif + + using namespace Foam; @@ -577,6 +582,15 @@ int main(int argc, char *argv[]) "calculate the rms of the frontwidth" ); + +// Force linker to include zoltan symbols. This section is only needed since +// Zoltan is a static library +#ifdef FOAM_USE_ZOLTAN + Info<< "renumberMesh built with zoltan support." << nl << endl; + (void)zoltanRenumber::typeName; +#endif + + # include "setRootCase.H" # include "createTime.H" runTime.functionObjects().off(); diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict b/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict index 7430ea3441..b3393b10e3 100644 --- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict +++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict @@ -42,6 +42,7 @@ method CuthillMcKee; //method random; //method spring; //method boundaryFirst; +//method zoltan; // only if compiled with zoltan support //CuthillMcKeeCoeffs //{ @@ -83,4 +84,10 @@ blockCoeffs } +zoltanCoeffs +{ + ORDER_METHOD LOCAL_HSFC; +} + + // ************************************************************************* // diff --git a/src/renumber/Allwmake b/src/renumber/Allwmake index 3e28994c25..d7f72d93be 100755 --- a/src/renumber/Allwmake +++ b/src/renumber/Allwmake @@ -28,13 +28,13 @@ else fi -#if [ -n "$ZOLTAN_ARCH_PATH" ] -#then -# wmake $makeType zoltanRenumber -#else -# echo -# echo "Skipping zoltanRenumber" -# echo -#fi +if [ -n "$ZOLTAN_ARCH_PATH" ] +then + wmake $makeType zoltanRenumber +else + echo + echo "Skipping zoltanRenumber" + echo +fi # ----------------------------------------------------------------- end-of-file diff --git a/src/renumber/zoltanRenumber/Make/files b/src/renumber/zoltanRenumber/Make/files new file mode 100644 index 0000000000..15659a52d0 --- /dev/null +++ b/src/renumber/zoltanRenumber/Make/files @@ -0,0 +1,3 @@ +zoltanRenumber.C + +LIB = $(FOAM_LIBBIN)/libzoltanRenumber diff --git a/src/renumber/zoltanRenumber/Make/options b/src/renumber/zoltanRenumber/Make/options new file mode 100644 index 0000000000..ef48897a08 --- /dev/null +++ b/src/renumber/zoltanRenumber/Make/options @@ -0,0 +1,13 @@ +sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) +sinclude $(RULES)/mplib$(WM_MPLIB) + +EXE_INC = \ + /* -DFULLDEBUG -g -O0 */ \ + $(PFLAGS) $(PINC) \ + -I$(FOAM_SRC)/renumber/renumberMethods/lnInclude \ + -I$(ZOLTAN_ARCH_PATH)/include/ \ + -I$(LIB_SRC)/meshTools/lnInclude + +LIB_LIBS = \ + -L$(ZOLTAN_ARCH_PATH)/lib -lzoltan \ + -lmeshTools diff --git a/src/renumber/zoltanRenumber/zoltanRenumber.C b/src/renumber/zoltanRenumber/zoltanRenumber.C new file mode 100644 index 0000000000..5118f0b82f --- /dev/null +++ b/src/renumber/zoltanRenumber/zoltanRenumber.C @@ -0,0 +1,373 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2011-2012 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::zoltanRenumber + +Description + Renumber using Zoltan + + Zoltan install: + - in your ~/.bashrc: + export ZOLTAN_ARCH_DIR=\ + $WM_THIRD_PARTY_DIR/platforms/linux64Gcc/Zoltan_XXX + - unpack into $WM_THIRD_PARTY_DIR + - cd Zoltan_XXX + - mkdir build + - cd build + - export CCFLAGS="-fPIC" + - export CXXFLAGS="-fPIC" + - export CFLAGS="-fPIC" + - export LDFLAGS="-shared" + - ../configure \ + --prefix=$ZOLTAN_ARCH_DIR \ + --with-ccflags=-fPIC --with-cxxflags=-fPIC --with-ldflags=-shared + +SourceFiles + zoltanRenumber.C + +\*---------------------------------------------------------------------------*/ + +#include "zoltanRenumber.H" +#include "addToRunTimeSelectionTable.H" +#include "IFstream.H" +#include "labelIOList.H" +#include "polyMesh.H" +#include "globalMeshData.H" +#include "globalIndex.H" +#include "uint.H" + +#include "zoltan.h" +#include + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + defineTypeNameAndDebug(zoltanRenumber, 0); + + addToRunTimeSelectionTable + ( + renumberMethod, + zoltanRenumber, + dictionary + ); +} + + +static int get_number_of_vertices(void *data, int *ierr) +{ + const Foam::polyMesh& mesh = *static_cast(data); + *ierr = ZOLTAN_OK; + return mesh.nCells(); +} + + +static void get_vertex_list(void *data, int sizeGID, int sizeLID, + ZOLTAN_ID_PTR globalID, ZOLTAN_ID_PTR localID, + int wgt_dim, float *obj_wgts, int *ierr) +{ + const Foam::polyMesh& mesh = *static_cast(data); + + *ierr = ZOLTAN_OK; + + /* In this example, return the IDs of our vertices, but no weights. + * Zoltan will assume equally weighted vertices. + */ + + wgt_dim = 0; + obj_wgts = NULL; + + for (Foam::label i=0; i(data); + + if ((sizeGID != 1) || (sizeLID != 1) || (num_obj != mesh.nCells())) + { + *ierr = ZOLTAN_FATAL; + return; + } + + for (Foam::label i=0; i < num_obj ;i++) + { + Foam::label cellI = localID[i]; + const Foam::cell& cFaces = mesh.cells()[cellI]; + forAll(cFaces, cFaceI) + { + Foam::label n = 0; + if (mesh.isInternalFace(cFaces[cFaceI])) + { + n++; + } + numEdges[i] = n; + } + } + + *ierr = ZOLTAN_OK; +} + + +static void get_edge_list(void *data, int sizeGID, int sizeLID, + int num_obj, ZOLTAN_ID_PTR globalID, ZOLTAN_ID_PTR localID, + int *num_edges, + ZOLTAN_ID_PTR nborGID, int *nborProc, + int wgt_dim, float *ewgts, int *ierr) +{ + const Foam::polyMesh& mesh = *static_cast(data); + + if + ( + (sizeGID != 1) + || (sizeLID != 1) + || (num_obj != mesh.nCells()) + || (wgt_dim != 1) + ) + { + *ierr = ZOLTAN_FATAL; + return; + } + + ZOLTAN_ID_TYPE* nextNbor = nborGID; + int* nextProc = nborProc; + float* nextWgt = ewgts; + + for (Foam::label i=0; i < num_obj; i++) + { + Foam::label cellI = localID[i]; + + const Foam::cell& cFaces = mesh.cells()[cellI]; + forAll(cFaces, cFaceI) + { + Foam::label n = 0; + + Foam::label faceI = cFaces[cFaceI]; + if (mesh.isInternalFace(faceI)) + { + Foam::label nbr = mesh.faceOwner()[faceI]; + if (nbr == cellI) + { + nbr = mesh.faceNeighbour()[faceI]; + } + + // Note: global index + *nextNbor++ = nbr; + *nextProc++ = 0; + *nextWgt++ = 1.0; + + n++; + } + if (n != num_edges[i]) + { + *ierr = ZOLTAN_FATAL; + return; + } + } + } + *ierr = ZOLTAN_OK; +} + + +static int get_mesh_dim(void *data, int *ierr) +{ + const Foam::polyMesh& mesh = *static_cast(data); + + return mesh.nSolutionD(); +} + + +static void get_geom_list +( + void *data, + int num_gid_entries, + int num_lid_entries, + int num_obj, + ZOLTAN_ID_PTR global_ids, + ZOLTAN_ID_PTR local_ids, + int num_dim, + double *geom_vec, + int *ierr +) +{ + const Foam::polyMesh& mesh = *static_cast(data); + + if + ( + (num_gid_entries != 1) + || (num_lid_entries != 1) + || (num_obj != mesh.nCells()) + || (num_dim != mesh.nSolutionD()) + ) + { + *ierr = ZOLTAN_FATAL; + return; + } + + double* p = geom_vec; + + + const Foam::Vector& sol = mesh.solutionD(); + + const Foam::pointField& cc = mesh.cellCentres(); + + for (Foam::label cellI = 0; cellI < num_obj; cellI++) + { + const Foam::point& pt = cc[cellI]; + + for (Foam::direction cmpt = 0; cmpt < Foam::vector::nComponents; cmpt++) + { + if (sol[cmpt] == 1) + { + *p++ = pt[cmpt]; + } + } + } + *ierr = ZOLTAN_OK; +} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::zoltanRenumber::zoltanRenumber(const dictionary& renumberDict) +: + renumberMethod(renumberDict), + coeffsDict_(renumberDict.subDict(typeName+"Coeffs")) +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +Foam::labelList Foam::zoltanRenumber::renumber +( + const polyMesh& pMesh, + const pointField& points +) const +{ + stringList args(1); + args[0] = "zoltanRenumber"; + + int argc = args.size(); + char* argv[argc]; + for (label i = 0; i < argc; i++) + { + argv[i] = strdup(args[i].c_str()); + } + + float ver; + int rc = Zoltan_Initialize(argc, argv, &ver); + + Foam::Pout<< "Initialised to " << ver << Foam::endl; + + if (rc != ZOLTAN_OK) + { + FatalErrorIn("zoltanRenumber::renumber(..)") + << "Failed initialising Zoltan" << exit(FatalError); + } + + struct Zoltan_Struct *zz = Zoltan_Create(MPI_COMM_WORLD); + + polyMesh& mesh = const_cast(pMesh); + + + forAllConstIter(IDLList, coeffsDict_, iter) + { + if (!iter().isDict()) + { + const word& key = iter().keyword(); + const word value(iter().stream()); + + Info<< typeName << " : setting parameter " << key + << " to " << value << endl; + + Zoltan_Set_Param(zz, key.c_str(), value.c_str()); + } + } + + + Zoltan_Set_Num_Obj_Fn(zz, get_number_of_vertices, &mesh); + Zoltan_Set_Obj_List_Fn(zz, get_vertex_list, &mesh); + + // Callbacks for geometry + Zoltan_Set_Num_Geom_Fn(zz, get_mesh_dim, &mesh); + Zoltan_Set_Geom_Multi_Fn(zz, get_geom_list, &mesh); + + // Callbacks for connectivity + Zoltan_Set_Num_Edges_Multi_Fn(zz, get_num_edges_list, &mesh); + Zoltan_Set_Edge_List_Multi_Fn(zz, get_edge_list, &mesh); + + + + //Note: !global indices + List wantedCells(mesh.nCells()); + + globalIndex globalCells(mesh.nCells()); + forAll(wantedCells, i) + { + //wantedCells[i] = i; + wantedCells[i] = globalCells.toGlobal(i); + } + + List oldToNew(mesh.nCells()); + + int err = Zoltan_Order + ( + zz, + 1, //int num_gid_entries, + mesh.globalData().nTotalCells(), //int num_obj, + wantedCells.begin(), + oldToNew.begin() + ); + + if (err != ZOLTAN_OK) + { + FatalErrorIn("zoltanRenumber::renumber(..)") + << "Failed Zoltan_Order" << exit(FatalError); + } + + + for (label i = 0; i < argc; i++) + { + free(argv[i]); + } + + + labelList order(oldToNew.size()); + forAll(order, i) + { + order[i] = oldToNew[i]; + } + return order; +} + + +// ************************************************************************* // diff --git a/src/renumber/zoltanRenumber/zoltanRenumber.H b/src/renumber/zoltanRenumber/zoltanRenumber.H new file mode 100644 index 0000000000..a4d317cef9 --- /dev/null +++ b/src/renumber/zoltanRenumber/zoltanRenumber.H @@ -0,0 +1,130 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2011-2012 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::zoltanRenumber + +Description + Use Zoltan + +SourceFiles + zoltanRenumber.C + +\*---------------------------------------------------------------------------*/ + +#ifndef zoltanRenumber_H +#define zoltanRenumber_H + +#include "renumberMethod.H" + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Class zoltanRenumber Declaration +\*---------------------------------------------------------------------------*/ + +class zoltanRenumber +: + public renumberMethod +{ + // Private data + + const dictionary coeffsDict_; + + + + // Private Member Functions + + //- Disallow default bitwise copy construct and assignment + void operator=(const zoltanRenumber&); + zoltanRenumber(const zoltanRenumber&); + + +public: + + //- Runtime type information + TypeName("zoltan"); + + + // Constructors + + //- Construct given the renumber dictionary + zoltanRenumber(const dictionary& renumberDict); + + + //- Destructor + virtual ~zoltanRenumber() + {} + + + // Member Functions + + //- Return the order in which cells need to be visited, i.e. + // from ordered back to original cell label. + // This is only defined for geometric renumberMethods. + virtual labelList renumber(const pointField&) const + { + notImplemented("zoltanRenumber::renumber(const pointField&)"); + return labelList(0); + } + + //- Return the order in which cells need to be visited, i.e. + // from ordered back to original cell label. + // Use the mesh connectivity (if needed) + virtual labelList renumber + ( + const polyMesh& mesh, + const pointField& cc + ) const; + + //- Return the order in which cells need to be visited, i.e. + // from ordered back to original cell label. + // The connectivity is equal to mesh.cellCells() except + // - the connections are across coupled patches + virtual labelList renumber + ( + const labelListList& cellCells, + const pointField& cc + ) const + { + notImplemented + ( + "zoltanRenumber::renumber" + "(const labelListList& cellCellsconst pointField&)" + ); + return labelList(0); + } + +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // From c2041f9dba21f47e50e39f975abf6332f37f42af Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 1 Mar 2012 18:22:59 +0000 Subject: [PATCH 2/7] multiphase: completed phase renaming --- .../compressibleTwoPhaseEulerFoam/TEqns.H | 8 +++---- .../compressibleTwoPhaseEulerFoam/UEqns.H | 8 +++---- .../compressibleTwoPhaseEulerFoam/alphaEqn.H | 12 +++++----- .../createFields.H | 4 +++- .../dragModels/Ergun/Ergun.C | 2 +- .../dragModels/Ergun/Ergun.H | 2 +- .../dragModels/Gibilaro/Gibilaro.C | 2 +- .../dragModels/Gibilaro/Gibilaro.H | 2 +- .../GidaspowErgunWenYu/GidaspowErgunWenYu.C | 2 +- .../GidaspowErgunWenYu/GidaspowErgunWenYu.H | 2 +- .../GidaspowSchillerNaumann.C | 2 +- .../GidaspowSchillerNaumann.H | 2 +- .../SchillerNaumann/SchillerNaumann.C | 2 +- .../SchillerNaumann/SchillerNaumann.H | 2 +- .../dragModels/SyamlalOBrien/SyamlalOBrien.C | 2 +- .../dragModels/SyamlalOBrien/SyamlalOBrien.H | 2 +- .../dragModels/WenYu/WenYu.C | 2 +- .../dragModels/WenYu/WenYu.H | 2 +- .../dragModels/dragModel/dragModel.C | 2 +- .../dragModels/dragModel/dragModel.H | 2 +- .../dragModels/dragModel/newDragModel.C | 2 +- .../RanzMarshall/RanzMarshall.C | 2 +- .../RanzMarshall/RanzMarshall.H | 2 +- .../heatTransferModel/heatTransferModel.C | 2 +- .../heatTransferModel/heatTransferModel.H | 2 +- .../heatTransferModel/newHeatTransferModel.C | 2 +- .../Gidaspow/GidaspowConductivity.C | 2 +- .../Gidaspow/GidaspowConductivity.H | 2 +- .../HrenyaSinclairConductivity.C | 2 +- .../HrenyaSinclairConductivity.H | 2 +- .../Syamlal/SyamlalConductivity.C | 2 +- .../Syamlal/SyamlalConductivity.H | 2 +- .../conductivityModel/conductivityModel.H | 2 +- .../JohnsonJacksonFrictionalStress.C | 24 +++++++++---------- .../JohnsonJacksonFrictionalStress.H | 12 +++++----- .../Schaeffer/SchaefferFrictionalStress.C | 18 +++++++------- .../Schaeffer/SchaefferFrictionalStress.H | 12 +++++----- .../frictionalStressModel.H | 12 +++++----- .../granularPressureModel/Lun/LunPressure.C | 2 +- .../granularPressureModel/Lun/LunPressure.H | 2 +- .../SyamlalRogersOBrienPressure.C | 2 +- .../SyamlalRogersOBrienPressure.H | 2 +- .../granularPressureModel.H | 2 +- .../kineticTheoryModel/kineticTheoryModel.C | 16 ++++++------- .../kineticTheoryModel/kineticTheoryModel.H | 6 ++--- .../CarnahanStarling/CarnahanStarlingRadial.C | 6 ++--- .../CarnahanStarling/CarnahanStarlingRadial.H | 6 ++--- .../radialModel/Gidaspow/GidaspowRadial.C | 12 +++++----- .../radialModel/Gidaspow/GidaspowRadial.H | 6 ++--- .../radialModel/LunSavage/LunSavageRadial.C | 10 ++++---- .../radialModel/LunSavage/LunSavageRadial.H | 6 ++--- .../SinclairJackson/SinclairJacksonRadial.C | 12 +++++----- .../SinclairJackson/SinclairJacksonRadial.H | 6 ++--- .../radialModel/radialModel/radialModel.H | 6 ++--- .../Gidaspow/GidaspowViscosity.C | 2 +- .../Gidaspow/GidaspowViscosity.H | 2 +- .../HrenyaSinclair/HrenyaSinclairViscosity.C | 2 +- .../HrenyaSinclair/HrenyaSinclairViscosity.H | 2 +- .../viscosityModel/Syamlal/SyamlalViscosity.C | 2 +- .../viscosityModel/Syamlal/SyamlalViscosity.H | 2 +- .../viscosityModel/none/noneViscosity.C | 2 +- .../viscosityModel/none/noneViscosity.H | 2 +- .../viscosityModel/viscosityModel.H | 2 +- .../packingLimiter.H | 2 +- .../diameterModel/diameterModel.H | 2 +- .../readPPProperties.H | 4 ++-- .../turbulenceModel/kEpsilon.H | 4 ++-- .../dragModels/Ergun/Ergun.C | 2 +- .../dragModels/Gibilaro/Gibilaro.C | 2 +- .../GidaspowErgunWenYu/GidaspowErgunWenYu.C | 2 +- .../GidaspowSchillerNaumann.C | 2 +- .../dragModels/SyamlalOBrien/SyamlalOBrien.C | 2 +- .../dragModels/WenYu/WenYu.C | 2 +- .../dragModels/dragModel/dragModel.H | 2 +- .../RanzMarshall/RanzMarshall.C | 2 +- .../RanzMarshall/RanzMarshall.H | 2 +- .../heatTransferModel/heatTransferModel.C | 2 +- .../heatTransferModel/heatTransferModel.H | 2 +- .../heatTransferModel/newHeatTransferModel.C | 2 +- .../Gidaspow/GidaspowConductivity.C | 2 +- .../Gidaspow/GidaspowConductivity.H | 2 +- .../HrenyaSinclairConductivity.C | 2 +- .../HrenyaSinclairConductivity.H | 2 +- .../Syamlal/SyamlalConductivity.C | 2 +- .../Syamlal/SyamlalConductivity.H | 2 +- .../conductivityModel/conductivityModel.H | 2 +- .../JohnsonJacksonFrictionalStress.C | 24 +++++++++---------- .../JohnsonJacksonFrictionalStress.H | 12 +++++----- .../Schaeffer/SchaefferFrictionalStress.C | 18 +++++++------- .../Schaeffer/SchaefferFrictionalStress.H | 12 +++++----- .../frictionalStressModel.H | 12 +++++----- .../granularPressureModel/Lun/LunPressure.C | 2 +- .../granularPressureModel/Lun/LunPressure.H | 2 +- .../SyamlalRogersOBrienPressure.C | 2 +- .../SyamlalRogersOBrienPressure.H | 2 +- .../granularPressureModel.H | 2 +- .../kineticTheoryModel/kineticTheoryModel.C | 16 ++++++------- .../kineticTheoryModel/kineticTheoryModel.H | 6 ++--- .../CarnahanStarling/CarnahanStarlingRadial.C | 6 ++--- .../CarnahanStarling/CarnahanStarlingRadial.H | 6 ++--- .../radialModel/Gidaspow/GidaspowRadial.C | 12 +++++----- .../radialModel/Gidaspow/GidaspowRadial.H | 6 ++--- .../radialModel/LunSavage/LunSavageRadial.C | 10 ++++---- .../radialModel/LunSavage/LunSavageRadial.H | 6 ++--- .../SinclairJackson/SinclairJacksonRadial.C | 12 +++++----- .../SinclairJackson/SinclairJacksonRadial.H | 6 ++--- .../radialModel/radialModel/radialModel.H | 6 ++--- .../Gidaspow/GidaspowViscosity.C | 2 +- .../Gidaspow/GidaspowViscosity.H | 2 +- .../HrenyaSinclair/HrenyaSinclairViscosity.C | 2 +- .../HrenyaSinclair/HrenyaSinclairViscosity.H | 2 +- .../viscosityModel/Syamlal/SyamlalViscosity.C | 2 +- .../viscosityModel/Syamlal/SyamlalViscosity.H | 2 +- .../viscosityModel/none/noneViscosity.C | 2 +- .../viscosityModel/none/noneViscosity.H | 2 +- .../viscosityModel/viscosityModel.H | 2 +- .../multiphase/twoPhaseEulerFoam/alphaEqn.H | 2 +- .../dragModels/Ergun/Ergun.C | 2 +- .../dragModels/Ergun/Ergun.H | 2 +- .../dragModels/Gibilaro/Gibilaro.C | 2 +- .../dragModels/Gibilaro/Gibilaro.H | 2 +- .../GidaspowErgunWenYu/GidaspowErgunWenYu.C | 2 +- .../GidaspowErgunWenYu/GidaspowErgunWenYu.H | 2 +- .../GidaspowSchillerNaumann.C | 2 +- .../GidaspowSchillerNaumann.H | 2 +- .../SchillerNaumann/SchillerNaumann.C | 2 +- .../SchillerNaumann/SchillerNaumann.H | 2 +- .../dragModels/SyamlalOBrien/SyamlalOBrien.C | 2 +- .../dragModels/SyamlalOBrien/SyamlalOBrien.H | 2 +- .../dragModels/WenYu/WenYu.C | 2 +- .../dragModels/WenYu/WenYu.H | 2 +- .../dragModels/dragModel/dragModel.C | 2 +- .../dragModels/dragModel/dragModel.H | 2 +- .../dragModels/dragModel/newDragModel.C | 2 +- .../Gidaspow/GidaspowConductivity.C | 2 +- .../Gidaspow/GidaspowConductivity.H | 2 +- .../HrenyaSinclairConductivity.C | 2 +- .../HrenyaSinclairConductivity.H | 2 +- .../Syamlal/SyamlalConductivity.C | 2 +- .../Syamlal/SyamlalConductivity.H | 2 +- .../conductivityModel/conductivityModel.H | 2 +- .../JohnsonJacksonFrictionalStress.C | 24 +++++++++---------- .../JohnsonJacksonFrictionalStress.H | 12 +++++----- .../Schaeffer/SchaefferFrictionalStress.C | 18 +++++++------- .../Schaeffer/SchaefferFrictionalStress.H | 12 +++++----- .../frictionalStressModel.H | 12 +++++----- .../granularPressureModel/Lun/LunPressure.C | 2 +- .../granularPressureModel/Lun/LunPressure.H | 2 +- .../SyamlalRogersOBrienPressure.C | 2 +- .../SyamlalRogersOBrienPressure.H | 2 +- .../granularPressureModel.H | 2 +- .../kineticTheoryModel/kineticTheoryModel.C | 16 ++++++------- .../kineticTheoryModel/kineticTheoryModel.H | 6 ++--- .../CarnahanStarling/CarnahanStarlingRadial.C | 6 ++--- .../CarnahanStarling/CarnahanStarlingRadial.H | 6 ++--- .../radialModel/Gidaspow/GidaspowRadial.C | 12 +++++----- .../radialModel/Gidaspow/GidaspowRadial.H | 6 ++--- .../radialModel/LunSavage/LunSavageRadial.C | 10 ++++---- .../radialModel/LunSavage/LunSavageRadial.H | 6 ++--- .../SinclairJackson/SinclairJacksonRadial.C | 12 +++++----- .../SinclairJackson/SinclairJacksonRadial.H | 6 ++--- .../radialModel/radialModel/radialModel.H | 6 ++--- .../Gidaspow/GidaspowViscosity.C | 2 +- .../Gidaspow/GidaspowViscosity.H | 2 +- .../HrenyaSinclair/HrenyaSinclairViscosity.C | 2 +- .../HrenyaSinclair/HrenyaSinclairViscosity.H | 2 +- .../viscosityModel/Syamlal/SyamlalViscosity.C | 2 +- .../viscosityModel/Syamlal/SyamlalViscosity.H | 2 +- .../viscosityModel/none/noneViscosity.C | 2 +- .../viscosityModel/none/noneViscosity.H | 2 +- .../viscosityModel/viscosityModel.H | 2 +- .../twoPhaseEulerFoam/packingLimiter.H | 2 +- .../twoPhaseEulerFoam/readPPProperties.H | 2 +- .../constant/kineticTheoryProperties | 2 +- .../bubbleColumn/system/fvSolution | 2 +- 175 files changed, 397 insertions(+), 395 deletions(-) diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/TEqns.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/TEqns.H index 978e0d9969..861590b235 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/TEqns.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/TEqns.H @@ -5,8 +5,8 @@ fvScalarMatrix T1Eqn ( fvm::ddt(alpha1, T1) - + fvm::div(alpha1Phi1, T1) - - fvm::Sp(fvc::ddt(alpha1) + fvc::div(alpha1Phi1), T1) + + fvm::div(alphaPhi1, T1) + - fvm::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), T1) - fvm::laplacian(kByCp1, T1) == heatTransferCoeff*T2/Cp1/rho1 @@ -17,8 +17,8 @@ fvScalarMatrix T2Eqn ( fvm::ddt(alpha2, T2) - + fvm::div(alpha1Phi2, T2) - - fvm::Sp(fvc::ddt(alpha2) + fvc::div(alpha1Phi2), T2) + + fvm::div(alphaPhi2, T2) + - fvm::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), T2) - fvm::laplacian(kByCp2, T2) == heatTransferCoeff*T1/Cp2/rho2 diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H index 2990f22a66..ed150abb88 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H @@ -31,8 +31,8 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime); (scalar(1) + Cvm*rho2*alpha2/rho1)* ( fvm::ddt(alpha1, U1) - + fvm::div(alpha1Phi1, U1) - - fvm::Sp(fvc::ddt(alpha1) + fvc::div(alpha1Phi1), U1) + + fvm::div(alphaPhi1, U1) + - fvm::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), U1) ) - fvm::laplacian(alpha1*nuEff1, U1) + fvc::div(alpha1*Rc1) @@ -57,8 +57,8 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime); (scalar(1) + Cvm*rho2*alpha1/rho2)* ( fvm::ddt(alpha2, U2) - + fvm::div(alpha1Phi2, U2) - - fvm::Sp(fvc::ddt(alpha2) + fvc::div(alpha1Phi2), U2) + + fvm::div(alphaPhi2, U2) + - fvm::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), U2) ) - fvm::laplacian(alpha2*nuEff2, U2) + fvc::div(alpha2*Rc2) diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/alphaEqn.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/alphaEqn.H index 85a9999095..fae07312a4 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/alphaEqn.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/alphaEqn.H @@ -1,5 +1,5 @@ -surfaceScalarField alpha1Phi1("alpha1Phi1", phi1); -surfaceScalarField alpha1Phi2("alpha1Phi2", phi2); +surfaceScalarField alphaPhi1("alphaPhi1", phi1); +surfaceScalarField alphaPhi2("alphaPhi2", phi2); { word scheme("div(phi,alpha1)"); @@ -71,14 +71,14 @@ surfaceScalarField alpha1Phi2("alpha1Phi2", phi2); ppMagf = rAU1f*fvc::interpolate ( (1.0/(rho1*(alpha1 + scalar(0.0001)))) - *g0*min(exp(preAlphaExp*(alpha1 - alpha1Max)), expMax) + *g0*min(exp(preAlphaExp*(alpha1 - alphaMax)), expMax) ); alpha1Eqn -= fvm::laplacian ( (fvc::interpolate(alpha1) + scalar(0.0001))*ppMagf, alpha1, - "laplacian(alpha1PpMag,alpha1)" + "laplacian(alphaPpMag,alpha1)" ); } @@ -90,8 +90,8 @@ surfaceScalarField alpha1Phi2("alpha1Phi2", phi2); #include "packingLimiter.H" - alpha1Phi1 = alpha1Eqn.flux(); - alpha1Phi2 = phi - alpha1Phi1; + alphaPhi1 = alpha1Eqn.flux(); + alphaPhi2 = phi - alphaPhi1; alpha2 = scalar(1) - alpha1; Info<< "Dispersed phase volume fraction = " diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H index 87bc71d809..93c35ee1e1 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H @@ -206,7 +206,9 @@ ( "phi", runTime.timeName(), - mesh + mesh, + IOobject::NO_READ, + IOobject::AUTO_WRITE ), fvc::interpolate(alpha1)*phi1 + fvc::interpolate(alpha2)*phi2 ); diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C index 01e57a9e99..5d07ed2168 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H index 077f3a8f4a..558b668884 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C index 59e9a6bb00..c500b5b959 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H index 48a2c4fff3..48c714ee4e 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C index 15a9b7ece4..4fb9a62806 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H index d893bdb615..f92c55f164 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C index 3987b794e1..c3987a4fa3 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H index 67d398237d..a58b4ecb93 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C index bd2275b0f0..d8e8be31c6 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H index 80a4330085..90b64cf07c 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C index d033b669b1..78cb907f45 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H index 711f5b6229..e779a49443 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C index d8b00d0993..60330f23b0 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H index a38fca5d54..3aa601ef04 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C index a305eacda8..0d2ed1c620 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H index 54dc0ec3c6..54791695d5 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C index a7a8d74ae3..00be8a338f 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C index 2d2e4f5646..9bc6cadaf6 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H index cfcb0ba560..6f3d3f9845 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C index 586e931322..b6a85e7cd6 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H index 8006177c5a..47e14fc8c7 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C index 2e9a2b10ed..aaa972032d 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C index b1169797dc..b7e0d3ce9e 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H index 3f36f18bb3..463853a9a8 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C index 3d89e77293..9dd47fb88a 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H index 2ef3d8c42c..2a767f6d34 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C index ef04fe87dd..dcaba6f5ae 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H index 032ce14067..564d2f406e 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H index 4fc3a59ac8..aafe0eb705 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C index bef0d689b3..eb7d029294 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -73,8 +73,8 @@ Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson:: frictionalPressure ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -82,8 +82,8 @@ frictionalPressure { return - Fr*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta) - /pow(max(alpha1Max - alpha1, scalar(5.0e-2)), p); + Fr*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta) + /pow(max(alphaMax - alpha1, scalar(5.0e-2)), p); } @@ -92,8 +92,8 @@ Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson:: frictionalPressurePrime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -101,10 +101,10 @@ frictionalPressurePrime { return Fr* ( - eta*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta - 1.0) - *(alpha1Max-alpha1) - + p*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta) - )/pow(max(alpha1Max - alpha1, scalar(5.0e-2)), p + 1.0); + eta*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta - 1.0) + *(alphaMax-alpha1) + + p*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta) + )/pow(max(alphaMax - alpha1, scalar(5.0e-2)), p + 1.0); } @@ -112,7 +112,7 @@ Foam::tmp Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::muf ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMax, const volScalarField& pf, const volSymmTensorField& D, const dimensionedScalar& phi diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H index 85a0c1431a..985338b741 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,8 +75,8 @@ public: virtual tmp frictionalPressure ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -85,8 +85,8 @@ public: virtual tmp frictionalPressurePrime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -95,7 +95,7 @@ public: virtual tmp muf ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMax, const volScalarField& pf, const volSymmTensorField& D, const dimensionedScalar& phi diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C index 6c855527fb..ec6f55ab65 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -71,8 +71,8 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer:: frictionalPressure ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -80,7 +80,7 @@ frictionalPressure { return dimensionedScalar("1e24", dimensionSet(1, -1, -2, 0, 0), 1e24) - *pow(Foam::max(alpha1 - alpha1MinFriction, scalar(0)), 10.0); + *pow(Foam::max(alpha1 - alphaMinFriction, scalar(0)), 10.0); } @@ -89,8 +89,8 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer:: frictionalPressurePrime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -98,7 +98,7 @@ frictionalPressurePrime { return dimensionedScalar("1e25", dimensionSet(1, -1, -2, 0, 0), 1e25) - *pow(Foam::max(alpha1 - alpha1MinFriction, scalar(0)), 9.0); + *pow(Foam::max(alpha1 - alphaMinFriction, scalar(0)), 9.0); } @@ -106,7 +106,7 @@ Foam::tmp Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::muf ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMax, const volScalarField& pf, const volSymmTensorField& D, const dimensionedScalar& phi @@ -135,7 +135,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::muf forAll (D, celli) { - if (alpha1[celli] > alpha1Max.value() - 5e-2) + if (alpha1[celli] > alphaMax.value() - 5e-2) { muff[celli] = 0.5*pf[celli]*sin(phi.value()) diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H index 00d2fe2227..d99da3a32d 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,8 +75,8 @@ public: virtual tmp frictionalPressure ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -85,8 +85,8 @@ public: virtual tmp frictionalPressurePrime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& n, const dimensionedScalar& p @@ -95,7 +95,7 @@ public: virtual tmp muf ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMax, const volScalarField& pf, const volSymmTensorField& D, const dimensionedScalar& phi diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H index a7843785de..913b2ad105 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -107,8 +107,8 @@ public: virtual tmp frictionalPressure ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -117,8 +117,8 @@ public: virtual tmp frictionalPressurePrime ( const volScalarField& alpha1f, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -127,7 +127,7 @@ public: virtual tmp muf ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMax, const volScalarField& pf, const volSymmTensorField& D, const dimensionedScalar& phi diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C index 3bf8a46633..da8ea176ab 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H index 056a42d40b..ddc9b36633 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C index 4c7e58bb66..a0d51e431a 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H index b41f52e6b0..8555ce9411 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H index 099dbceaf5..76d2701af6 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index 8e04184e01..7d0767914e 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -98,8 +98,8 @@ Foam::kineticTheoryModel::kineticTheoryModel ) ), e_(kineticTheoryProperties_.lookup("e")), - alpha1Max_(kineticTheoryProperties_.lookup("alpha1Max")), - alpha1MinFriction_(kineticTheoryProperties_.lookup("alpha1MinFriction")), + alphaMax_(kineticTheoryProperties_.lookup("alphaMax")), + alphaMinFriction_(kineticTheoryProperties_.lookup("alphaMinFriction")), Fr_(kineticTheoryProperties_.lookup("Fr")), eta_(kineticTheoryProperties_.lookup("eta")), p_(kineticTheoryProperties_.lookup("p")), @@ -219,8 +219,8 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradU1t) // The solution is higly unstable close to the packing limit. gs0_ = radialModel_->g0 ( - min(max(alpha1_, scalar(1e-6)), alpha1Max_ - 0.01), - alpha1Max_ + min(max(alpha1_, scalar(1e-6)), alphaMax_ - 0.01), + alphaMax_ ); // particle pressure - coefficient in front of Theta (Eq. 3.22, p. 45) @@ -341,8 +341,8 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradU1t) frictionalStressModel_->frictionalPressure ( alpha1_, - alpha1MinFriction_, - alpha1Max_, + alphaMinFriction_, + alphaMax_, Fr_, eta_, p_ @@ -363,7 +363,7 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradU1t) frictionalStressModel_->muf ( alpha1_, - alpha1Max_, + alphaMax_, pf, D, phi_ diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H index 381e32dd66..714f83839b 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -92,10 +92,10 @@ class kineticTheoryModel const dimensionedScalar e_; //- maximum packing - const dimensionedScalar alpha1Max_; + const dimensionedScalar alphaMax_; //- min value for which the frictional stresses are zero - const dimensionedScalar alpha1MinFriction_; + const dimensionedScalar alphaMinFriction_; //- material constant for frictional normal stress const dimensionedScalar Fr_; diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C index f16a1015b5..3c147d7d61 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -70,7 +70,7 @@ Foam::tmp Foam::kineticTheoryModels::radialModels::CarnahanStarling::g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { @@ -85,7 +85,7 @@ Foam::tmp Foam::kineticTheoryModels::radialModels::CarnahanStarling::g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { return diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H index 84ada7bb96..b4b825fe12 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -76,13 +76,13 @@ public: tmp g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; tmp g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; }; diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C index b804a6a912..e1c642b4f9 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -70,10 +70,10 @@ Foam::tmp Foam::kineticTheoryModels::radialModels::Gidaspow::g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { - return 0.6/(1.0 - pow(alpha1/alpha1Max, 1.0/3.0)); + return 0.6/(1.0 - pow(alpha1/alphaMax, 1.0/3.0)); } @@ -81,12 +81,12 @@ Foam::tmp Foam::kineticTheoryModels::radialModels::Gidaspow::g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { return - (-1.0/5.0)*pow(alpha1/alpha1Max, -2.0/3.0) - /(alpha1Max*sqr(1.0 - pow(alpha1/alpha1Max, 1.0/3.0))); + (-1.0/5.0)*pow(alpha1/alphaMax, -2.0/3.0) + /(alphaMax*sqr(1.0 - pow(alpha1/alphaMax, 1.0/3.0))); } diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H index 9df6fb08f0..60791274b7 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,13 +75,13 @@ public: tmp g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; tmp g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; }; diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C index fa2a6c359a..e116a4b35e 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -70,11 +70,11 @@ Foam::tmp Foam::kineticTheoryModels::radialModels::LunSavage::g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { - return pow(1.0 - alpha1/alpha1Max, -2.5*alpha1Max); + return pow(1.0 - alpha1/alphaMax, -2.5*alphaMax); } @@ -82,10 +82,10 @@ Foam::tmp Foam::kineticTheoryModels::radialModels::LunSavage::g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { - return 2.5*alpha1Max*alpha1*pow(1.0 - alpha1, -1.0 - 2.5*alpha1Max); + return 2.5*alphaMax*alpha1*pow(1.0 - alpha1, -1.0 - 2.5*alphaMax); } diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H index 8877dc5ae6..4977bfce5e 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,13 +75,13 @@ public: tmp g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; tmp g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; }; diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C index 60f3629c55..cfbdd4baa9 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -70,10 +70,10 @@ Foam::tmp Foam::kineticTheoryModels::radialModels::SinclairJackson::g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { - return 1.0/(1.0 - pow(alpha1/alpha1Max, 1.0/3.0)); + return 1.0/(1.0 - pow(alpha1/alphaMax, 1.0/3.0)); } @@ -81,12 +81,12 @@ Foam::tmp Foam::kineticTheoryModels::radialModels::SinclairJackson::g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { return - (-1.0/3.0)*pow(alpha1/alpha1Max, -2.0/3.0) - /(alpha1Max*sqr(1.0 - pow(alpha1/alpha1Max, 1.0/3.0))); + (-1.0/3.0)*pow(alpha1/alphaMax, -2.0/3.0) + /(alphaMax*sqr(1.0 - pow(alpha1/alphaMax, 1.0/3.0))); } diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H index 68c49ea73f..956cd568ef 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,13 +75,13 @@ public: tmp g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; tmp g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; }; diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H index aba9092a28..a53b8f1a37 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -108,14 +108,14 @@ public: virtual tmp g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const = 0; //- Derivative of the radial distribution function virtual tmp g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const = 0; }; diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C index 4081dc8d2f..55282b6de8 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H index bdb0640367..dd286e8b2d 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C index 40f84c729b..e3c07f91d5 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H index 2f5f2cd5f4..2f1e54fd03 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C index 7eaa3b2901..3bc988bb48 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H index b9c8d6e4e3..d996e0e51a 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C index 9be0466936..f6350844d5 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H index c4382a2c5f..a53ffde21a 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H index 179da0e940..80fb9dafce 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/packingLimiter.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/packingLimiter.H index 1648384bac..249f1035a1 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/packingLimiter.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/packingLimiter.H @@ -1,7 +1,7 @@ if (packingLimiter) { // Calculating exceeding volume fractions - volScalarField alpha1Ex(max(alpha1 - alpha1Max, scalar(0))); + volScalarField alpha1Ex(max(alpha1 - alphaMax, scalar(0))); // Finding neighbouring cells of the whole domain labelListList neighbour = mesh.cellCells(); diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/phaseModel/diameterModels/diameterModel/diameterModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/phaseModel/diameterModels/diameterModel/diameterModel.H index ab45b00f2b..ad4a41e2ed 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/phaseModel/diameterModels/diameterModel/diameterModel.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/phaseModel/diameterModels/diameterModel/diameterModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/readPPProperties.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/readPPProperties.H index 90caafd58c..3acbf758d0 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/readPPProperties.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/readPPProperties.H @@ -15,9 +15,9 @@ readScalar(ppProperties.lookup("preAlphaExp")) ); - scalar alpha1Max + scalar alphaMax ( - readScalar(ppProperties.lookup("alpha1Max")) + readScalar(ppProperties.lookup("alphaMax")) ); scalar expMax diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/turbulenceModel/kEpsilon.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/turbulenceModel/kEpsilon.H index ed9d393af2..7f53411529 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/turbulenceModel/kEpsilon.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/turbulenceModel/kEpsilon.H @@ -15,7 +15,7 @@ if (turbulence) fvScalarMatrix epsEqn ( fvm::ddt(alpha2, epsilon) - + fvm::div(alpha1Phi2, epsilon) + + fvm::div(alphaPhi2, epsilon) - fvm::laplacian ( alpha1Eps*nuEff2, epsilon, @@ -40,7 +40,7 @@ if (turbulence) fvScalarMatrix kEqn ( fvm::ddt(alpha2, k) - + fvm::div(alpha1Phi2, k) + + fvm::div(alphaPhi2, k) - fvm::laplacian ( alpha1k*nuEff2, k, diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C index bca13fc5e5..e640a404c5 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C index 2f41d440ec..176985cd30 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C index fa9e274dc9..9c4c04d579 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C index 10bf069755..5e2048aad1 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C index aef357eee7..83419c54d1 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C index 7958ce0726..fd644f5c5a 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H index 80292be659..bf9f301bdd 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C index 2d2e4f5646..9bc6cadaf6 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H index cfcb0ba560..6f3d3f9845 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C index 586e931322..b6a85e7cd6 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H index afda054008..b4ad05b303 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C index 2e9a2b10ed..aaa972032d 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C index b1169797dc..b7e0d3ce9e 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H index 3f36f18bb3..463853a9a8 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C index 3d89e77293..9dd47fb88a 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H index 2ef3d8c42c..2a767f6d34 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C index ef04fe87dd..dcaba6f5ae 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H index 032ce14067..564d2f406e 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H index 4fc3a59ac8..aafe0eb705 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C index bef0d689b3..eb7d029294 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -73,8 +73,8 @@ Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson:: frictionalPressure ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -82,8 +82,8 @@ frictionalPressure { return - Fr*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta) - /pow(max(alpha1Max - alpha1, scalar(5.0e-2)), p); + Fr*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta) + /pow(max(alphaMax - alpha1, scalar(5.0e-2)), p); } @@ -92,8 +92,8 @@ Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson:: frictionalPressurePrime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -101,10 +101,10 @@ frictionalPressurePrime { return Fr* ( - eta*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta - 1.0) - *(alpha1Max-alpha1) - + p*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta) - )/pow(max(alpha1Max - alpha1, scalar(5.0e-2)), p + 1.0); + eta*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta - 1.0) + *(alphaMax-alpha1) + + p*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta) + )/pow(max(alphaMax - alpha1, scalar(5.0e-2)), p + 1.0); } @@ -112,7 +112,7 @@ Foam::tmp Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::muf ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMax, const volScalarField& pf, const volSymmTensorField& D, const dimensionedScalar& phi diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H index 85a0c1431a..985338b741 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,8 +75,8 @@ public: virtual tmp frictionalPressure ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -85,8 +85,8 @@ public: virtual tmp frictionalPressurePrime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -95,7 +95,7 @@ public: virtual tmp muf ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMax, const volScalarField& pf, const volSymmTensorField& D, const dimensionedScalar& phi diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C index 6c855527fb..ec6f55ab65 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -71,8 +71,8 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer:: frictionalPressure ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -80,7 +80,7 @@ frictionalPressure { return dimensionedScalar("1e24", dimensionSet(1, -1, -2, 0, 0), 1e24) - *pow(Foam::max(alpha1 - alpha1MinFriction, scalar(0)), 10.0); + *pow(Foam::max(alpha1 - alphaMinFriction, scalar(0)), 10.0); } @@ -89,8 +89,8 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer:: frictionalPressurePrime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -98,7 +98,7 @@ frictionalPressurePrime { return dimensionedScalar("1e25", dimensionSet(1, -1, -2, 0, 0), 1e25) - *pow(Foam::max(alpha1 - alpha1MinFriction, scalar(0)), 9.0); + *pow(Foam::max(alpha1 - alphaMinFriction, scalar(0)), 9.0); } @@ -106,7 +106,7 @@ Foam::tmp Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::muf ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMax, const volScalarField& pf, const volSymmTensorField& D, const dimensionedScalar& phi @@ -135,7 +135,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::muf forAll (D, celli) { - if (alpha1[celli] > alpha1Max.value() - 5e-2) + if (alpha1[celli] > alphaMax.value() - 5e-2) { muff[celli] = 0.5*pf[celli]*sin(phi.value()) diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H index 00d2fe2227..d99da3a32d 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,8 +75,8 @@ public: virtual tmp frictionalPressure ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -85,8 +85,8 @@ public: virtual tmp frictionalPressurePrime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& n, const dimensionedScalar& p @@ -95,7 +95,7 @@ public: virtual tmp muf ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMax, const volScalarField& pf, const volSymmTensorField& D, const dimensionedScalar& phi diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H index a7843785de..913b2ad105 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -107,8 +107,8 @@ public: virtual tmp frictionalPressure ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -117,8 +117,8 @@ public: virtual tmp frictionalPressurePrime ( const volScalarField& alpha1f, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -127,7 +127,7 @@ public: virtual tmp muf ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMax, const volScalarField& pf, const volSymmTensorField& D, const dimensionedScalar& phi diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C index 3bf8a46633..da8ea176ab 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H index 056a42d40b..ddc9b36633 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C index 4c7e58bb66..a0d51e431a 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H index b41f52e6b0..8555ce9411 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H index 099dbceaf5..76d2701af6 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index 7144ca86c7..f381430870 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -98,8 +98,8 @@ Foam::kineticTheoryModel::kineticTheoryModel ) ), e_(kineticTheoryProperties_.lookup("e")), - alpha1Max_(kineticTheoryProperties_.lookup("alpha1Max")), - alpha1MinFriction_(kineticTheoryProperties_.lookup("alpha1MinFriction")), + alphaMax_(kineticTheoryProperties_.lookup("alphaMax")), + alphaMinFriction_(kineticTheoryProperties_.lookup("alphaMinFriction")), Fr_(kineticTheoryProperties_.lookup("Fr")), eta_(kineticTheoryProperties_.lookup("eta")), p_(kineticTheoryProperties_.lookup("p")), @@ -219,8 +219,8 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradU1t) // The solution is higly unstable close to the packing limit. gs0_ = radialModel_->g0 ( - min(max(alpha1_, scalar(1e-6)), alpha1Max_ - 0.01), - alpha1Max_ + min(max(alpha1_, scalar(1e-6)), alphaMax_ - 0.01), + alphaMax_ ); // particle pressure - coefficient in front of Theta (Eq. 3.22, p. 45) @@ -341,8 +341,8 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradU1t) frictionalStressModel_->frictionalPressure ( alpha1_, - alpha1MinFriction_, - alpha1Max_, + alphaMinFriction_, + alphaMax_, Fr_, eta_, p_ @@ -363,7 +363,7 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradU1t) frictionalStressModel_->muf ( alpha1_, - alpha1Max_, + alphaMax_, pf, D, phi_ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H index 0db435f580..9e1e23715d 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -92,10 +92,10 @@ class kineticTheoryModel const dimensionedScalar e_; //- maximum packing - const dimensionedScalar alpha1Max_; + const dimensionedScalar alphaMax_; //- min value for which the frictional stresses are zero - const dimensionedScalar alpha1MinFriction_; + const dimensionedScalar alphaMinFriction_; //- material constant for frictional normal stress const dimensionedScalar Fr_; diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C index f16a1015b5..3c147d7d61 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -70,7 +70,7 @@ Foam::tmp Foam::kineticTheoryModels::radialModels::CarnahanStarling::g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { @@ -85,7 +85,7 @@ Foam::tmp Foam::kineticTheoryModels::radialModels::CarnahanStarling::g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { return diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H index 84ada7bb96..b4b825fe12 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -76,13 +76,13 @@ public: tmp g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; tmp g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; }; diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C index b804a6a912..e1c642b4f9 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -70,10 +70,10 @@ Foam::tmp Foam::kineticTheoryModels::radialModels::Gidaspow::g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { - return 0.6/(1.0 - pow(alpha1/alpha1Max, 1.0/3.0)); + return 0.6/(1.0 - pow(alpha1/alphaMax, 1.0/3.0)); } @@ -81,12 +81,12 @@ Foam::tmp Foam::kineticTheoryModels::radialModels::Gidaspow::g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { return - (-1.0/5.0)*pow(alpha1/alpha1Max, -2.0/3.0) - /(alpha1Max*sqr(1.0 - pow(alpha1/alpha1Max, 1.0/3.0))); + (-1.0/5.0)*pow(alpha1/alphaMax, -2.0/3.0) + /(alphaMax*sqr(1.0 - pow(alpha1/alphaMax, 1.0/3.0))); } diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H index 9df6fb08f0..60791274b7 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,13 +75,13 @@ public: tmp g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; tmp g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; }; diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C index fa2a6c359a..e116a4b35e 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -70,11 +70,11 @@ Foam::tmp Foam::kineticTheoryModels::radialModels::LunSavage::g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { - return pow(1.0 - alpha1/alpha1Max, -2.5*alpha1Max); + return pow(1.0 - alpha1/alphaMax, -2.5*alphaMax); } @@ -82,10 +82,10 @@ Foam::tmp Foam::kineticTheoryModels::radialModels::LunSavage::g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { - return 2.5*alpha1Max*alpha1*pow(1.0 - alpha1, -1.0 - 2.5*alpha1Max); + return 2.5*alphaMax*alpha1*pow(1.0 - alpha1, -1.0 - 2.5*alphaMax); } diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H index 8877dc5ae6..4977bfce5e 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,13 +75,13 @@ public: tmp g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; tmp g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; }; diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C index 60f3629c55..cfbdd4baa9 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -70,10 +70,10 @@ Foam::tmp Foam::kineticTheoryModels::radialModels::SinclairJackson::g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { - return 1.0/(1.0 - pow(alpha1/alpha1Max, 1.0/3.0)); + return 1.0/(1.0 - pow(alpha1/alphaMax, 1.0/3.0)); } @@ -81,12 +81,12 @@ Foam::tmp Foam::kineticTheoryModels::radialModels::SinclairJackson::g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { return - (-1.0/3.0)*pow(alpha1/alpha1Max, -2.0/3.0) - /(alpha1Max*sqr(1.0 - pow(alpha1/alpha1Max, 1.0/3.0))); + (-1.0/3.0)*pow(alpha1/alphaMax, -2.0/3.0) + /(alphaMax*sqr(1.0 - pow(alpha1/alphaMax, 1.0/3.0))); } diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H index 68c49ea73f..956cd568ef 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,13 +75,13 @@ public: tmp g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; tmp g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; }; diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H index aba9092a28..a53b8f1a37 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -108,14 +108,14 @@ public: virtual tmp g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const = 0; //- Derivative of the radial distribution function virtual tmp g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const = 0; }; diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C index 4081dc8d2f..55282b6de8 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H index bdb0640367..dd286e8b2d 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C index 40f84c729b..e3c07f91d5 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H index 2f5f2cd5f4..2f1e54fd03 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C index 7eaa3b2901..3bc988bb48 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H index b9c8d6e4e3..d996e0e51a 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C index 9be0466936..f6350844d5 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H index c4382a2c5f..a53ffde21a 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H index 179da0e940..80fb9dafce 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H index 126bffbdf4..52f09e4793 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H @@ -27,7 +27,7 @@ ppMagf = rAU1f*fvc::interpolate ( (1.0/(rho1*(alpha1 + scalar(0.0001)))) - *g0*min(exp(preAlphaExp*(alpha1 - alpha1Max)), expMax) + *g0*min(exp(preAlphaExp*(alpha1 - alphaMax)), expMax) ); alpha1Eqn -= fvm::laplacian diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C index fa29439ae8..e3a7ffd097 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H index c1cdcb21aa..2a3de8192c 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C index 6934e14aa1..cbb9fb9ade 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H index a8dfd78437..9be5dd8cf3 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C index 60a79baa33..5cf712a251 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H index bec127589e..64dfdc08cc 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C index 6a47bdd185..f6438794f7 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H index 39347b0320..3199c2eb54 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C index f822455fd9..184f644466 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H index 3369abbf51..c2962f3b42 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C index a74b8c3a2f..9cb0ce7854 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H index aaaebdd0fe..adc4b439a8 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C index 280c56d23e..5de283e7da 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H index dccf604f4f..16a1978f4f 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C index a305eacda8..0d2ed1c620 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H index caba2f787e..5a29f36354 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C index 91fdf8e1ab..b71a9a692e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C index 50580d738b..c069b99da0 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H index 7e6eb96612..40119b7539 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C index 0c4e4b3da1..9cc0328284 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H index 7da2a877e0..b5004459f3 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C index b97c884223..99d9515f89 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H index 84e6d232c5..9881987d70 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H index c1f964a094..885f710599 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C index fe1b99617f..7ab6f06f0d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -64,8 +64,8 @@ Foam::tmp Foam::JohnsonJacksonFrictionalStress:: frictionalPressure ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -73,8 +73,8 @@ frictionalPressure { return - Fr*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta) - /pow(max(alpha1Max - alpha1, scalar(5.0e-2)), p); + Fr*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta) + /pow(max(alphaMax - alpha1, scalar(5.0e-2)), p); } @@ -82,8 +82,8 @@ Foam::tmp Foam::JohnsonJacksonFrictionalStress:: frictionalPressurePrime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -91,17 +91,17 @@ frictionalPressurePrime { return Fr* ( - eta*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta - 1.0) - *(alpha1Max-alpha1) - + p*pow(max(alpha1 - alpha1MinFriction, scalar(0)), eta) - )/pow(max(alpha1Max - alpha1, scalar(5.0e-2)), p + 1.0); + eta*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta - 1.0) + *(alphaMax-alpha1) + + p*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta) + )/pow(max(alphaMax - alpha1, scalar(5.0e-2)), p + 1.0); } Foam::tmp Foam::JohnsonJacksonFrictionalStress::muf ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMax, const volScalarField& pf, const volSymmTensorField& D, const dimensionedScalar& phi diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H index 4b9a6a6a71..91f480b4ea 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -71,8 +71,8 @@ public: virtual tmp frictionalPressure ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -81,8 +81,8 @@ public: virtual tmp frictionalPressurePrime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -91,7 +91,7 @@ public: virtual tmp muf ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMax, const volScalarField& pf, const volSymmTensorField& D, const dimensionedScalar& phi diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C index 96fad1a2ad..73b2cc57ee 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -64,8 +64,8 @@ Foam::tmp Foam::SchaefferFrictionalStress:: frictionalPressure ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -73,7 +73,7 @@ frictionalPressure { return dimensionedScalar("1e24", dimensionSet(1, -1, -2, 0, 0), 1e24) - *pow(Foam::max(alpha1 - alpha1MinFriction, scalar(0)), 10.0); + *pow(Foam::max(alpha1 - alphaMinFriction, scalar(0)), 10.0); } @@ -81,8 +81,8 @@ Foam::tmp Foam::SchaefferFrictionalStress:: frictionalPressurePrime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -90,14 +90,14 @@ frictionalPressurePrime { return dimensionedScalar("1e25", dimensionSet(1, -1, -2, 0, 0), 1e25) - *pow(Foam::max(alpha1 - alpha1MinFriction, scalar(0)), 9.0); + *pow(Foam::max(alpha1 - alphaMinFriction, scalar(0)), 9.0); } Foam::tmp Foam::SchaefferFrictionalStress::muf ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMax, const volScalarField& pf, const volSymmTensorField& D, const dimensionedScalar& phi @@ -126,7 +126,7 @@ Foam::tmp Foam::SchaefferFrictionalStress::muf forAll (D, celli) { - if (alpha1[celli] > alpha1Max.value() - 5e-2) + if (alpha1[celli] > alphaMax.value() - 5e-2) { muff[celli] = 0.5*pf[celli]*sin(phi.value()) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H index b7b1f3cb0f..d74b0d9127 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -71,8 +71,8 @@ public: virtual tmp frictionalPressure ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -81,8 +81,8 @@ public: virtual tmp frictionalPressurePrime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& n, const dimensionedScalar& p @@ -91,7 +91,7 @@ public: virtual tmp muf ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMax, const volScalarField& pf, const volSymmTensorField& D, const dimensionedScalar& phi diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H index 4bf37cd32b..2242aa4224 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -105,8 +105,8 @@ public: virtual tmp frictionalPressure ( const volScalarField& alpha1, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -115,8 +115,8 @@ public: virtual tmp frictionalPressurePrime ( const volScalarField& alpha1f, - const dimensionedScalar& alpha1MinFriction, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMinFriction, + const dimensionedScalar& alphaMax, const dimensionedScalar& Fr, const dimensionedScalar& eta, const dimensionedScalar& p @@ -125,7 +125,7 @@ public: virtual tmp muf ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max, + const dimensionedScalar& alphaMax, const volScalarField& pf, const volSymmTensorField& D, const dimensionedScalar& phi diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C index 8c58b17d15..abd0be0647 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H index 84550c7d81..e67df01b9a 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C index 39690a2e98..0f676cd08e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H index a1f99b8f94..e9d697a322 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H index c618bf4246..a60f83565f 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index 9eccfb0a95..4aab54c86e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -99,8 +99,8 @@ Foam::kineticTheoryModel::kineticTheoryModel ) ), e_(kineticTheoryProperties_.lookup("e")), - alpha1Max_(kineticTheoryProperties_.lookup("alpha1Max")), - alpha1MinFriction_(kineticTheoryProperties_.lookup("alpha1MinFriction")), + alphaMax_(kineticTheoryProperties_.lookup("alphaMax")), + alphaMinFriction_(kineticTheoryProperties_.lookup("alphaMinFriction")), Fr_(kineticTheoryProperties_.lookup("Fr")), eta_(kineticTheoryProperties_.lookup("eta")), p_(kineticTheoryProperties_.lookup("p")), @@ -218,8 +218,8 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradU1t) // The solution is higly unstable close to the packing limit. gs0_ = radialModel_->g0 ( - min(max(alpha1_, scalar(1e-6)), alpha1Max_ - 0.01), - alpha1Max_ + min(max(alpha1_, scalar(1e-6)), alphaMax_ - 0.01), + alphaMax_ ); // particle pressure - coefficient in front of Theta (Eq. 3.22, p. 45) @@ -340,8 +340,8 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradU1t) frictionalStressModel_->frictionalPressure ( alpha1_, - alpha1MinFriction_, - alpha1Max_, + alphaMinFriction_, + alphaMax_, Fr_, eta_, p_ @@ -362,7 +362,7 @@ void Foam::kineticTheoryModel::solve(const volTensorField& gradU1t) frictionalStressModel_->muf ( alpha1_, - alpha1Max_, + alphaMax_, pf, D, phi_ diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H index 75fe09128e..faee38fbad 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -91,10 +91,10 @@ class kineticTheoryModel const dimensionedScalar e_; //- maximum packing - const dimensionedScalar alpha1Max_; + const dimensionedScalar alphaMax_; //- min value for which the frictional stresses are zero - const dimensionedScalar alpha1MinFriction_; + const dimensionedScalar alphaMinFriction_; //- material constant for frictional normal stress const dimensionedScalar Fr_; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C index a28dc84e72..4fe5517b80 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,7 +60,7 @@ Foam::CarnahanStarlingRadial::~CarnahanStarlingRadial() Foam::tmp Foam::CarnahanStarlingRadial::g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { @@ -74,7 +74,7 @@ Foam::tmp Foam::CarnahanStarlingRadial::g0 Foam::tmp Foam::CarnahanStarlingRadial::g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { return diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H index 00ae96de23..ad92da890b 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -72,13 +72,13 @@ public: tmp g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; tmp g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; }; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C index e5b932fa00..2e633425f4 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,22 +60,22 @@ Foam::GidaspowRadial::~GidaspowRadial() Foam::tmp Foam::GidaspowRadial::g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { - return 0.6/(1.0 - pow(alpha1/alpha1Max, 1.0/3.0)); + return 0.6/(1.0 - pow(alpha1/alphaMax, 1.0/3.0)); } Foam::tmp Foam::GidaspowRadial::g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { return - (-1.0/5.0)*pow(alpha1/alpha1Max, -2.0/3.0) - /(alpha1Max*sqr(1.0 - pow(alpha1/alpha1Max, 1.0/3.0))); + (-1.0/5.0)*pow(alpha1/alphaMax, -2.0/3.0) + /(alphaMax*sqr(1.0 - pow(alpha1/alphaMax, 1.0/3.0))); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H index 5b329ce67b..ed5a83ecea 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -71,13 +71,13 @@ public: tmp g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; tmp g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; }; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C index 3659ed66a3..74cddedec8 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,21 +60,21 @@ Foam::LunSavageRadial::~LunSavageRadial() Foam::tmp Foam::LunSavageRadial::g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { - return pow(1.0 - alpha1/alpha1Max, -2.5*alpha1Max); + return pow(1.0 - alpha1/alphaMax, -2.5*alphaMax); } Foam::tmp Foam::LunSavageRadial::g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { - return 2.5*alpha1Max*alpha1*pow(1.0 - alpha1, -1.0 - 2.5*alpha1Max); + return 2.5*alphaMax*alpha1*pow(1.0 - alpha1, -1.0 - 2.5*alphaMax); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H index 57dcd2b20b..fc8c2daad4 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -71,13 +71,13 @@ public: tmp g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; tmp g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; }; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C index 31ccb15dfc..dfe0fabd46 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,22 +60,22 @@ Foam::SinclairJacksonRadial::~SinclairJacksonRadial() Foam::tmp Foam::SinclairJacksonRadial::g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { - return 1.0/(1.0 - pow(alpha1/alpha1Max, 1.0/3.0)); + return 1.0/(1.0 - pow(alpha1/alphaMax, 1.0/3.0)); } Foam::tmp Foam::SinclairJacksonRadial::g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const { return - (-1.0/3.0)*pow(alpha1/alpha1Max, -2.0/3.0) - /(alpha1Max*sqr(1.0 - pow(alpha1/alpha1Max, 1.0/3.0))); + (-1.0/3.0)*pow(alpha1/alphaMax, -2.0/3.0) + /(alphaMax*sqr(1.0 - pow(alpha1/alphaMax, 1.0/3.0))); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H index df143b9083..83349590d1 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -71,13 +71,13 @@ public: tmp g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; tmp g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const; }; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H index 57b8e1e581..5e88378ff5 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -106,14 +106,14 @@ public: virtual tmp g0 ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const = 0; //- Derivative of the radial distribution function virtual tmp g0prime ( const volScalarField& alpha1, - const dimensionedScalar& alpha1Max + const dimensionedScalar& alphaMax ) const = 0; }; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C index 7016b2fb89..ace82f1ca2 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H index 398a04fb0a..cb6752b900 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C index 33395bd3bb..b20aee6181 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H index f77e6887f2..1b53c14b36 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C index 11d538f50b..2d85163759 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H index 50629e8a85..9c76cce74d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C index 4389995f91..ba42c2bca3 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H index 12426d0a37..6a175c6274 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H index 995dec1219..fbc2579711 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/packingLimiter.H b/applications/solvers/multiphase/twoPhaseEulerFoam/packingLimiter.H index 1648384bac..249f1035a1 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/packingLimiter.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/packingLimiter.H @@ -1,7 +1,7 @@ if (packingLimiter) { // Calculating exceeding volume fractions - volScalarField alpha1Ex(max(alpha1 - alpha1Max, scalar(0))); + volScalarField alpha1Ex(max(alpha1 - alphaMax, scalar(0))); // Finding neighbouring cells of the whole domain labelListList neighbour = mesh.cellCells(); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/readPPProperties.H b/applications/solvers/multiphase/twoPhaseEulerFoam/readPPProperties.H index 4cd123bd8e..a655736c54 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/readPPProperties.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/readPPProperties.H @@ -12,7 +12,7 @@ scalar preAlphaExp(readScalar(ppProperties.lookup("preAlphaExp"))); - scalar alpha1Max(readScalar(ppProperties.lookup("alpha1Max"))); + scalar alphaMax(readScalar(ppProperties.lookup("alphaMax"))); scalar expMax(readScalar(ppProperties.lookup("expMax"))); diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties index 53521fbae3..615c8cb1c4 100644 --- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties +++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties @@ -21,7 +21,7 @@ equilibrium on; e e [ 0 0 0 0 0 0 0 ] 0.9; -alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.6; +alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.6; alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.5; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution index 190811b840..d0491f6d65 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution @@ -86,7 +86,7 @@ relaxationFactors { "U.*" 1; "T.*" 1; - "alpha1.*" 1; + "alpha1.*" 1; "Theta.*" 1; "k.*" 1; "epsilon.*" 1; From 199dc889a617c5662ac1aebb2fe869b04d9265e9 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 1 Mar 2012 18:24:15 +0000 Subject: [PATCH 3/7] MRFtwoPhaseEulerFoam: corrected handling of oldTime fluxes --- .../multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/pEqn.H | 2 ++ 1 file changed, 2 insertions(+) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/pEqn.H index fc8df54ecd..079ecfefe4 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/pEqn.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/pEqn.H @@ -96,11 +96,13 @@ (fvc::interpolate(U1) & mesh.Sf())().boundaryField(); mrfZones.relativeFlux(phi1); phi1 = phiHbyA1 - rAU1f*SfGradp/rho1; + mrfZones.relativeFlux(phi1.oldTime()); phi2.boundaryField() == (fvc::interpolate(U2) & mesh.Sf())().boundaryField(); mrfZones.relativeFlux(phi2); phi2 = phiHbyA2 - rAU2f*SfGradp/rho2; + mrfZones.relativeFlux(phi2.oldTime()); phi = alpha1f*phi1 + alpha2f*phi2; From de10a643ade51258c89cbc38a42a363bfd9f208c Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 2 Mar 2012 10:35:59 +0000 Subject: [PATCH 4/7] COMP: etc/config: update compiler versions --- etc/config/settings.csh | 6 +++--- etc/config/settings.sh | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/etc/config/settings.csh b/etc/config/settings.csh index 5d461ded19..00de3e1790 100644 --- a/etc/config/settings.csh +++ b/etc/config/settings.csh @@ -205,9 +205,9 @@ case ThirdParty: case Gcc++0x: case Gcc46: case Gcc46++0x: - set gcc_version=gcc-4.6.1 - set gmp_version=gmp-5.0.2 - set mpfr_version=mpfr-3.0.1 + set gcc_version=gcc-4.6.2 + set gmp_version=gmp-5.0.4 + set mpfr_version=mpfr-3.1.0 set mpc_version=mpc-0.9 breaksw case Gcc45: diff --git a/etc/config/settings.sh b/etc/config/settings.sh index 192fa817af..a7c7e272c7 100644 --- a/etc/config/settings.sh +++ b/etc/config/settings.sh @@ -233,11 +233,10 @@ case "${foamCompiler}" in OpenFOAM | ThirdParty) case "$WM_COMPILER" in Gcc | Gcc++0x | Gcc46 | Gcc46++0x) - gcc_version=gcc-4.6.1 - gmp_version=gmp-5.0.2 - mpfr_version=mpfr-3.0.1 + gcc_version=gcc-4.6.2 + gmp_version=gmp-5.0.4 + mpfr_version=mpfr-3.1.0 mpc_version=mpc-0.9 - gmpPACKAGE=gmp-5.0.2 ;; Gcc45 | Gcc45++0x) gcc_version=gcc-4.5.2 From 7701ff470fc87128f5745619acd77ef6f7e5fd17 Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 2 Mar 2012 12:10:31 +0000 Subject: [PATCH 5/7] twoPhaseEulerFoam tutorials: updated alpha1Max --- .../twoPhaseEulerFoam/bed/constant/kineticTheoryProperties | 4 ++-- .../multiphase/twoPhaseEulerFoam/bed/constant/ppProperties | 2 +- .../twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties | 4 ++-- .../multiphase/twoPhaseEulerFoam/bed2/constant/ppProperties | 2 +- .../bubbleColumn/constant/kineticTheoryProperties | 4 ++-- .../twoPhaseEulerFoam/bubbleColumn/constant/ppProperties | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties index 9dfe7e43de..53521fbae3 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties @@ -21,9 +21,9 @@ equilibrium on; e e [ 0 0 0 0 0 0 0 ] 0.9; -alpha1Max alpha1Max [ 0 0 0 0 0 0 0 ] 0.6; +alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.6; -alpha1MinFriction alpha1MinFriction [ 0 0 0 0 0 0 0 ] 0.5; +alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.5; Fr Fr [ 1 -1 -2 0 0 0 0 ] 0.05; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/ppProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/ppProperties index db0661409a..8188872bbc 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/ppProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/ppProperties @@ -19,7 +19,7 @@ preAlphaExp 500; expMax 1000; -alpha1Max 0.6; +alphaMax 0.6; g0 g0 [ 1 -1 -2 0 0 0 0 ] 1000; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties index 287bb45221..4433c0caf4 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties @@ -21,9 +21,9 @@ equilibrium on; e e [ 0 0 0 0 0 0 0 ] 0.8; -alpha1Max alpha1Max [ 0 0 0 0 0 0 0 ] 0.62; +alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.62; -alpha1MinFriction alpha1MinFriction [ 0 0 0 0 0 0 0 ] 0.65; +alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.65; Fr Fr [ 1 -1 -2 0 0 0 0 ] 0.05; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/ppProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/ppProperties index 5cd0d1aca1..f6416561c0 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/ppProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/ppProperties @@ -19,7 +19,7 @@ preAlphaExp 500; expMax 1000; -alpha1Max 0.62; +alphaMax 0.62; g0 g0 [ 1 -1 -2 0 0 0 0 ] 0; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties index 9dfe7e43de..53521fbae3 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties @@ -21,9 +21,9 @@ equilibrium on; e e [ 0 0 0 0 0 0 0 ] 0.9; -alpha1Max alpha1Max [ 0 0 0 0 0 0 0 ] 0.6; +alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.6; -alpha1MinFriction alpha1MinFriction [ 0 0 0 0 0 0 0 ] 0.5; +alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.5; Fr Fr [ 1 -1 -2 0 0 0 0 ] 0.05; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/ppProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/ppProperties index 1f92776ea9..eddbfd7ad7 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/ppProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/ppProperties @@ -19,7 +19,7 @@ preAlphaExp 300; expMax 10; -alpha1Max 0.6; +alphaMax 0.6; g0 g0 [ 1 -1 -2 0 0 0 0 ] 0; From 1d93f171ad1831691962172ae45dd3b0b705805e Mon Sep 17 00:00:00 2001 From: laurence Date: Fri, 2 Mar 2012 12:34:24 +0000 Subject: [PATCH 6/7] COMP: Correct Make/options for SloanRenumber and the CGAL rules --- src/renumber/SloanRenumber/Make/options | 2 +- wmake/rules/General/CGAL | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/renumber/SloanRenumber/Make/options b/src/renumber/SloanRenumber/Make/options index 431c883479..492a3ae10f 100644 --- a/src/renumber/SloanRenumber/Make/options +++ b/src/renumber/SloanRenumber/Make/options @@ -1,6 +1,6 @@ EXE_INC = \ /* -DFULLDEBUG -g -O0 */ \ - -I$BOOST_ARCH_PATH/include \ + -I$(BOOST_ARCH_PATH)/include \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/renumber/renumberMethods/lnInclude diff --git a/wmake/rules/General/CGAL b/wmake/rules/General/CGAL index 3586a1de38..126640dc0c 100644 --- a/wmake/rules/General/CGAL +++ b/wmake/rules/General/CGAL @@ -9,5 +9,4 @@ CGAL_LIBS = \ -L$(MPFR_ARCH_PATH)/lib \ -L$(BOOST_ARCH_PATH)/lib \ -lmpfr \ - -I/usr/lib64 \ - -lboost_thread-mt + -lboost_thread From 14594f2ee123439b1a41fe026086457c0ceca796 Mon Sep 17 00:00:00 2001 From: laurence Date: Fri, 2 Mar 2012 16:19:03 +0000 Subject: [PATCH 7/7] BUG: cvMesh: Change == to = in buildParallelInterface --- .../conformalVoronoiMeshConformToSurface.C | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C index 7f4c7abb6e..79a79c3883 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C +++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C @@ -1465,6 +1465,7 @@ void Foam::conformalVoronoiMesh::buildParallelInterfaceInfluence label cIInner = 0; label cIOuter = 0; +// seedProcessorBoundarySurfaces(true); label cellIndexCount = 0; for @@ -1477,6 +1478,7 @@ void Foam::conformalVoronoiMesh::buildParallelInterfaceInfluence cit->cellIndex() = cellIndexCount++; } + timeCheck("End of cell Indexing"); labelList testCellInfluence(number_of_cells(), 0); @@ -1505,7 +1507,7 @@ void Foam::conformalVoronoiMesh::buildParallelInterfaceInfluence ) { nQuickRejections++; - testCellInfluence[cit->cellIndex()] = -1; + //testCellInfluence[cit->cellIndex()] = -1; } } @@ -1528,7 +1530,7 @@ void Foam::conformalVoronoiMesh::buildParallelInterfaceInfluence if ( (testCellInfluence[cit->cellIndex()] == 0) - && (cit->real() || cit->hasFarPoint()) + //&& (cit->real() || cit->hasFarPoint()) ) { const Foam::point& cc = cit->dual();