Mac OS X Port

This commit is contained in:
Hrvoje Jasak 2010-10-04 15:55:12 +01:00
parent 56eba313eb
commit b2f5b43bcc
52 changed files with 92 additions and 42 deletions

View file

@ -10,6 +10,7 @@ EXE_INC = \
EXE_LIBS = \
-lengine \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lbasicThermophysicalModels \

View file

@ -10,6 +10,7 @@ EXE_INC = \
EXE_LIBS = \
-lengine \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lbasicThermophysicalModels \

View file

@ -18,6 +18,7 @@ EXE_INC = \
EXE_LIBS = \
-lengine \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lreactionThermophysicalModels \

View file

@ -16,6 +16,7 @@ EXE_INC = \
-I$(LIB_SRC)/ODE/lnInclude
EXE_LIBS = \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lreactionThermophysicalModels \

View file

@ -10,6 +10,7 @@ EXE_INC = \
EXE_LIBS = \
-lengine \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lbasicThermophysicalModels \

View file

@ -14,6 +14,7 @@ EXE_LIBS = \
-lreactionThermophysicalModels \
-lbasicThermophysicalModels \
-lfiniteVolume \
-lcompressibleTurbulenceModel \
-lcompressibleLESModels \
-lcompressibleRASModels \
-lradiation

View file

@ -8,6 +8,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lreactionThermophysicalModels \

View file

@ -8,6 +8,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lreactionThermophysicalModels \

View file

@ -7,6 +7,7 @@ EXE_INC = \
EXE_LIBS = \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lfiniteVolume \

View file

@ -9,5 +9,6 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels

View file

@ -9,6 +9,7 @@ EXE_INC = \
EXE_LIBS = \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lfiniteVolume \

View file

@ -6,6 +6,7 @@ EXE_INC = \
EXE_LIBS = \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lfiniteVolume \

View file

@ -11,6 +11,7 @@ EXE_LIBS = \
-ldynamicFvMesh \
-ldynamicMesh \
-ltopoChangerFvMesh \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lbasicThermophysicalModels \

View file

@ -15,6 +15,7 @@ EXE_LIBS = \
-ldynamicMesh \
-ltopoChangerFvMesh \
-lmeshTools \
-lincompressibleTurbulenceModel \
-lincompressibleRASModels \
-lincompressibleLESModels \
-lincompressibleTransportModels \

View file

@ -8,6 +8,7 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
-lincompressibleTurbulenceModel \
-lincompressibleRASModels \
-lincompressibleLESModels \
-lincompressibleTransportModels

View file

@ -7,6 +7,7 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lfiniteVolume

View file

@ -11,6 +11,8 @@ EXE_INC = \
EXE_LIBS = \
-lbasicThermophysicalModels \
-lspecie \
-lmeshTools \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lfiniteVolume

View file

@ -12,5 +12,6 @@ EXE_LIBS = \
-lfiniteVolume \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels

View file

@ -13,6 +13,7 @@ EXE_LIBS = \
-ldynamicMesh \
-lmeshTools \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModel \
-lincompressibleRASModels \
-lincompressibleLESModels \
-lfiniteVolume

View file

@ -6,6 +6,7 @@ EXE_INC = \
EXE_LIBS = \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModel \
-lincompressibleRASModels \
-lincompressibleLESModels \
-lfiniteVolume \

View file

@ -5,6 +5,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-lincompressibleTurbulenceModel \
-lincompressibleRASModels \
-lincompressibleLESModels \
-lincompressibleTransportModels \

View file

@ -21,6 +21,7 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-llagrangian \

View file

@ -21,6 +21,7 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-llagrangian \

View file

@ -20,6 +20,7 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-llagrangian \

View file

@ -16,6 +16,7 @@ EXE_LIBS = \
-lbasicThermophysicalModels \
-lspecie \
-lradiation \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-lfiniteVolume \

View file

@ -8,6 +8,7 @@ EXE_INC = \
EXE_LIBS = \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModel \
-lincompressibleRASModels \
-lincompressibleLESModels \
-lfiniteVolume \

View file

@ -11,6 +11,7 @@ EXE_INC = \
EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModel \
-lincompressibleRASModels \
-lincompressibleLESModels \
-lfiniteVolume \

View file

@ -8,6 +8,7 @@ EXE_INC = \
EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModel \
-lincompressibleRASModels \
-lincompressibleLESModels \
-lfiniteVolume

View file

@ -12,6 +12,7 @@ EXE_INC = \
EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModel \
-lincompressibleRASModels \
-lincompressibleLESModels \
-lfiniteVolume \

View file

@ -8,6 +8,7 @@ EXE_INC = \
EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModel \
-lincompressibleRASModels \
-lincompressibleLESModels \
-lfiniteVolume \

View file

@ -12,6 +12,7 @@ EXE_INC = \
EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModel \
-lincompressibleRASModels \
-lincompressibleLESModels \
-lfiniteVolume

View file

@ -9,6 +9,7 @@ EXE_INC = \
EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModel \
-lincompressibleRASModels \
-lincompressibleLESModels \
-lfiniteVolume \

View file

@ -13,6 +13,7 @@ EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModel \
-lincompressibleRASModels \
-lincompressibleLESModels \
-lfiniteVolume \

View file

@ -12,6 +12,7 @@ EXE_INC = \
EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModel \
-lincompressibleRASModels \
-lincompressibleLESModels \
-lfiniteVolume \

View file

@ -8,6 +8,7 @@ EXE_INC = \
EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModel \
-lincompressibleRASModels \
-lincompressibleLESModels \
-lfiniteVolume

View file

@ -5,8 +5,9 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModel \
-lincompressibleRASModels \
-lincompressibleLESModels \
-lincompressibleTransportModels \
-lfiniteVolume \
-lmeshTools

View file

@ -125,10 +125,12 @@ void blockDescriptor::setEdge(label edgeI, label start, label end, label dim)
// edge is a straight line
scalar gExp = calcGexp(expand_[edgeI], dim);
// divide the line
// Divide the line
lineEdge le(blockPoints, start, end);
lineDivide divEdge
(
lineEdge(blockPoints, start, end),
le,
dim,
gExp
);

View file

@ -1944,7 +1944,7 @@ int main(int argc, char *argv[])
{
const cellZone& cz = cellZones[zoneI];
cellSet(mesh, cz.name(), cz).write();
cellSet(mesh, cz.name(), labelHashSet(cz)).write();
}
}
else

View file

@ -84,20 +84,20 @@ int main(int argc, char *argv[])
{
IOobject::writeDivider(Info);
hashset = oldDebug;
hashset -= currDebug;
hashset = wordHashSet(oldDebug);
hashset -= wordHashSet(currDebug);
listing = hashset.toc();
sort(listing);
Info<< "old DebugSwitches: " << listing << endl;
hashset = oldInfo;
hashset -= currInfo;
hashset = wordHashSet(oldInfo);
hashset -= wordHashSet(currInfo);
listing = hashset.toc();
sort(listing);
Info<< "old InfoSwitches: " << listing << endl;
hashset = oldOpt;
hashset -= currOpt;
hashset = wordHashSet(oldOpt);
hashset -= wordHashSet(currOpt);
listing = hashset.toc();
sort(listing);
Info<< "old OptimisationSwitches: " << listing << endl;
@ -108,21 +108,21 @@ int main(int argc, char *argv[])
{
IOobject::writeDivider(Info);
hashset = currDebug;
hashset -= oldDebug;
hashset = wordHashSet(currDebug);
hashset -= wordHashSet(oldDebug);
listing = hashset.toc();
sort(listing);
Info<< "new DebugSwitches: " << listing << endl;
hashset = currInfo;
hashset -= oldInfo;
hashset = wordHashSet(currInfo);
hashset -= wordHashSet(oldInfo);
listing = hashset.toc();
sort(listing);
Info<< "new InfoSwitches: " << listing << endl;
hashset = currOpt;
hashset -= oldOpt;
hashset = wordHashSet(currOpt);
hashset -= wordHashSet(oldOpt);
listing = hashset.toc();
sort(listing);
Info<< "new OptimisationSwitches: " << listing << endl;

View file

@ -40,10 +40,10 @@ wmake libso blockMatrix
wmake libso dynamicMesh
(cd tetDecompositionFiniteElement ; Allwmake)
(cd tetDecompositionFiniteElement ; ./Allwmake)
wmake libso fvMotionSolver
(cd tetDecompositionMotionSolver ; Allwmake)
(cd tetDecompositionMotionSolver ; ./Allwmake)
wmake libso coupledMatrix
wmake libso sampling

View file

@ -72,19 +72,19 @@ public:
// Constructors
//- Construct given initial size
HashSet(const label size = 128)
explicit HashSet(const label size = 128)
:
HashTable<nil, Key, Hash>(size)
{}
//- Construct from Istream
HashSet(Istream& is)
explicit HashSet(Istream& is)
:
HashTable<nil, Key, Hash>(is)
{}
//- Construct from UList of Key
HashSet(const UList<Key>& lst)
explicit HashSet(const UList<Key>& lst)
:
HashTable<nil, Key, Hash>(2*lst.size())
{
@ -101,13 +101,13 @@ public:
{}
//- Construct by transferring the parameter contents
HashSet(const Xfer<HashSet<Key, Hash> >& hs)
explicit HashSet(const Xfer<HashSet<Key, Hash> >& hs)
:
HashTable<nil, Key, Hash>(hs)
{}
//- Construct by transferring the parameter contents
HashSet(const Xfer<HashTable<nil, Key, Hash> >& hs)
explicit HashSet(const Xfer<HashTable<nil, Key, Hash> >& hs)
:
HashTable<nil, Key, Hash>(hs)
{}

View file

@ -84,7 +84,6 @@ class DynamicList
//- The capacity (allocated size) of the underlying list.
label capacity_;
// Private Member Functions
public:
@ -101,8 +100,8 @@ public:
//- Construct given size.
explicit inline DynamicList(const label);
//- Construct copy.
explicit inline DynamicList
//- Construct copy
inline DynamicList
(
const DynamicList<T, SizeInc, SizeMult, SizeDiv>&
);

View file

@ -4,7 +4,7 @@ set -x
wmakeLnInclude decompositionMethods
wmake libso scotchDecomp
#wmake libso scotchDecomp
wmake libso metisDecomp
wmake libso parMetisDecomp

View file

@ -3,6 +3,6 @@ EXE_INC =
LIB_LIBS = \
-L$(FOAM_LIBBIN)/dummy \
-L$(FOAM_MPI_LIBBIN) \
-lscotchDecomp \
/*-lscotchDecomp*/ \
-lmetisDecomp \
-lparMetisDecomp

View file

@ -343,7 +343,7 @@ void Foam::motionSmoother::getAffectedFacesAndPoints
(
mesh_,
"grownPoints",
labelHashSet(getPoints(labelHashSet(nbrFaces.toc())))
getPoints(labelHashSet(nbrFaces.toc()))
);
forAllConstIter(pointSet, nbrPoints, iter)

View file

@ -189,7 +189,7 @@ void Foam::MRFZone::setMRFFaces()
if (debug)
{
faceSet internalFaces(mesh_, "internalFaces", internalFaces_);
faceSet internalFaces(mesh_, "internalFaces", labelHashSet(internalFaces_));
Pout<< "Writing " << internalFaces.size()
<< " internal faces in MRF zone to faceSet "
<< internalFaces.name() << endl;

View file

@ -178,7 +178,7 @@ void Foam::activeBaffleVelocityFvPatchVectorField::rmap
// See autoMap.
const vectorField& areas = patch().boundaryMesh().mesh().faceAreas();
initWallSf_ = patch().patchSlice(areas);
initWallSf_ = vectorField(patch().patchSlice(areas));
initCyclicSf_ = patch().boundaryMesh()
[
cyclicPatchLabel_

View file

@ -66,12 +66,12 @@ class cellToFaceStencil
// Private Member Functions
//- Disallow default bitwise copy construct
cellToFaceStencil(const cellToFaceStencil&);
//- Disallow default bitwise assignment
void operator=(const cellToFaceStencil&);
//HJ
//HJ //- Disallow default bitwise copy construct
//HJ cellToFaceStencil(const cellToFaceStencil&);
//HJ
//HJ //- Disallow default bitwise assignment
//HJ void operator=(const cellToFaceStencil&);
protected:

View file

@ -67,11 +67,11 @@ class faceToCellStencil
// Private Member Functions
//- Disallow default bitwise copy construct
faceToCellStencil(const faceToCellStencil&);
//- Disallow default bitwise assignment
void operator=(const faceToCellStencil&);
//HJ //- Disallow default bitwise copy construct
//HJ faceToCellStencil(const faceToCellStencil&);
//HJ
//HJ //- Disallow default bitwise assignment
//HJ void operator=(const faceToCellStencil&);
public:

View file

@ -197,6 +197,16 @@ public:
);
}
template<class T>
const typename Field<T>::subField patchSlice(const Field<T>& l) const
{
return typename Field<T>::subField
(
l, size(),
polyPatch_.start()
);
}
//- Return faceCells
virtual const unallocLabelList& faceCells() const;

View file

@ -185,6 +185,7 @@ Foam::Particle<ParticleType>::Particle
template<class ParticleType>
Foam::Particle<ParticleType>::Particle(const Particle<ParticleType>& p)
:
IDLList<ParticleType>::link(),
cloud_(p.cloud_),
position_(p.position_),
celli_(p.celli_),

View file

@ -512,6 +512,7 @@ Foam::ReactingParcel<ParcelType>::ReactingParcel
const ReactingParcel<ParcelType>& p
)
:
reactingParcel(),
ThermoParcel<ParcelType>(p),
mass0_(p.mass0_),
Y_(p.Y_),