-
-
+|
+
|
diff --git a/doc/Doxygen/OpenFOAMicon.png b/doc/Doxygen/OpenFOAMicon.png
new file mode 100644
index 0000000000..073c65b684
Binary files /dev/null and b/doc/Doxygen/OpenFOAMicon.png differ
diff --git a/etc/aliases.csh b/etc/aliases.csh
index fd7f183a36..892bfbaabd 100644
--- a/etc/aliases.csh
+++ b/etc/aliases.csh
@@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
-# \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+# \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@@ -56,6 +56,11 @@ alias app 'cd $FOAM_APP'
alias util 'cd $FOAM_UTILITIES'
alias sol 'cd $FOAM_SOLVERS'
alias tut 'cd $FOAM_TUTORIALS'
+
+alias foamApps 'cd $FOAM_APP'
+alias foamSol 'cd $FOAM_SOLVERS'
+alias foamTuts 'cd $FOAM_TUTORIALS'
+alias foamUtils 'cd $FOAM_UTILITIES'
alias foam3rdParty 'cd $WM_THIRD_PARTY_DIR'
# -----------------------------------------------------------------------------
diff --git a/etc/aliases.sh b/etc/aliases.sh
index b193802246..9135fcad0f 100644
--- a/etc/aliases.sh
+++ b/etc/aliases.sh
@@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
-# \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+# \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@@ -56,6 +56,11 @@ alias app='cd $FOAM_APP'
alias util='cd $FOAM_UTILITIES'
alias sol='cd $FOAM_SOLVERS'
alias tut='cd $FOAM_TUTORIALS'
+
+alias foamApps='cd $FOAM_APP'
+alias foamSol='cd $FOAM_SOLVERS'
+alias foamTuts='cd $FOAM_TUTORIALS'
+alias foamUtils='cd $FOAM_UTILITIES'
alias foam3rdParty='cd $WM_THIRD_PARTY_DIR'
# -----------------------------------------------------------------------------
diff --git a/etc/apps/ensight/bashrc b/etc/apps/ensight/bashrc
index 100f65ae5d..f47c0f6ca3 100644
--- a/etc/apps/ensight/bashrc
+++ b/etc/apps/ensight/bashrc
@@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
-# \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+# \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@@ -26,7 +26,7 @@
# ensight/bashrc
#
# Description
-# Setup file for Ensight 8.?
+# Setup file for Ensight
# Sourced from OpenFOAM-*/etc/bashrc
#
#------------------------------------------------------------------------------
@@ -40,7 +40,7 @@ fi
if [ -r $CEI_HOME ]
then
- # special treatment for 32bit FOAM and 64bit Ensight
+ # special treatment for 32bit OpenFOAM and 64bit Ensight
if [ "$WM_ARCH" = linux -a `uname -m` = x86_64 ]
then
export CEI_ARCH=linux_2.6_32
@@ -52,8 +52,8 @@ then
export PATH=$CEI_HOME/bin:$PATH
fi
- export ENSIGHT8_INPUT=dummy
- export ENSIGHT8_READER=$FOAM_LIBBIN
+ export ENSIGHT9_INPUT=dummy
+ export ENSIGHT9_READER=$FOAM_LIBBIN
else
unset CEI_HOME
fi
diff --git a/etc/apps/ensight/cshrc b/etc/apps/ensight/cshrc
index ae7f3d6095..0126a8ea50 100644
--- a/etc/apps/ensight/cshrc
+++ b/etc/apps/ensight/cshrc
@@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
-# \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+# \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
# \\/ M anipulation |
#-------------------------------------------------------------------------------
# License
@@ -26,7 +26,7 @@
# ensight/cshrc
#
# Description
-# Setup file for Ensight 8.?
+# Setup file for Ensight
# Sourced from OpenFOAM-*/etc/cshrc
#
#------------------------------------------------------------------------------
@@ -38,15 +38,16 @@ endif
if ( -r $CEI_HOME ) then
- # special treatment for 32bit FOAM and 64bit Ensight
- if ($WM_ARCH == linux) then
- setenv CEI_ARCH linux_linux_2.6_32
+ # special treatment for 32bit OpenFOAM and 64bit Ensight
+ if ($WM_ARCH == linux && `uname -m` == x86_64) then
+ setenv CEI_ARCH linux_2.6_32
endif
- set path=($path $CEI_HOME/bin)
+ # add to path
+ set path=($CEI_HOME/bin $path)
- setenv ENSIGHT8_INPUT dummy
- setenv ENSIGHT8_READER $FOAM_LIBBIN
+ setenv ENSIGHT9_INPUT dummy
+ setenv ENSIGHT9_READER $FOAM_LIBBIN
else
unsetenv CEI_HOME
endif
diff --git a/etc/controlDict b/etc/controlDict
index 75f6d63a0e..f74a8bc38f 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -643,7 +643,6 @@ DebugSwitches
perfectInterface 0;
pointIndexHitList 0;
pointPatchField 0;
- pointPatchInterpolation 0;
pointScalarField 0;
pointScalarField::DimensionedInternalField 0;
pointSet 0;
diff --git a/etc/settings.csh b/etc/settings.csh
index d285e07ca2..78fd05490f 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -147,6 +147,30 @@ case OPENMPI:
unset mpi_version
breaksw
+case SYSTEMOPENMPI:
+
+ # This uses the installed openmpi. It needs mpicc installed!
+
+ set mpi_version=openmpi-system
+
+ # Set compilation flags here instead of in wmake/rules/../mplibSYSTEMOPENMPI
+ setenv PINC `mpicc --showme:compile`
+ setenv PLIBS `mpicc --showme:link`
+ set libDir=`echo "$PLIBS" | sed -e 's/.*-L\([^ ]*\).*/\1/'`
+
+ if ($?FOAM_VERBOSE && $?prompt) then
+ echo "Using system installed MPI:"
+ echo " compile flags : $PINC"
+ echo " link flags : $PLIBS"
+ echo " libmpi dir : $libDir"
+ endif
+
+ _foamAddLib $libDir
+
+ setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
+ unset mpi_version libDir
+ breaksw
+
case MPICH:
set mpi_version=mpich2-1.1.1p1
setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
diff --git a/etc/settings.sh b/etc/settings.sh
index bb0d48df0e..43fc884346 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -183,6 +183,28 @@ OPENMPI)
unset mpi_version
;;
+SYSTEMOPENMPI)
+ mpi_version=openmpi-system
+
+ # Set compilation flags here instead of in wmake/rules/../mplibSYSTEMOPENMPI
+ export PINC=`mpicc --showme:compile`
+ export PLIBS=`mpicc --showme:link`
+ libDir=`echo "$PLIBS" | sed -e 's/.*-L\([^ ]*\).*/\1/'`
+
+ if [ "$FOAM_VERBOSE" -a "$PS1" ]
+ then
+ echo "Using system installed MPI:"
+ echo " compile flags : $PINC"
+ echo " link flags : $PLIBS"
+ echo " libmpi dir : $libDir"
+ fi
+
+ _foamAddLib $libDir
+
+ export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
+ unset mpi_version libDir
+ ;;
+
MPICH)
mpi_version=mpich2-1.1.1p1
export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index d8634de6df..17da5aefef 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -453,7 +453,9 @@ $(constraintPointPatches)/processor/processorPointPatch.C
derivedPointPatches = $(pointPatches)/derived
$(derivedPointPatches)/coupled/coupledFacePointPatch.C
+/*
$(derivedPointPatches)/global/globalPointPatch.C
+*/
$(derivedPointPatches)/wall/wallPointPatch.C
pointBoundaryMesh = $(pointMesh)/pointBoundaryMesh
@@ -508,7 +510,9 @@ $(constraintPointPatchFields)/processor/processorPointPatchFields.C
derivedPointPatchFields = $(pointPatchFields)/derived
$(derivedPointPatchFields)/slip/slipPointPatchFields.C
+/*
$(derivedPointPatchFields)/global/globalPointPatchFields.C
+*/
$(derivedPointPatchFields)/uniformFixedValue/uniformFixedValuePointPatchFields.C
$(derivedPointPatchFields)/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchFields.C
diff --git a/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C b/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C
index a85e071ba5..017c20d692 100644
--- a/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C
+++ b/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C
@@ -466,40 +466,6 @@ void Foam::FaceCellWave::transform
}
-// Send face info to neighbour.
-template
-void Foam::FaceCellWave::sendPatchInfo
-(
- const label neighbour,
- const label nFaces,
- const labelList& faceLabels,
- const List& faceInfo
-) const
-{
- OPstream toNeighbour(Pstream::blocking, neighbour);
-
- writeFaces(nFaces, faceLabels, faceInfo, toNeighbour);
-}
-
-
-// Receive face info from neighbour
-template
-Foam::label Foam::FaceCellWave::receivePatchInfo
-(
- const label neighbour,
- labelList& faceLabels,
- List& faceInfo
-) const
-{
- IPstream fromNeighbour(Pstream::blocking, neighbour);
-
- label nFaces = 0;
- readFaces(nFaces, faceLabels, faceInfo, fromNeighbour);
-
- return nFaces;
-}
-
-
// Offset mesh face. Used for transferring from one cyclic half to the other.
template
void Foam::FaceCellWave::offset
@@ -523,6 +489,8 @@ void Foam::FaceCellWave::handleProcPatches()
{
// Send all
+ PstreamBuffers pBufs(Pstream::nonBlocking);
+
forAll(mesh_.boundaryMesh(), patchI)
{
const polyPatch& patch = mesh_.boundaryMesh()[patchI];
@@ -564,16 +532,13 @@ void Foam::FaceCellWave::handleProcPatches()
<< endl;
}
- sendPatchInfo
- (
- procPatch.neighbProcNo(),
- nSendFaces,
- sendFaces,
- sendFacesInfo
- );
+ UOPstream toNeighbour(procPatch.neighbProcNo(), pBufs);
+ writeFaces(nSendFaces, sendFaces, sendFacesInfo, toNeighbour);
}
}
+ pBufs.finishedSends();
+
// Receive all
forAll(mesh_.boundaryMesh(), patchI)
@@ -586,16 +551,20 @@ void Foam::FaceCellWave::handleProcPatches()
refCast(patch);
// Allocate buffers
- label nReceiveFaces;
+ label nReceiveFaces = 0;
labelList receiveFaces(patch.size());
List receiveFacesInfo(patch.size());
- nReceiveFaces = receivePatchInfo
- (
- procPatch.neighbProcNo(),
- receiveFaces,
- receiveFacesInfo
- );
+ {
+ UIPstream fromNeighbour(procPatch.neighbProcNo(), pBufs);
+ readFaces
+ (
+ nReceiveFaces,
+ receiveFaces,
+ receiveFacesInfo,
+ fromNeighbour
+ );
+ }
if (debug)
{
diff --git a/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H b/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H
index 00c89d415b..6bf08d8e92 100644
--- a/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H
+++ b/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H
@@ -225,23 +225,6 @@ class FaceCellWave
List& faceInfo
) const;
- //- Send info to neighbour
- void sendPatchInfo
- (
- const label neighbour,
- const label nFaces,
- const labelList&,
- const List&
- ) const;
-
- //- Receive info from neighbour. Returns number of faces received.
- label receivePatchInfo
- (
- const label neighbour,
- labelList&,
- List&
- ) const;
-
//- Offset face labels by constant value
static void offset
(
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.C
index a970d6104c..8842768098 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.C
@@ -38,7 +38,8 @@ Foam::IPstream::IPstream
)
:
Pstream(commsType, bufSize),
- UIPstream(commsType, fromProcNo, buf_)
+ UIPstream(commsType, fromProcNo, buf_, externalBufPosition_),
+ externalBufPosition_(0)
{}
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.H
index acc59de87b..201e1b7f1d 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.H
@@ -55,6 +55,9 @@ class IPstream
public UIPstream
{
+ //- Receive index
+ label externalBufPosition_;
+
public:
// Constructors
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
index 41cb1c4f11..b2e4d8df06 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
@@ -51,10 +51,31 @@ Foam::PstreamBuffers::PstreamBuffers
version_(version),
sendBuf_(UPstream::nProcs()),
recvBuf_(UPstream::nProcs()),
+ recvBufPos_(UPstream::nProcs(), 0),
finishedSendsCalled_(false)
{}
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+Foam::PstreamBuffers::~PstreamBuffers()
+{
+ // Check that all data has been consumed.
+ forAll(recvBufPos_, procI)
+ {
+ if (recvBufPos_[procI] < recvBuf_[procI].size())
+ {
+ FatalErrorIn("PstreamBuffers::~PstreamBuffers()")
+ << "Message from processor " << procI
+ << " not fully consumed. messageSize:" << recvBuf_[procI].size()
+ << " bytes of which only " << recvBufPos_[procI]
+ << " consumed."
+ << Foam::abort(FatalError);
+ }
+ }
+}
+
+
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
void Foam::PstreamBuffers::finishedSends(const bool block)
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
index 75f26f1d6a..c2dc745bea 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
@@ -106,6 +106,9 @@ class PstreamBuffers
//- receive buffer
List > recvBuf_;
+ //- read position in recvBuf_
+ labelList recvBufPos_;
+
bool finishedSendsCalled_;
// Private member functions
@@ -129,6 +132,10 @@ public:
IOstream::versionNumber version=IOstream::currentVersion
);
+ // Destructor
+
+ ~PstreamBuffers();
+
// Member functions
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.C
index 4c38db6c69..f4c37633f3 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.C
@@ -77,20 +77,6 @@ inline void Foam::UIPstream::readFromBuffer
}
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-Foam::UIPstream::~UIPstream()
-{
- if (externalBufPosition_ < messageSize_)
- {
- FatalErrorIn("UIPstream::~UIPstream()")
- << "Message not fully consumed. messageSize:" << messageSize_
- << " bytes of which only " << externalBufPosition_
- << " consumed." << Foam::abort(FatalError);
- }
-}
-
-
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
Foam::Istream& Foam::UIPstream::read(token& t)
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
index aebef123b1..30e4e96119 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
@@ -63,7 +63,7 @@ class UIPstream
DynamicList& externalBuf_;
- label externalBufPosition_;
+ label& externalBufPosition_;
const int tag_;
@@ -94,6 +94,7 @@ public:
const commsTypes commsType,
const int fromProcNo,
DynamicList& externalBuf,
+ label& externalBufPosition,
const int tag = UPstream::msgType(),
streamFormat format=BINARY,
versionNumber version=currentVersion
@@ -103,11 +104,6 @@ public:
UIPstream(const int fromProcNo, PstreamBuffers&);
- // Destructor
-
- ~UIPstream();
-
-
// Member functions
// Inquiry
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H
index e49a96330e..d0be734d55 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H
@@ -121,11 +121,19 @@ public:
) = 0;
//- Initialise swap of patch point values
- virtual void initSwapAdd(Field&) const
+ virtual void initSwapAddSeparated
+ (
+ const Pstream::commsTypes,
+ Field&
+ ) const
{}
//- Complete swap of patch point values and add to local values
- virtual void swapAdd(Field&) const = 0;
+ virtual void swapAddSeparated
+ (
+ const Pstream::commsTypes,
+ Field&
+ ) const = 0;
};
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C
index 40aa26a36a..b5ded6b394 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C
@@ -122,7 +122,11 @@ cyclicPointPatchField::cyclicPointPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template
-void cyclicPointPatchField::swapAdd(Field& pField) const
+void cyclicPointPatchField::swapAddSeparated
+(
+ const Pstream::commsTypes,
+ Field& pField
+) const
{
Field pf(this->patchInternalField(pField));
@@ -145,7 +149,7 @@ void cyclicPointPatchField::swapAdd(Field& pField) const
}
}
- addToInternalField(pField, pf);
+ addToInternalField(pField, pf, cyclicPatch_.separatedPoints());
}
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
index df9068d9e8..94daa63473 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
@@ -159,7 +159,11 @@ public:
{}
//- Complete swap of patch point values and add to local values
- virtual void swapAdd(Field&) const;
+ virtual void swapAddSeparated
+ (
+ const Pstream::commsTypes commsType,
+ Field&
+ ) const;
};
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C
index c5b8c8334d..687d9779e7 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C
@@ -96,16 +96,28 @@ processorPointPatchField::~processorPointPatchField()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template
-void processorPointPatchField::initSwapAdd(Field& pField) const
+void processorPointPatchField::initSwapAddSeparated
+(
+ const Pstream::commsTypes commsType,
+ Field& pField
+)
+const
{
if (Pstream::parRun())
{
- // Get internal field into my point order
- Field pf(this->patchInternalField(pField));
+ // Get internal field into correct order for opposite side
+ Field pf
+ (
+ this->patchInternalField
+ (
+ pField,
+ procPatch_.reverseMeshPoints()
+ )
+ );
OPstream::write
(
- Pstream::blocking,
+ commsType,
procPatch_.neighbProcNo(),
reinterpret_cast(pf.begin()),
pf.byteSize()
@@ -115,7 +127,11 @@ void processorPointPatchField::initSwapAdd(Field& pField) const
template
-void processorPointPatchField::swapAdd(Field& pField) const
+void processorPointPatchField::swapAddSeparated
+(
+ const Pstream::commsTypes commsType,
+ Field& pField
+) const
{
if (Pstream::parRun())
{
@@ -123,7 +139,7 @@ void processorPointPatchField::swapAdd(Field& pField) const
IPstream::read
(
- Pstream::blocking,
+ commsType,
procPatch_.neighbProcNo(),
reinterpret_cast(pnf.begin()),
pnf.byteSize()
@@ -140,22 +156,20 @@ void processorPointPatchField::swapAdd(Field& pField) const
}
else
{
- const labelList& nonGlobalPatchPoints =
- procPatch_.nonGlobalPatchPoints();
const labelListList& pointFaces = ppp.pointFaces();
- forAll(nonGlobalPatchPoints, pfi)
+ forAll(pointFaces, pfi)
{
pnf[pfi] = transform
(
- forwardT[pointFaces[nonGlobalPatchPoints[pfi]][0]],
+ forwardT[pointFaces[pfi][0]],
pnf[pfi]
);
}
}
}
- addToInternalField(pField, pnf);
+ addToInternalField(pField, pnf, procPatch_.separatedPoints());
}
}
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
index a49c28c54b..f0e9b0adee 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
@@ -169,11 +169,19 @@ public:
)
{}
- //- Initialise swap of patch point values
- virtual void initSwapAdd(Field&) const;
+ //- Initialise swap of non-collocated patch point values
+ virtual void initSwapAddSeparated
+ (
+ const Pstream::commsTypes commsType,
+ Field&
+ ) const;
//- Complete swap of patch point values and add to local values
- virtual void swapAdd(Field&) const;
+ virtual void swapAddSeparated
+ (
+ const Pstream::commsTypes commsType,
+ Field&
+ ) const;
};
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/global/globalPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/global/globalPointPatchField.C
deleted file mode 100644
index cce542b124..0000000000
--- a/src/OpenFOAM/fields/pointPatchFields/derived/global/globalPointPatchField.C
+++ /dev/null
@@ -1,169 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
- \\/ 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 2 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, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "globalPointPatchField.H"
-#include "PstreamCombineReduceOps.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * //
-
-template
-globalPointPatchField::globalPointPatchField
-(
- const pointPatch& p,
- const DimensionedField& iF
-)
-:
- coupledPointPatchField(p, iF),
- globalPointPatch_(refCast(p))
-{}
-
-
-template
-globalPointPatchField::globalPointPatchField
-(
- const pointPatch& p,
- const DimensionedField& iF,
- const dictionary& dict
-)
-:
- coupledPointPatchField(p, iF, dict),
- globalPointPatch_(refCast(p))
-{
- if (!isType(p))
- {
- FatalIOErrorIn
- (
- "globalPointPatchField::globalPointPatchField\n"
- "(\n"
- " const pointPatch& p,\n"
- " const Field& field,\n"
- " const dictionary& dict\n"
- ")\n",
- dict
- ) << "patch " << this->patch().index()
- << " not processorPoint type. "
- << "Patch type = " << p.type()
- << exit(FatalIOError);
- }
-}
-
-
-template
-globalPointPatchField::globalPointPatchField
-(
- const globalPointPatchField& ptf,
- const pointPatch& p,
- const DimensionedField& iF,
- const pointPatchFieldMapper& mapper
-)
-:
- coupledPointPatchField(ptf, p, iF, mapper),
- globalPointPatch_(refCast(ptf.patch()))
-{
- if (!isType(this->patch()))
- {
- FatalErrorIn
- (
- "globalPointPatchField::globalPointPatchField\n"
- "(\n"
- " const globalPointPatchField& ptf,\n"
- " const pointPatch& p,\n"
- " const DimensionedField& iF,\n"
- " const pointPatchFieldMapper& mapper\n"
- ")\n"
- ) << "Field type does not correspond to patch type for patch "
- << this->patch().index() << "." << endl
- << "Field type: " << typeName << endl
- << "Patch type: " << this->patch().type()
- << exit(FatalError);
- }
-}
-
-
-template
-globalPointPatchField::globalPointPatchField
-(
- const globalPointPatchField& ptf,
- const DimensionedField& iF
-)
-:
- coupledPointPatchField(ptf, iF),
- globalPointPatch_(refCast(ptf.patch()))
-{}
-
-
-// * * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-template
-globalPointPatchField::~globalPointPatchField()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
-
-template
-void globalPointPatchField::swapAdd(Field& pField) const
-{
- // Create the global list and insert local values
- if (globalPointPatch_.globalPointSize() > 0)
- {
- Field lpf = patchInternalField(pField);
- const labelList& addr = globalPointPatch_.sharedPointAddr();
-
- Field gpf
- (
- globalPointPatch_.globalPointSize(),
- pTraits::zero
- );
-
- forAll(addr, i)
- {
- gpf[addr[i]] += lpf[i];
- }
-
- combineReduce(gpf, plusEqOp >());
-
- // Extract local data
- forAll (addr, i)
- {
- lpf[i] = gpf[addr[i]];
- }
-
- setInInternalField(pField, lpf);
- }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/global/globalPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/global/globalPointPatchField.H
deleted file mode 100644
index bd7285d16c..0000000000
--- a/src/OpenFOAM/fields/pointPatchFields/derived/global/globalPointPatchField.H
+++ /dev/null
@@ -1,166 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
- \\/ 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 2 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, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Class
- Foam::globalPointPatchField
-
-Description
- Foam::globalPointPatchField
-
-SourceFiles
- globalPointPatchField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef globalPointPatchField_H
-#define globalPointPatchField_H
-
-#include "coupledPointPatchField.H"
-#include "globalPointPatch.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
- Class globalPointPatchField Declaration
-\*---------------------------------------------------------------------------*/
-
-template
-class globalPointPatchField
-:
- public coupledPointPatchField
-{
- // Private data
-
- //- Local reference to processorPoint patch
- const globalPointPatch& globalPointPatch_;
-
-
-public:
-
- //- Runtime type information
- TypeName("global");
-
-
- // Constructors
-
- //- Construct from patch and internal field
- globalPointPatchField
- (
- const pointPatch&,
- const DimensionedField&
- );
-
- //- Construct from patch, internal field and dictionary
- globalPointPatchField
- (
- const pointPatch&,
- const DimensionedField&,
- const dictionary&
- );
-
- //- Construct by mapping given patchField onto a new patch
- globalPointPatchField
- (
- const globalPointPatchField&,
- const pointPatch&,
- const DimensionedField&,
- const pointPatchFieldMapper&
- );
-
- //- Construct and return a clone
- virtual autoPtr > clone() const
- {
- return autoPtr >
- (
- new globalPointPatchField
- (
- *this
- )
- );
- }
-
- //- Construct as copy setting internal field reference
- globalPointPatchField
- (
- const globalPointPatchField&,
- const DimensionedField&
- );
-
- //- Construct and return a clone setting internal field reference
- virtual autoPtr > clone
- (
- const DimensionedField& iF
- ) const
- {
- return autoPtr >
- (
- new globalPointPatchField
-
- (
- *this,
- iF
- )
- );
- }
-
-
- // Destructor
-
- ~globalPointPatchField();
-
-
- // Member functions
-
- // Evaluation functions
-
- //- Evaluate the patch field
- virtual void evaluate
- (
- const Pstream::commsTypes commsType=Pstream::blocking
- )
- {}
-
- //- Complete swap of patch point values and add to local values
- virtual void swapAdd(Field&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-# include "globalPointPatchField.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/global/globalPointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/derived/global/globalPointPatchFields.C
deleted file mode 100644
index f34a90e949..0000000000
--- a/src/OpenFOAM/fields/pointPatchFields/derived/global/globalPointPatchFields.C
+++ /dev/null
@@ -1,44 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
- \\/ 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 2 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, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "globalPointPatchFields.H"
-#include "pointPatchFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-makePointPatchFields(global);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
index e697ccc20b..684ea7e8a5 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
@@ -124,7 +124,8 @@ template
template
tmp > pointPatchField::patchInternalField
(
- const Field& iF
+ const Field& iF,
+ const labelList& meshPoints
) const
{
// Check size
@@ -141,9 +142,6 @@ tmp > pointPatchField::patchInternalField
<< abort(FatalError);
}
- // get addressing
- const labelList& meshPoints = patch().meshPoints();
-
tmp > tvalues(new Field(meshPoints.size()));
Field& values = tvalues();
@@ -156,6 +154,17 @@ tmp > pointPatchField::patchInternalField
}
+template
+template
+tmp > pointPatchField::patchInternalField
+(
+ const Field& iF
+) const
+{
+ return patchInternalField(iF, patch().meshPoints());
+}
+
+
template
template
void pointPatchField::addToInternalField
@@ -201,6 +210,53 @@ void pointPatchField::addToInternalField
}
+template
+template
+void pointPatchField::addToInternalField
+(
+ Field& iF,
+ const Field& pF,
+ const labelList& points
+) const
+{
+ // Check size
+ if (iF.size() != internalField().size())
+ {
+ FatalErrorIn
+ (
+ "void pointPatchField::"
+ "addToInternalField("
+ "Field& iF, const Field& iF, const labelList&) const"
+ ) << "given internal field does not correspond to the mesh. "
+ << "Field size: " << iF.size()
+ << " mesh size: " << internalField().size()
+ << abort(FatalError);
+ }
+
+ if (pF.size() != size())
+ {
+ FatalErrorIn
+ (
+ "void pointPatchField::"
+ "addToInternalField("
+ "Field& iF, const Field& iF, const labelList&) const"
+ ) << "given patch field does not correspond to the mesh. "
+ << "Field size: " << pF.size()
+ << " mesh size: " << size()
+ << abort(FatalError);
+ }
+
+ // Get the addressing
+ const labelList& mp = patch().meshPoints();
+
+ forAll(points, i)
+ {
+ label pointI = points[i];
+ iF[mp[pointI]] += pF[pointI];
+ }
+}
+
+
template
template
void pointPatchField::setInInternalField
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
index 79903dd217..4cd206cf13 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
@@ -291,6 +291,15 @@ public:
const Field& iF
) const;
+ //- Return field created from selected internal field values
+ // given internal field reference
+ template
+ tmp > patchInternalField
+ (
+ const Field& iF,
+ const labelList& meshPoints
+ ) const;
+
//- Given the internal field and a patch field,
// add the patch field to the internal field
template
@@ -300,6 +309,16 @@ public:
const Field& pF
) const;
+ //- Given the internal field and a patch field,
+ // add selected elements of the patch field to the internal field
+ template
+ void addToInternalField
+ (
+ Field& iF,
+ const Field& pF,
+ const labelList& points
+ ) const;
+
//- Given the internal field and a patch field,
// set the patch field in the internal field
template
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index f574fde3e6..0dba0f4829 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -251,7 +251,7 @@ bool Foam::argList::regroupArgv(int& argc, char**& argv)
// note: we also re-write directly into args_
// and use a second pass to sort out args/options
- for (int argI = 0; argI < argc; argI++)
+ for (int argI = 0; argI < argc; ++argI)
{
if (strcmp(argv[argI], "(") == 0)
{
@@ -369,7 +369,7 @@ Foam::argList::argList
{
// Check if this run is a parallel run by searching for any parallel option
// If found call runPar which might filter argv
- for (int argI = 0; argI < argc; argI++)
+ for (int argI = 0; argI < argc; ++argI)
{
if (argv[argI][0] == '-')
{
@@ -395,7 +395,7 @@ Foam::argList::argList
int nArgs = 1;
string argListString = args_[0];
- for (int argI = 1; argI < args_.size(); argI++)
+ for (int argI = 1; argI < args_.size(); ++argI)
{
argListString += ' ';
argListString += args_[argI];
@@ -751,12 +751,6 @@ Foam::argList::~argList()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::stringList::subList Foam::argList::additionalArgs() const
-{
- return stringList::subList(args_, args_.size() - 1, 1);
-}
-
-
void Foam::argList::printUsage() const
{
Info<< "\nUsage: " << executable_ << " [OPTIONS]";
diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H
index da75c4d066..a39b0f0c86 100644
--- a/src/OpenFOAM/global/argList/argList.H
+++ b/src/OpenFOAM/global/argList/argList.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -193,7 +193,7 @@ public:
// Access
- //- Name of executable
+ //- Name of executable without the path
inline const word& executable() const;
//- Return root path
@@ -211,9 +211,25 @@ public:
//- Return arguments
inline const stringList& args() const;
- //- Return additional arguments,
- // i.e. those additional to the executable itself
- stringList::subList additionalArgs() const;
+ //- Return the argument corresponding to index.
+ inline const string& arg(const label index) const;
+
+ //- Return the number of arguments
+ inline label size() const;
+
+ //- Read a value from the argument at index.
+ // Index 0 corresponds to the name of the executable.
+ // Index 1 corresponds to the first argument.
+ template
+ inline T argRead(const label index) const;
+
+ //- Return arguments that are additional to the executable
+ // @deprecated use operator[] directly (deprecated Feb 2010)
+ stringList::subList additionalArgs() const
+ {
+ return stringList::subList(args_, args_.size()-1, 1);
+ }
+
//- Return options
inline const Foam::HashTable& options() const;
@@ -264,6 +280,14 @@ public:
}
+ //- Return the argument corresponding to index.
+ // Index 0 corresponds to the name of the executable.
+ // Index 1 corresponds to the first argument.
+ inline const string& operator[](const label index) const;
+
+ //- Return the argument string associated with the named option
+ // @sa option()
+ inline const string& operator[](const word& opt) const;
// Edit
diff --git a/src/OpenFOAM/global/argList/argListI.H b/src/OpenFOAM/global/argList/argListI.H
index 6b9b462de0..7e8edcbd1f 100644
--- a/src/OpenFOAM/global/argList/argListI.H
+++ b/src/OpenFOAM/global/argList/argListI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -64,6 +64,18 @@ inline const Foam::stringList& Foam::argList::args() const
}
+inline const Foam::string& Foam::argList::arg(const label index) const
+{
+ return args_[index];
+}
+
+
+inline Foam::label Foam::argList::size() const
+{
+ return args_.size();
+}
+
+
inline const Foam::HashTable& Foam::argList::options() const
{
return options_;
@@ -72,7 +84,7 @@ inline const Foam::HashTable& Foam::argList::options() const
inline const Foam::string& Foam::argList::option(const word& opt) const
{
- return options_.operator[](opt);
+ return options_[opt];
}
@@ -84,7 +96,7 @@ inline bool Foam::argList::optionFound(const word& opt) const
inline Foam::IStringStream Foam::argList::optionLookup(const word& opt) const
{
- return IStringStream(option(opt));
+ return IStringStream(options_[opt]);
}
@@ -92,12 +104,36 @@ inline Foam::IStringStream Foam::argList::optionLookup(const word& opt) const
namespace Foam
{
+ // Template specialization for string
+ template<>
+ inline Foam::string
+ Foam::argList::argRead(const label index) const
+ {
+ return args_[index];
+ }
+
+ // Template specialization for word
+ template<>
+ inline Foam::word
+ Foam::argList::argRead(const label index) const
+ {
+ return args_[index];
+ }
+
+ // Template specialization for fileName
+ template<>
+ inline Foam::fileName
+ Foam::argList::argRead(const label index) const
+ {
+ return args_[index];
+ }
+
// Template specialization for string
template<>
inline Foam::string
Foam::argList::optionRead(const word& opt) const
{
- return option(opt);
+ return options_[opt];
}
// Template specialization for word
@@ -105,7 +141,7 @@ namespace Foam
inline Foam::word
Foam::argList::optionRead(const word& opt) const
{
- return option(opt);
+ return options_[opt];
}
// Template specialization for fileName
@@ -113,13 +149,23 @@ namespace Foam
inline Foam::fileName
Foam::argList::optionRead(const word& opt) const
{
- return option(opt);
+ return options_[opt];
}
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+template
+inline T Foam::argList::argRead(const label index) const
+{
+ T val;
+
+ IStringStream(args_[index])() >> val;
+ return val;
+}
+
+
template
inline T Foam::argList::optionRead(const word& opt) const
{
@@ -187,4 +233,18 @@ inline T Foam::argList::optionLookupOrDefault
}
+// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
+
+inline const Foam::string& Foam::argList::operator[](const label index) const
+{
+ return args_[index];
+}
+
+
+inline const Foam::string& Foam::argList::operator[](const word& opt) const
+{
+ return options_[opt];
+}
+
+
// ************************************************************************* //
diff --git a/src/OpenFOAM/global/argList/parRun.H b/src/OpenFOAM/global/argList/parRun.H
index c1e5b544bc..d2b926d8a4 100644
--- a/src/OpenFOAM/global/argList/parRun.H
+++ b/src/OpenFOAM/global/argList/parRun.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/OpenFOAM/global/foamDoc.H b/src/OpenFOAM/global/foamDoc.H
new file mode 100644
index 0000000000..82a85d8972
--- /dev/null
+++ b/src/OpenFOAM/global/foamDoc.H
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\/ 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 2 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, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+@mainpage OpenFOAM®: open source CFD
+
+@section about About OpenFOAM
+
+ OpenFOAM is a free, open source CFD software package produced by
+ a commercial company,
+ OpenCFD Ltd.
+ It has a
+ large user base across most areas of engineering and science,
+ from both commercial and academic organisations. OpenFOAM has an
+ extensive range of features to solve anything from complex fluid
+ flows involving chemical reactions, turbulence and heat transfer,
+ to solid dynamics and electromagnetics.
+ More ...
+
+@section users Our commitment to the users
+
+ OpenFOAM comes with full commercial support from OpenCFD, including
+ software support,
+ contracted developments
+ and a programme of training courses.
+ These activities fund the development, maintenance and release of
+ OpenFOAM to make it an extremely viable commercial open source product.
+
+@section opensource Our commitment to open source
+
+ OpenCFD is committed to open source software, continually developing and
+ maintaining OpenFOAM under the
+ GNU General Public Licence.
+ OpenFOAM will always be free of charge and open source.
+ In addition, we endeavour to support other viable open source initiatives
+ that will benefit science and engineering.
+
+\*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/global/foamVersion.H b/src/OpenFOAM/global/foamVersion.H
index f6f8a7c6de..4a479b2799 100644
--- a/src/OpenFOAM/global/foamVersion.H
+++ b/src/OpenFOAM/global/foamVersion.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/OpenFOAM/include/addOverwriteOption.H b/src/OpenFOAM/include/addOverwriteOption.H
new file mode 100644
index 0000000000..c61548f06b
--- /dev/null
+++ b/src/OpenFOAM/include/addOverwriteOption.H
@@ -0,0 +1,10 @@
+//
+// addOverwriteOption.H
+// ~~~~~~~~~~~~~~~~~~~~
+
+ Foam::argList::addOption
+ (
+ "overwrite",
+ "overwrite existing mesh/results files"
+ );
+
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
index a7075d47e5..6ff21e35ff 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
@@ -39,6 +39,7 @@ SourceFiles
#include "labelField.H"
#include "typeInfo.H"
+#include "Pstream.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
index 1a6c9a395d..08443546ba 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
@@ -39,6 +39,7 @@ SourceFiles
#include "lduInterface.H"
#include "primitiveFieldsFwd.H"
+#include "Pstream.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/BICCG/BICCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/BICCG/BICCG.H
index e31b6108f7..bf9b67a763 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/BICCG/BICCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/BICCG/BICCG.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,7 +32,7 @@ Description
Deprecated
This solver is present for backward-compatibility and the PBiCG solver
- should be used instead.
+ should be used instead. (deprecated Apr 2008)
SourceFiles
BICCG.C
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/ICCG/ICCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/ICCG/ICCG.H
index ddf1a7a8f8..8ac919a31e 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/ICCG/ICCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/ICCG/ICCG.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,7 +32,7 @@ Description
Deprecated
This solver is present for backward-compatibility and the PCG solver
- should be used for preference.
+ should be used for preference. (deprecated Apr 2008)
SourceFiles
ICCG.C
diff --git a/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.C b/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.C
index 36e6fe6afd..cc81ee3fb9 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.C
@@ -27,7 +27,7 @@ License
#include "pointBoundaryMesh.H"
#include "polyBoundaryMesh.H"
#include "facePointPatch.H"
-#include "globalPointPatch.H"
+#include "pointMesh.H"
#include "PstreamBuffers.H"
#include "lduSchedule.H"
#include "globalMeshData.H"
@@ -105,31 +105,6 @@ void Foam::pointBoundaryMesh::calcGeometry()
}
-const Foam::globalPointPatch&
-Foam::pointBoundaryMesh::globalPatch() const
-{
- const pointPatchList& patches = *this;
-
- forAll (patches, patchI)
- {
- if (isType(patches[patchI]))
- {
- return refCast(patches[patchI]);
- }
- }
-
- FatalErrorIn
- (
- "const pointBoundaryMesh::"
- "globalPointPatch& globalPatch() const"
- ) << "patch not found."
- << abort(FatalError);
-
- // Dummy return
- return refCast(patches[0]);
-}
-
-
void Foam::pointBoundaryMesh::movePoints(const pointField& p)
{
PstreamBuffers pBufs(Pstream::defaultCommsType);
diff --git a/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.H b/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.H
index 3a15a8b70b..e4948123da 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.H
@@ -46,7 +46,6 @@ namespace Foam
// Forward declaration of classes
class pointMesh;
class polyBoundaryMesh;
-class globalPointPatch;
/*---------------------------------------------------------------------------*\
Class pointBoundaryMesh Declaration
@@ -98,9 +97,6 @@ public:
return mesh_;
}
- //- Return reference to globalPointPatch
- const globalPointPatch& globalPatch() const;
-
//- Correct polyBoundaryMesh after moving points
void movePoints(const pointField&);
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMesh.C b/src/OpenFOAM/meshes/pointMesh/pointMesh.C
index 70d3f1f6f4..8376cb71c9 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMesh.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointMesh.C
@@ -26,7 +26,6 @@ License
#include "pointMesh.H"
#include "globalMeshData.H"
-#include "globalPointPatch.H"
#include "pointMeshMapper.H"
#include "pointFields.H"
#include "MapGeometricFields.H"
@@ -56,36 +55,12 @@ void Foam::pointMesh::mapFields(const mapPolyMesh& mpm)
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::pointMesh::pointMesh
-(
- const polyMesh& pMesh,
- bool alwaysConstructGlobalPatch
-)
+Foam::pointMesh::pointMesh(const polyMesh& pMesh)
:
MeshObject(pMesh),
GeoMesh(pMesh),
boundary_(*this, pMesh.boundaryMesh())
{
- // Add the globalPointPatch if there are global points
- if
- (
- alwaysConstructGlobalPatch
- || GeoMesh::mesh_.globalData().nGlobalPoints()
- )
- {
- boundary_.setSize(boundary_.size() + 1);
-
- boundary_.set
- (
- boundary_.size() - 1,
- new globalPointPatch
- (
- boundary_,
- boundary_.size() - 1
- )
- );
- }
-
// Calculate the geometry for the patches (transformation tensors etc.)
boundary_.calcGeometry();
}
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMesh.H b/src/OpenFOAM/meshes/pointMesh/pointMesh.H
index a41f725c45..70fdc7ef04 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMesh.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMesh.H
@@ -79,11 +79,7 @@ public:
// Constructors
//- Construct from polyMesh
- explicit pointMesh
- (
- const polyMesh& pMesh,
- bool alwaysConstructGlobalPatch = false
- );
+ explicit pointMesh(const polyMesh& pMesh);
// Member Functions
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/generic/genericPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/generic/genericPointPatch.H
index 3f63ca4857..9738454733 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/generic/genericPointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/generic/genericPointPatch.H
@@ -26,7 +26,8 @@ Class
Foam::genericPointPatch
Description
- DirectMapped patch.
+ Substitute for unknown patches. Used for postprocessing when only
+ basic polyPatch info is needed.
SourceFiles
genericPointPatch.C
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C
index 4a88831532..e25244da12 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C
@@ -28,7 +28,6 @@ License
#include "pointBoundaryMesh.H"
#include "addToRunTimeSelectionTable.H"
#include "pointMesh.H"
-#include "globalPointPatch.H"
#include "edgeList.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,9 +50,7 @@ addToRunTimeSelectionTable
// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * //
void Foam::cyclicPointPatch::initGeometry(PstreamBuffers&)
-{
- transformPairs_.setSize(0);
-}
+{}
void Foam::cyclicPointPatch::calcGeometry(PstreamBuffers&)
@@ -61,94 +58,22 @@ void Foam::cyclicPointPatch::calcGeometry(PstreamBuffers&)
const edgeList& cp = cyclicPolyPatch_.coupledPoints();
const labelList& mp = cyclicPolyPatch_.meshPoints();
- // If there are no global points create a 1->1 map
- if (!boundaryMesh().mesh().globalData().nGlobalPoints())
+ DynamicList |
