diff --git a/applications/utilities/finiteArea/createFaMeshFromStl/createFaMeshFromStl.C b/applications/utilities/finiteArea/createFaMeshFromStl/createFaMeshFromStl.C index 1e49dfba2..c2a7ce095 100644 --- a/applications/utilities/finiteArea/createFaMeshFromStl/createFaMeshFromStl.C +++ b/applications/utilities/finiteArea/createFaMeshFromStl/createFaMeshFromStl.C @@ -27,8 +27,9 @@ Application \*---------------------------------------------------------------------------*/ #include "argList.H" -#include "triSurface.H" +#include "objectRegistry.H" #include "foamTime.H" +#include "triSurface.H" #include "polyMesh.H" #include "faCFD.H" #include "IFstream.H" diff --git a/applications/utilities/mesh/generation/cfMesh/FMSToSurface/FMSToSurface.C b/applications/utilities/mesh/generation/cfMesh/FMSToSurface/FMSToSurface.C index 313537977..a4a617c3e 100644 --- a/applications/utilities/mesh/generation/cfMesh/FMSToSurface/FMSToSurface.C +++ b/applications/utilities/mesh/generation/cfMesh/FMSToSurface/FMSToSurface.C @@ -27,6 +27,7 @@ Description \*---------------------------------------------------------------------------*/ #include "argList.H" +#include "objectRegistry.H" #include "foamTime.H" #include "triSurf.H" #include "triSurfaceCopyParts.H" diff --git a/applications/utilities/mesh/generation/cfMesh/generateBoundaryLayers/generateBoundaryLayers.C b/applications/utilities/mesh/generation/cfMesh/generateBoundaryLayers/generateBoundaryLayers.C index 5741b95bd..741420a21 100644 --- a/applications/utilities/mesh/generation/cfMesh/generateBoundaryLayers/generateBoundaryLayers.C +++ b/applications/utilities/mesh/generation/cfMesh/generateBoundaryLayers/generateBoundaryLayers.C @@ -28,6 +28,7 @@ Description \*---------------------------------------------------------------------------*/ #include "argList.H" +#include "objectRegistry.H" #include "foamTime.H" #include "polyMeshGenModifier.H" #include "meshOptimizer.H" diff --git a/applications/utilities/mesh/generation/cfMesh/improveMeshQuality/improveMeshQuality.C b/applications/utilities/mesh/generation/cfMesh/improveMeshQuality/improveMeshQuality.C index 20d155703..55a35d540 100644 --- a/applications/utilities/mesh/generation/cfMesh/improveMeshQuality/improveMeshQuality.C +++ b/applications/utilities/mesh/generation/cfMesh/improveMeshQuality/improveMeshQuality.C @@ -28,6 +28,7 @@ Description \*---------------------------------------------------------------------------*/ #include "argList.H" +#include "objectRegistry.H" #include "foamTime.H" #include "polyMeshGenModifier.H" #include "meshOptimizer.H" diff --git a/applications/utilities/mesh/generation/cfMesh/improveSymmetryPlanes/improveSymmetryPlanes.C b/applications/utilities/mesh/generation/cfMesh/improveSymmetryPlanes/improveSymmetryPlanes.C index 87811353b..be454158a 100644 --- a/applications/utilities/mesh/generation/cfMesh/improveSymmetryPlanes/improveSymmetryPlanes.C +++ b/applications/utilities/mesh/generation/cfMesh/improveSymmetryPlanes/improveSymmetryPlanes.C @@ -28,6 +28,7 @@ Description \*---------------------------------------------------------------------------*/ #include "argList.H" +#include "objectRegistry.H" #include "foamTime.H" #include "polyMeshGenModifier.H" #include "symmetryPlaneOptimisation.H" diff --git a/applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/mergeSurfacePatches.C b/applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/mergeSurfacePatches.C index fea6fbdf6..4d6c94efe 100644 --- a/applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/mergeSurfacePatches.C +++ b/applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/mergeSurfacePatches.C @@ -31,8 +31,9 @@ Author \*---------------------------------------------------------------------------*/ #include "argList.H" -#include "autoPtr.H" +#include "objectRegistry.H" #include "foamTime.H" +#include "autoPtr.H" #include "triSurf.H" #include "triSurfModifier.H" #include "demandDrivenData.H" diff --git a/applications/utilities/mesh/generation/cfMesh/pMesh/pMesh.C b/applications/utilities/mesh/generation/cfMesh/pMesh/pMesh.C index 218bb0cac..19d5d79e6 100644 --- a/applications/utilities/mesh/generation/cfMesh/pMesh/pMesh.C +++ b/applications/utilities/mesh/generation/cfMesh/pMesh/pMesh.C @@ -30,6 +30,7 @@ Description \*---------------------------------------------------------------------------*/ #include "argList.H" +#include "objectRegistry.H" #include "foamTime.H" #include "voronoiMeshGenerator.H" diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchScalarField.C index 53f8c5b8d..3fb6d398a 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchScalarField.C @@ -51,7 +51,7 @@ void basicSymmetryFvPatchField::evaluate(const Pstream::commsTypes) // Local typedefs typedef scalar Type; typedef outerProduct::type gradType; - typedef GeometricField gradFieldType; + typedef GeometricField gradFieldType; if (!updated()) { @@ -141,7 +141,7 @@ tmp basicSymmetryFvPatchField::snGrad() const // Local typedefs typedef vector Type; typedef outerProduct::type gradType; - typedef GeometricField gradFieldType; + typedef GeometricField gradFieldType; vectorField nHat = this->patch().nf(); @@ -214,7 +214,7 @@ void basicSymmetryFvPatchField::evaluate(const Pstream::commsTypes) // Local typedefs typedef vector Type; typedef outerProduct::type gradType; - typedef GeometricField gradFieldType; + typedef GeometricField gradFieldType; if (!updated()) { diff --git a/src/foam/fields/Fields/Field/Field.C b/src/foam/fields/Fields/Field/Field.C index ae26bd2e5..dd2cf1b41 100644 --- a/src/foam/fields/Fields/Field/Field.C +++ b/src/foam/fields/Fields/Field/Field.C @@ -406,7 +406,6 @@ void Field::map if ( mapper.direct() - && &mapper.directAddressing() && mapper.directAddressing().size() ) { @@ -451,7 +450,6 @@ void Field::autoMap ( ( mapper.direct() - && &mapper.directAddressing() && mapper.directAddressing().size() ) || (!mapper.direct() && mapper.addressing().size()) diff --git a/src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/coordinateModifier.H b/src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/coordinateModifier.H index 5b822a007..0b27090fa 100644 --- a/src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/coordinateModifier.H +++ b/src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/coordinateModifier.H @@ -36,10 +36,11 @@ SourceFiles #ifndef coordinateModifier_H #define coordinateModifier_H +#include "objectRegistry.H" +#include "foamTime.H" #include "word.H" #include "point.H" #include "coordinateModificationList.H" -#include "foamTime.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/wmake/rules/SunOS64Gcc/general b/wmake/rules/SunOS64Gcc/general index 229da88b7..8b603ed6d 100644 --- a/wmake/rules/SunOS64Gcc/general +++ b/wmake/rules/SunOS64Gcc/general @@ -1,7 +1,7 @@ CPP = cpp $(GFLAGS) 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 diff --git a/wmake/rules/darwinIntel64Clang/c++ b/wmake/rules/darwinIntel64Clang/c++ index 450c970ac..0e55fe6a1 100644 --- a/wmake/rules/darwinIntel64Clang/c++ +++ b/wmake/rules/darwinIntel64Clang/c++ @@ -19,5 +19,5 @@ cpptoo = $(Ctoo) LINK_LIBS = $(c++DBUG) -lpthread 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)/$(FOAM_MPI) -lPstream +# LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN) +LINKEXE = $(CC) $(c++FLAGS) -lpthread diff --git a/wmake/rules/darwinIntel64Dragonegg/c++ b/wmake/rules/darwinIntel64Dragonegg/c++ index 18e39113c..e34a5f5b9 100644 --- a/wmake/rules/darwinIntel64Dragonegg/c++ +++ b/wmake/rules/darwinIntel64Dragonegg/c++ @@ -18,5 +18,4 @@ cpptoo = $(Ctoo) LINK_LIBS = $(c++DBUG) -lpthread 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)/$(FOAM_MPI) -lPstream +LINKEXE = $(CC) $(c++FLAGS) -lpthread diff --git a/wmake/rules/darwinIntel64Gcc/c++ b/wmake/rules/darwinIntel64Gcc/c++ index cbd69316a..785ac0dd5 100644 --- a/wmake/rules/darwinIntel64Gcc/c++ +++ b/wmake/rules/darwinIntel64Gcc/c++ @@ -18,4 +18,4 @@ cpptoo = $(Ctoo) LINK_LIBS = $(c++DBUG) -lpthread 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) diff --git a/wmake/rules/linux64Icc/c++ b/wmake/rules/linux64Icc/c++ index f36dbd86d..c8b3d7ca9 100644 --- a/wmake/rules/linux64Icc/c++ +++ b/wmake/rules/linux64Icc/c++ @@ -18,4 +18,4 @@ cpptoo = $(Ctoo) LINK_LIBS = $(c++DBUG) -lrt LINKLIBSO = $(CC) $(c++FLAGS) -shared -LINKEXE = $(CC) $(c++FLAGS) -L$(FOAM_MPI_LIBBIN) -lPstream +LINKEXE = $(CC) $(c++FLAGS) diff --git a/wmake/rules/solarisGcc/general b/wmake/rules/solarisGcc/general index 712af7855..aac04c7de 100644 --- a/wmake/rules/solarisGcc/general +++ b/wmake/rules/solarisGcc/general @@ -1,6 +1,6 @@ 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