diff --git a/applications/solvers/multiphase/interDyMFoam/Make/options b/applications/solvers/multiphase/interDyMFoam/Make/options index 74498326a9..b9aa770576 100644 --- a/applications/solvers/multiphase/interDyMFoam/Make/options +++ b/applications/solvers/multiphase/interDyMFoam/Make/options @@ -7,8 +7,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/dynamicFvMesh/lnInclude EXE_LIBS = \ -linterfaceProperties \ @@ -18,5 +17,4 @@ EXE_LIBS = \ -lfiniteVolume \ -ldynamicMesh \ -lmeshTools \ - -ldynamicFvMesh \ - -lsampling + -ldynamicFvMesh diff --git a/applications/solvers/multiphase/interDyMFoam/createFields.H b/applications/solvers/multiphase/interDyMFoam/createFields.H index 0f1efe717f..bcceb9d748 100644 --- a/applications/solvers/multiphase/interDyMFoam/createFields.H +++ b/applications/solvers/multiphase/interDyMFoam/createFields.H @@ -116,34 +116,23 @@ pd + rho*(g & mesh.C()) ); - autoPtr pRefProbe; label pdRefCell = 0; scalar pdRefValue = 0.0; + setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue); + scalar pRefValue = 0.0; if (pd.needReference()) { - pRefProbe.set - ( - new probes - ( - "pRefProbe", - mesh, - mesh.solutionDict().subDict("PISO").subDict("pRefProbe") - ) - ); - pRefValue = readScalar ( mesh.solutionDict().subDict("PISO").lookup("pRefValue") ); - pdRefCell = pRefProbe->cells()[0]; - p += dimensionedScalar ( "p", p.dimensions(), - pRefValue - pRefProbe->sample("p")()[0] + pRefValue - getRefCellValue(p, pdRefCell) ); } diff --git a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C index 0386e6625c..046503a8c4 100644 --- a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C +++ b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C @@ -40,7 +40,6 @@ Description #include "interfaceProperties.H" #include "twoPhaseMixture.H" #include "turbulenceModel.H" -#include "probes.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -123,7 +122,7 @@ int main(int argc, char *argv[]) ( "p", p.dimensions(), - pRefValue - pRefProbe->sample("p")()[0] + pRefValue - getRefCellValue(p, pdRefCell) ); } diff --git a/applications/solvers/multiphase/interFoam/createFields.H b/applications/solvers/multiphase/interFoam/createFields.H index 53dd01672a..7063774752 100644 --- a/applications/solvers/multiphase/interFoam/createFields.H +++ b/applications/solvers/multiphase/interFoam/createFields.H @@ -106,6 +106,23 @@ scalar pdRefValue = 0.0; setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue); + scalar pRefValue = 0.0; + + if (pd.needReference()) + { + pRefValue = readScalar + ( + mesh.solutionDict().subDict("PISO").lookup("pRefValue") + ); + + p += dimensionedScalar + ( + "p", + p.dimensions(), + pRefValue - getRefCellValue(p, pdRefCell) + ); + } + // Construct interface from alpha1 distribution interfaceProperties interface(alpha1, U, twoPhaseProperties); diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C index 7d2048037a..4dd86bd8f7 100644 --- a/applications/solvers/multiphase/interFoam/interFoam.C +++ b/applications/solvers/multiphase/interFoam/interFoam.C @@ -91,6 +91,16 @@ int main(int argc, char *argv[]) p = pd + rho*gh; + if (pd.needReference()) + { + p += dimensionedScalar + ( + "p", + p.dimensions(), + pRefValue - getRefCellValue(p, pdRefCell) + ); + } + turbulence->correct(); runTime.write(); diff --git a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H index 9119631d0c..07650fd4dd 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H +++ b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H @@ -68,6 +68,23 @@ scalar pdRefValue = 0.0; setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue); + scalar pRefValue = 0.0; + + if (pd.needReference()) + { + pRefValue = readScalar + ( + mesh.solutionDict().subDict("PISO").lookup("pRefValue") + ); + + p += dimensionedScalar + ( + "p", + p.dimensions(), + pRefValue - getRefCellValue(p, pdRefCell) + ); + } + // Construct incompressible turbulence model autoPtr turbulence diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C index d0626cbf05..c5fdb5f3c2 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C @@ -83,6 +83,16 @@ int main(int argc, char *argv[]) p = pd + rho*gh; + if (pd.needReference()) + { + p += dimensionedScalar + ( + "p", + p.dimensions(), + pRefValue - getRefCellValue(p, pdRefCell) + ); + } + turbulence->correct(); runTime.write(); diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H index bd7c3e2c9f..a38135dc19 100644 --- a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H +++ b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H @@ -95,6 +95,23 @@ scalar pdRefValue = 0.0; setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue); + scalar pRefValue = 0.0; + + if (pd.needReference()) + { + pRefValue = readScalar + ( + mesh.solutionDict().subDict("PISO").lookup("pRefValue") + ); + + p += dimensionedScalar + ( + "p", + p.dimensions(), + pRefValue - getRefCellValue(p, pdRefCell) + ); + } + // Construct incompressible turbulence model autoPtr turbulence diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C index be8eea9061..1caf455708 100644 --- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C +++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C @@ -75,6 +75,16 @@ int main(int argc, char *argv[]) p = pd + rho*gh; + if (pd.needReference()) + { + p += dimensionedScalar + ( + "p", + p.dimensions(), + pRefValue - getRefCellValue(p, pdRefCell) + ); + } + turbulence->correct(); runTime.write(); diff --git a/etc/apps/cint/bashrc b/etc/apps/cint/bashrc index 51b9a3400e..dbbd89631e 100644 --- a/etc/apps/cint/bashrc +++ b/etc/apps/cint/bashrc @@ -41,7 +41,7 @@ do export CINTSYSDIR export PATH=$PATH:$CINTSYSDIR/bin export MANPATH=$MANPATH:$CINTSYSDIR/doc - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$CINTSYSDIR/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$CINTSYSDIR/lib break fi done diff --git a/etc/bashrc b/etc/bashrc index 93f2658e45..edd0265b63 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -256,7 +256,7 @@ cleanEnv=`$cleanProg "$PATH"` && PATH="$cleanEnv" cleanEnv=`$cleanProg "$LD_LIBRARY_PATH"` && LD_LIBRARY_PATH="$cleanEnv" #- Clean MANPATH -cleanEnv=`$cleanProg "$MANPATH"` && MANPATH="$cleanEnv" +cleanEnv=`$cleanProg "$MANPATH"` && MANPATH="$cleanEnv:" export PATH LD_LIBRARY_PATH MANPATH diff --git a/etc/cshrc b/etc/cshrc index 77c432d5dc..17e75ba888 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -257,7 +257,7 @@ endif setenv LD_LIBRARY_PATH `$cleanProg "$LD_LIBRARY_PATH"` #- Clean MANPATH -setenv MANPATH `$cleanProg "$MANPATH"` +setenv MANPATH `$cleanProg "$MANPATH"`: #- Clean LD_PRELOAD if ( $?LD_PRELOAD ) then diff --git a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C index d815b809a3..ed450ea488 100644 --- a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C +++ b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C @@ -34,7 +34,7 @@ void Foam::setRefCell const dictionary& dict, label& refCelli, scalar& refValue, - bool forceReference + const bool forceReference ) { if (field.needReference() || forceReference) @@ -119,4 +119,15 @@ void Foam::setRefCell } +Foam::scalar Foam::getRefCellValue +( + const volScalarField& field, + const label refCelli +) +{ + scalar refCellValue = (refCelli >= 0 ? field[refCelli] : 0.0); + return returnReduce