diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H index 1826a77217..7c82fec144 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H @@ -41,24 +41,6 @@ ) ); - Info<< " Adding to KFluid\n" << endl; - KFluid.set - ( - i, - new volScalarField - ( - IOobject - ( - "K", - runTime.timeName(), - fluidRegions[i], - IOobject::NO_READ, - IOobject::NO_WRITE - ), - thermoFluid[i].Cp()*thermoFluid[i].alpha() - ) - ); - Info<< " Adding to UFluid\n" << endl; UFluid.set ( @@ -129,6 +111,24 @@ ).ptr() ); + Info<< " Adding to KFluid\n" << endl; + KFluid.set + ( + i, + new volScalarField + ( + IOobject + ( + "K", + runTime.timeName(), + fluidRegions[i], + IOobject::NO_READ, + IOobject::NO_WRITE + ), + thermoFluid[i].Cp()*turbulence[i].alphaEff() + ) + ); + Info<< " Adding to DpDtFluid\n" << endl; DpDtFluid.set ( diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C index 2a589c1643..96fb76ffe2 100644 --- a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C +++ b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C @@ -47,7 +47,7 @@ using namespace Foam; int main(int argc, char *argv[]) { - timeSelector::addOptions(false); // no constant + timeSelector::addOptions(); # include "addRegionOption.H" argList::validOptions.insert("noTopology", ""); argList::validOptions.insert("allGeometry", ""); diff --git a/etc/settings.csh b/etc/settings.csh index ad327c5e57..1b33c5c42d 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -35,6 +35,8 @@ alias _foamAddPath 'set path=(\!* $path)' # prefix to LD_LIBRARY_PATH alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH}' +# prefix to MANPATH +alias _foamAddManPath 'setenv MANPATH \!*\:${MANPATH}' # location of the jobControl directory setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl @@ -114,9 +116,10 @@ case OpenFOAM: echo endif - _foamAddPath ${WM_COMPILER_DIR}/bin - _foamAddLib ${WM_COMPILER_DIR}/lib${WM_COMPILER_LIB_ARCH} - _foamAddLib ${WM_COMPILER_DIR}/lib + _foamAddPath ${WM_COMPILER_DIR}/bin + _foamAddLib ${WM_COMPILER_DIR}/lib${WM_COMPILER_LIB_ARCH} + _foamAddLib ${WM_COMPILER_DIR}/lib + _foamAddManPath ${WM_COMPILER_DIR}/man breaksw endsw @@ -136,21 +139,22 @@ case OPENMPI: # Tell OpenMPI where to find its install directory setenv OPAL_PREFIX $MPI_ARCH_PATH - _foamAddPath $MPI_ARCH_PATH/bin - _foamAddLib $MPI_ARCH_PATH/lib + _foamAddPath $MPI_ARCH_PATH/bin + _foamAddLib $MPI_ARCH_PATH/lib + _foamAddManPath $MPI_ARCH_PATH/man setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version unset mpi_version breaksw case MPICH: - set mpi_version=mpich-1.2.4 + set mpi_version=mpich2-1.1.1p1 setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS - setenv MPICH_ROOT $MPI_ARCH_PATH - _foamAddPath $MPI_ARCH_PATH/bin - _foamAddLib $MPI_ARCH_PATH/lib + _foamAddPath $MPI_ARCH_PATH/bin + _foamAddLib $MPI_ARCH_PATH/lib + _foamAddManPath $MPI_ARCH_PATH/share/man setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version unset mpi_version @@ -159,7 +163,6 @@ case MPICH: case MPICH-GM: setenv MPI_ARCH_PATH /opt/mpi setenv MPICH_PATH $MPI_ARCH_PATH - setenv MPICH_ROOT $MPI_ARCH_PATH setenv GM_LIB_PATH /opt/gm/lib64 _foamAddPath $MPI_ARCH_PATH/bin @@ -172,7 +175,6 @@ case MPICH-GM: case HPMPI: setenv MPI_HOME /opt/hpmpi setenv MPI_ARCH_PATH $MPI_HOME - setenv MPICH_ROOT=$MPI_ARCH_PATH _foamAddPath $MPI_ARCH_PATH/bin diff --git a/etc/settings.sh b/etc/settings.sh index 074a21bb17..f1abf12423 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -51,6 +51,16 @@ _foamAddLib() done } +# prefix to MANPATH +_foamAddManPath() +{ + while [ $# -ge 1 ] + do + export MANPATH=$1:$MANPATH + shift + done +} + # location of the jobControl directory export FOAM_JOB_DIR=$WM_PROJECT_INST_DIR/jobControl @@ -90,7 +100,7 @@ _foamAddLib $FOAM_LIBBIN $FOAM_SITE_LIBBIN $FOAM_USER_LIBBIN # Compiler settings # ~~~~~~~~~~~~~~~~~ -unset compilerBin compilerLib +unset compilerBin compilerLib compilerMan # Select compiler installation # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -133,16 +143,18 @@ OpenFOAM) compilerBin=$WM_COMPILER_DIR/bin compilerLib=$WM_COMPILER_DIR/lib$WM_COMPILER_LIB_ARCH:$WM_COMPILER_DIR/lib + compilerMan=$WM_COMPILER_DIR/man ;; esac if [ -d "$compilerBin" ] then - _foamAddPath $compilerBin - _foamAddLib $compilerLib + _foamAddPath $compilerBin + _foamAddLib $compilerLib + _foamAddManPath $compilerMan fi -unset compilerBin compilerLib compilerInstall +unset compilerBin compilerLib compilerMan compilerInstall # Communications library # ~~~~~~~~~~~~~~~~~~~~~~ @@ -158,21 +170,22 @@ OPENMPI) # Tell OpenMPI where to find its install directory export OPAL_PREFIX=$MPI_ARCH_PATH - _foamAddPath $MPI_ARCH_PATH/bin - _foamAddLib $MPI_ARCH_PATH/lib + _foamAddPath $MPI_ARCH_PATH/bin + _foamAddLib $MPI_ARCH_PATH/lib + _foamAddManPath $MPI_ARCH_PATH/man export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version unset mpi_version ;; MPICH) - mpi_version=mpich-1.2.4 + mpi_version=mpich2-1.1.1p1 export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS - export MPICH_ROOT=$MPI_ARCH_PATH - _foamAddPath $MPI_ARCH_PATH/bin - _foamAddLib $MPI_ARCH_PATH/lib + _foamAddPath $MPI_ARCH_PATH/bin + _foamAddLib $MPI_ARCH_PATH/lib + _foamAddManPath $MPI_ARCH_PATH/share/man export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version unset mpi_version @@ -181,7 +194,6 @@ MPICH) MPICH-GM) export MPI_ARCH_PATH=/opt/mpi export MPICH_PATH=$MPI_ARCH_PATH - export MPICH_ROOT=$MPI_ARCH_PATH export GM_LIB_PATH=/opt/gm/lib64 _foamAddPath $MPI_ARCH_PATH/bin @@ -194,7 +206,6 @@ MPICH-GM) HPMPI) export MPI_HOME=/opt/hpmpi export MPI_ARCH_PATH=$MPI_HOME - export MPICH_ROOT=$MPI_ARCH_PATH _foamAddPath $MPI_ARCH_PATH/bin diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C index 1cfcd9eec6..ab576d0ef4 100644 --- a/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C +++ b/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C @@ -85,7 +85,6 @@ inline void Foam::OPstream::writeToBuffer } - // * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * // Foam::OPstream::OPstream diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.C index bdb31516ba..213ae54c76 100644 --- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.C +++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.C @@ -217,7 +217,7 @@ bool Foam::Pstream::parRun_(false); Foam::List Foam::Pstream::procIDs_(1, 0); // Standard transfer message type -const int Foam::Pstream::msgType_(1); +int Foam::Pstream::msgType_(1); // Linear communication schedule Foam::List Foam::Pstream::linearCommunication_(0); diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H index f54f02b271..f30caf0d9e 100644 --- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H +++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H @@ -163,7 +163,7 @@ private: static bool parRun_; static List procIDs_; - static const int msgType_; + static int msgType_; static List linearCommunication_; static List treeCommunication_; @@ -337,11 +337,12 @@ public: } //- Message tag of standard messages - static int msgType() + static int& msgType() { return msgType_; } + //- Get the communications type of the stream commsTypes commsType() const { diff --git a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H index ba223f7aeb..891da11fd5 100644 --- a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H +++ b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H @@ -38,6 +38,7 @@ SourceFiles #include "symmTransform.H" #include "symmTensorField.H" +#include "sphericalTensor.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C index 8ab8e646c1..a41fbf5f52 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C @@ -26,6 +26,7 @@ License #include "basicSymmetryPointPatchField.H" #include "transformField.H" +#include "symmTransformField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -89,7 +90,12 @@ void basicSymmetryPointPatchField::evaluate(const Pstream::commsTypes) const vectorField& nHat = this->patch().pointNormals(); tmp > tvalues = - transform(I - nHat*nHat, this->patchInternalField()); + ( + ( + this->patchInternalField() + + transform(I - 2.0*sqr(nHat), this->patchInternalField()) + )/2.0 + ); // Get internal field to insert values into Field& iF = const_cast&>(this->internalField()); diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C index 1064aa3682..bd5729a1b3 100644 --- a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C +++ b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C @@ -1134,6 +1134,18 @@ Foam::autoPtr Foam::meshRefinement::balance } } } + + + // If the faceZones are not synchronised the blockedFace + // might not be synchronised. If you are sure the faceZones + // are synchronised remove below check. + syncTools::syncFaceList + ( + mesh_, + blockedFace, + andEqOp(), // combine operator + false // separation + ); } reduce(nUnblocked, sumOp