Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:OpenCFD/OpenFOAM-1.7.x

  • Loading branch information...
commit 868d5097761f6f454d1207604fb154484ce97194 2 parents 16bf9e2 + af92f5e
mattijs authored
View
4 src/OpenFOAM/containers/Lists/SortableList/ParSortableList.C
@@ -113,7 +113,7 @@ void Foam::ParSortableList<Type>::checkAndSend
}
{
- OPstream toSlave(destProcI);
+ OPstream toSlave(Pstream::blocking, destProcI);
toSlave << values << indices;
}
}
@@ -310,7 +310,7 @@ void Foam::ParSortableList<Type>::sort()
Pout<< "Receiving from " << procI << endl;
}
- IPstream fromSlave(procI);
+ IPstream fromSlave(Pstream::blocking, procI);
fromSlave >> recValues >> recIndices;
View
2  src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduSchedule/lduSchedule.H
@@ -42,7 +42,7 @@ namespace Foam
// Forward declaration of friend functions and operators
-class lduScheduleEntry;
+struct lduScheduleEntry;
Ostream& operator<<(Ostream& os, const lduScheduleEntry& lb);
View
2  src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortEdges.C
@@ -49,7 +49,7 @@ Foam::PatchTools::sortedEdgeFaces
const Field<PointType>& localPoints = p.localPoints();
// create the lists for the various results. (resized on completion)
- labelListList& sortedEdgeFaces = labelListList(edgeFaces.size());
+ labelListList sortedEdgeFaces = labelListList(edgeFaces.size());
forAll(edgeFaces, edgeI)
{
View
2  src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.H
@@ -86,7 +86,7 @@ class explicitSource
fieldList()
:
HashTable<Type>(0),
- OwnerPtr_()
+ OwnerPtr_(*this)
{}
View
29 src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C
@@ -138,20 +138,23 @@ emptyFvPatchField<Type>::emptyFvPatchField
template<class Type>
void emptyFvPatchField<Type>::updateCoeffs()
{
- if
- (
- this->dimensionedInternalField().mesh().nCells() > 0
- && (
- this->patch().patch().size()
- % this->dimensionedInternalField().mesh().nCells()
- )
- )
+ if (debug)
{
- FatalErrorIn("emptyFvPatchField<Type>::updateCoeffs()")
- << "This mesh contains patches of type empty but is not 1D or 2D\n"
- " by virtue of the fact that the number of faces of this\n"
- " empty patch is not divisible by the number of cells."
- << exit(FatalError);
+ if
+ (
+ this->dimensionedInternalField().mesh().nCells() > 0
+ && (
+ this->patch().patch().size()
+ % this->dimensionedInternalField().mesh().nCells()
+ )
+ )
+ {
+ WarningIn("emptyFvPatchField<Type>::updateCoeffs()")
+ << "This mesh contains patches of type empty but is not 1D or 2D\n"
+ " by virtue of the fact that the number of faces of this\n"
+ " empty patch is not divisible by the number of cells."
+ << endl;
+ }
}
}
View
2  src/meshTools/coordinateSystems/coordinateSystem.C
@@ -59,7 +59,7 @@ Foam::coordinateSystem::coordinateSystem
note_(),
origin_(cs.origin_),
R_(cs.R_),
- Rtr_(Rtr_)
+ Rtr_(cs.Rtr_)
{}
View
2  src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C
@@ -128,7 +128,7 @@ Foam::rotatedBoxToCell::rotatedBoxToCell
)
:
topoSetSource(mesh),
- origin_(origin_),
+ origin_(origin),
i_(i),
j_(j),
k_(k)
Please sign in to comment.
Something went wrong with that request. Please try again.