exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Mac OSX Porting changes

Browse source
This commit is contained in:
Hrvoje Jasak 2015-08-06 23:56:00 +01:00 committed by Dominik Christ
parent 5d98ea3dea
commit 629d716c38
16 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
applications/utilities/finiteArea/createFaMeshFromStl/createFaMeshFromStl.C
View file

@ -27,8 +27,9 @@ Application
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "argList.H" #include "argList.H"
#include "triSurface.H" #include "objectRegistry.H"
#include "foamTime.H" #include "foamTime.H"
#include "triSurface.H"
#include "polyMesh.H" #include "polyMesh.H"
#include "faCFD.H" #include "faCFD.H"
#include "IFstream.H" #include "IFstream.H"

1
applications/utilities/mesh/generation/cfMesh/FMSToSurface/FMSToSurface.C
View file

@ -27,6 +27,7 @@ Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "argList.H" #include "argList.H"
#include "objectRegistry.H"
#include "foamTime.H" #include "foamTime.H"
#include "triSurf.H" #include "triSurf.H"
#include "triSurfaceCopyParts.H" #include "triSurfaceCopyParts.H"

1
applications/utilities/mesh/generation/cfMesh/generateBoundaryLayers/generateBoundaryLayers.C
View file

@ -28,6 +28,7 @@ Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "argList.H" #include "argList.H"
#include "objectRegistry.H"
#include "foamTime.H" #include "foamTime.H"
#include "polyMeshGenModifier.H" #include "polyMeshGenModifier.H"
#include "meshOptimizer.H" #include "meshOptimizer.H"

1
applications/utilities/mesh/generation/cfMesh/improveMeshQuality/improveMeshQuality.C
View file

@ -28,6 +28,7 @@ Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "argList.H" #include "argList.H"
#include "objectRegistry.H"
#include "foamTime.H" #include "foamTime.H"
#include "polyMeshGenModifier.H" #include "polyMeshGenModifier.H"
#include "meshOptimizer.H" #include "meshOptimizer.H"

1
applications/utilities/mesh/generation/cfMesh/improveSymmetryPlanes/improveSymmetryPlanes.C
View file

@ -28,6 +28,7 @@ Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "argList.H" #include "argList.H"
#include "objectRegistry.H"
#include "foamTime.H" #include "foamTime.H"
#include "polyMeshGenModifier.H" #include "polyMeshGenModifier.H"
#include "symmetryPlaneOptimisation.H" #include "symmetryPlaneOptimisation.H"

3
applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/mergeSurfacePatches.C
View file

@ -31,8 +31,9 @@ Author
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "argList.H" #include "argList.H"
#include "autoPtr.H" #include "objectRegistry.H"
#include "foamTime.H" #include "foamTime.H"
#include "autoPtr.H"
#include "triSurf.H" #include "triSurf.H"
#include "triSurfModifier.H" #include "triSurfModifier.H"
#include "demandDrivenData.H" #include "demandDrivenData.H"

1
applications/utilities/mesh/generation/cfMesh/pMesh/pMesh.C
View file

@ -30,6 +30,7 @@ Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "argList.H" #include "argList.H"
#include "objectRegistry.H"
#include "foamTime.H" #include "foamTime.H"
#include "voronoiMeshGenerator.H" #include "voronoiMeshGenerator.H"

6
src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchScalarField.C
View file

@ -51,7 +51,7 @@ void basicSymmetryFvPatchField<scalar>::evaluate(const Pstream::commsTypes)
// Local typedefs // Local typedefs
typedef scalar Type; typedef scalar Type;
typedef outerProduct<vector, Type>::type gradType; typedef outerProduct<vector, Type>::type gradType;
typedef GeometricField<gradType, fvPatchField, volMesh> gradFieldType; typedef GeometricField<gradType, Foam::fvPatchField, volMesh> gradFieldType;
if (!updated()) if (!updated())
{ {
@ -141,7 +141,7 @@ tmp<vectorField> basicSymmetryFvPatchField<vector>::snGrad() const
// Local typedefs // Local typedefs
typedef vector Type; typedef vector Type;
typedef outerProduct<vector, Type>::type gradType; typedef outerProduct<vector, Type>::type gradType;
typedef GeometricField<gradType, fvPatchField, volMesh> gradFieldType; typedef GeometricField<gradType, Foam::fvPatchField, volMesh> gradFieldType;
vectorField nHat = this->patch().nf(); vectorField nHat = this->patch().nf();
@ -214,7 +214,7 @@ void basicSymmetryFvPatchField<vector>::evaluate(const Pstream::commsTypes)
// Local typedefs // Local typedefs
typedef vector Type; typedef vector Type;
typedef outerProduct<vector, Type>::type gradType; typedef outerProduct<vector, Type>::type gradType;
typedef GeometricField<gradType, fvPatchField, volMesh> gradFieldType; typedef GeometricField<gradType, Foam::fvPatchField, volMesh> gradFieldType;
if (!updated()) if (!updated())
{ {

2
src/foam/fields/Fields/Field/Field.C
View file

@ -406,7 +406,6 @@ void Field<Type>::map
if if
( (
mapper.direct() mapper.direct()
&& &mapper.directAddressing()
&& mapper.directAddressing().size() && mapper.directAddressing().size()
) )
{ {
@ -451,7 +450,6 @@ void Field<Type>::autoMap
( (
( (
mapper.direct() mapper.direct()
&& &mapper.directAddressing()
&& mapper.directAddressing().size() && mapper.directAddressing().size()
) )
|| (!mapper.direct() && mapper.addressing().size()) || (!mapper.direct() && mapper.addressing().size())

3
src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/coordinateModifier.H
View file

@ -36,10 +36,11 @@ SourceFiles
#ifndef coordinateModifier_H #ifndef coordinateModifier_H
#define coordinateModifier_H #define coordinateModifier_H
#include "objectRegistry.H"
#include "foamTime.H"
#include "word.H" #include "word.H"
#include "point.H" #include "point.H"
#include "coordinateModificationList.H" #include "coordinateModificationList.H"
#include "foamTime.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

2
wmake/rules/SunOS64Gcc/general
View file

@ -1,7 +1,7 @@
CPP = cpp $(GFLAGS) CPP = cpp $(GFLAGS)
LD = ld -64 LD = ld -64
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket
include $(GENERAL_RULES)/standard include $(GENERAL_RULES)/standard

4
wmake/rules/darwinIntel64Clang/c++
View file

@ -19,5 +19,5 @@ cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG) -lpthread LINK_LIBS = $(c++DBUG) -lpthread
LINKLIBSO = $(CC) $(c++FLAGS) -lpthread -dynamiclib -undefined dynamic_lookup LINKLIBSO = $(CC) $(c++FLAGS) -lpthread -dynamiclib -undefined dynamic_lookup
# LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN) -lfoam -L$(FOAM_MPI_LIBBIN) -lPstream # LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN)
LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN)/$(FOAM_MPI) -lPstream LINKEXE = $(CC) $(c++FLAGS) -lpthread

3
wmake/rules/darwinIntel64Dragonegg/c++
View file

@ -18,5 +18,4 @@ cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG) -lpthread LINK_LIBS = $(c++DBUG) -lpthread
LINKLIBSO = $(CC) $(c++FLAGS) -lpthread -dynamiclib -undefined dynamic_lookup LINKLIBSO = $(CC) $(c++FLAGS) -lpthread -dynamiclib -undefined dynamic_lookup
# LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN) -lfoam -L$(FOAM_MPI_LIBBIN) -lPstream LINKEXE = $(CC) $(c++FLAGS) -lpthread
LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN)/$(FOAM_MPI) -lPstream

2
wmake/rules/darwinIntel64Gcc/c++
View file

@ -18,4 +18,4 @@ cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG) -lpthread LINK_LIBS = $(c++DBUG) -lpthread
LINKLIBSO = $(CC) $(c++FLAGS) -lpthread -dynamiclib -undefined dynamic_lookup LINKLIBSO = $(CC) $(c++FLAGS) -lpthread -dynamiclib -undefined dynamic_lookup
LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN) -lfoam -L$(FOAM_MPI_LIBBIN) -lPstream LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN)

2
wmake/rules/linux64Icc/c++
View file

@ -18,4 +18,4 @@ cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG) -lrt LINK_LIBS = $(c++DBUG) -lrt
LINKLIBSO = $(CC) $(c++FLAGS) -shared LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS) -L$(FOAM_MPI_LIBBIN) -lPstream LINKEXE = $(CC) $(c++FLAGS)

2
wmake/rules/solarisGcc/general
View file

@ -1,6 +1,6 @@
CPP = /usr/lib/cpp -undef $(GFLAGS) CPP = /usr/lib/cpp -undef $(GFLAGS)
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket
include $(GENERAL_RULES)/standard include $(GENERAL_RULES)/standard