Commit 9c8e4c5b authored by Andrew Heather's avatar Andrew Heather

INT: Integration updates

parent bb5ac123
...@@ -6,22 +6,12 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT))) ...@@ -6,22 +6,12 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
endif endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR))) ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else else
CFMESH_LIBS = -lmeshTools -lfiniteVolume CFMESH_LIBS = -lmeshTools -lfiniteVolume
endif endif
endif endif
ifeq ($(WM_PROJECT), foam)
VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
ifeq ($(VER), 1)
CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
CFMESH_MACROS = -DExtendSpecific
else
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
CFMESH_MACROS =
endif
endif
EXE_INC = \ EXE_INC = \
$(CFMESH_MACROS) \ $(CFMESH_MACROS) \
......
...@@ -6,20 +6,20 @@ ...@@ -6,20 +6,20 @@
\\/ M anipulation | Copyright (C) Creative Fields, Ltd. \\/ M anipulation | Copyright (C) Creative Fields, Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of cfMesh. This file is part of OpenFOAM.
cfMesh is free software; you can redistribute it and/or modify it 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 under the terms of the GNU General Public License as published by
Free Software Foundation; either version 3 of the License, or (at your the Free Software Foundation, either version 3 of the License, or
option) any later version. (at your option) any later version.
cfMesh is distributed in the hope that it will be useful, but WITHOUT OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details. for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with cfMesh. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Application Application
Generates cartesian mesh Generates cartesian mesh
...@@ -43,7 +43,7 @@ int main(int argc, char *argv[]) ...@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
# include "setRootCase.H" # include "setRootCase.H"
# include "createTime.H" # include "createTime.H"
//- 2d cartesian mesher cannot be run in parallel // 2d cartesian mesher cannot be run in parallel
argList::noParallel(); argList::noParallel();
cartesian2DMeshGenerator cmg(runTime); cartesian2DMeshGenerator cmg(runTime);
...@@ -53,8 +53,9 @@ int main(int argc, char *argv[]) ...@@ -53,8 +53,9 @@ int main(int argc, char *argv[])
cmg.writeMesh(); cmg.writeMesh();
Info << "End\n" << endl; Info<< "End\n" << endl;
return 0; return 0;
} }
// ************************************************************************* // // ************************************************************************* //
...@@ -6,23 +6,12 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT))) ...@@ -6,23 +6,12 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
endif endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR))) ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else else
CFMESH_LIBS = -lmeshTools -lfiniteVolume CFMESH_LIBS = -lmeshTools -lfiniteVolume
endif endif
endif endif
ifeq ($(WM_PROJECT), foam)
VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
ifeq ($(VER), 1)
CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
CFMESH_MACROS = -DExtendSpecific
else
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
CFMESH_MACROS =
endif
endif
EXE_INC = \ EXE_INC = \
$(CFMESH_MACROS) \ $(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \
......
...@@ -6,20 +6,20 @@ ...@@ -6,20 +6,20 @@
\\/ M anipulation | Copyright (C) Creative Fields, Ltd. \\/ M anipulation | Copyright (C) Creative Fields, Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of cfMesh. This file is part of OpenFOAM.
cfMesh is free software; you can redistribute it and/or modify it 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 under the terms of the GNU General Public License as published by
Free Software Foundation; either version 3 of the License, or (at your the Free Software Foundation, either version 3 of the License, or
option) any later version. (at your option) any later version.
cfMesh is distributed in the hope that it will be useful, but WITHOUT OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details. for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with cfMesh. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Application Application
Generates cartesian mesh Generates cartesian mesh
...@@ -50,8 +50,9 @@ int main(int argc, char *argv[]) ...@@ -50,8 +50,9 @@ int main(int argc, char *argv[])
cmg.writeMesh(); cmg.writeMesh();
Info << "End\n" << endl; Info<< "End\n" << endl;
return 0; return 0;
} }
// ************************************************************************* // // ************************************************************************* //
...@@ -6,23 +6,12 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT))) ...@@ -6,23 +6,12 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
endif endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR))) ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else else
CFMESH_LIBS = -lmeshTools -lfiniteVolume CFMESH_LIBS = -lmeshTools -lfiniteVolume
endif endif
endif endif
ifeq ($(WM_PROJECT), foam)
VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
ifeq ($(VER), 1)
CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
CFMESH_MACROS = -DExtendSpecific
else
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
CFMESH_MACROS =
endif
endif
EXE_INC = \ EXE_INC = \
$(CFMESH_MACROS) \ $(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \
......
...@@ -6,26 +6,26 @@ ...@@ -6,26 +6,26 @@
\\/ M anipulation | Copyright (C) Creative Fields, Ltd. \\/ M anipulation | Copyright (C) Creative Fields, Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of cfMesh. This file is part of OpenFOAM.
cfMesh is free software; you can redistribute it and/or modify it 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 under the terms of the GNU General Public License as published by
Free Software Foundation; either version 3 of the License, or (at your the Free Software Foundation, either version 3 of the License, or
option) any later version. (at your option) any later version.
cfMesh is distributed in the hope that it will be useful, but WITHOUT OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details. for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with cfMesh. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Application Application
Generates polyhedral mesh pMesh
Description Description
- takes a triangulated surface and generates a body-fitted polyhedral mesh Takes a triangulated surface and generates a body-fitted polyhedral mesh
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
...@@ -36,14 +36,12 @@ using namespace Foam; ...@@ -36,14 +36,12 @@ using namespace Foam;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Main program:
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
# include "setRootCase.H" # include "setRootCase.H"
# include "createTime.H" # include "createTime.H"
//- polyhedral mesher cannot be run in parallel yet // Polyhedral mesher cannot be run in parallel yet
argList::noParallel(); argList::noParallel();
voronoiMeshGenerator pmg(runTime); voronoiMeshGenerator pmg(runTime);
...@@ -53,8 +51,9 @@ int main(int argc, char *argv[]) ...@@ -53,8 +51,9 @@ int main(int argc, char *argv[])
pmg.writeMesh(); pmg.writeMesh();
Info << "End\n" << endl; Info<< "End\n" << endl;
return 0; return 0;
} }
// ************************************************************************* // // ************************************************************************* //
...@@ -6,23 +6,12 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT))) ...@@ -6,23 +6,12 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
endif endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR))) ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else else
CFMESH_LIBS = -lmeshTools -lfiniteVolume CFMESH_LIBS = -lmeshTools -lfiniteVolume
endif endif
endif endif
ifeq ($(WM_PROJECT), foam)
VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
ifeq ($(VER), 1)
CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
CFMESH_MACROS = -DExtendSpecific
else
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
CFMESH_MACROS =
endif
endif
EXE_INC = \ EXE_INC = \
$(CFMESH_MACROS) \ $(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \
......
...@@ -6,26 +6,26 @@ ...@@ -6,26 +6,26 @@
\\/ M anipulation | Copyright (C) Creative Fields, Ltd. \\/ M anipulation | Copyright (C) Creative Fields, Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of cfMesh. This file is part of OpenFOAM.
cfMesh is free software; you can redistribute it and/or modify it 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 under the terms of the GNU General Public License as published by
Free Software Foundation; either version 3 of the License, or (at your the Free Software Foundation, either version 3 of the License, or
option) any later version. (at your option) any later version.
cfMesh is distributed in the hope that it will be useful, but WITHOUT OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details. for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with cfMesh. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Application Application
Generates tetrahedral mesh tetMesh
Description Description
- takes a triangulated surface and generates a tetrahedral mesh Takes a triangulated surface and generates a tetrahedral mesh
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
...@@ -43,7 +43,7 @@ int main(int argc, char *argv[]) ...@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
# include "setRootCase.H" # include "setRootCase.H"
# include "createTime.H" # include "createTime.H"
//- tetrahedral mesher cannot be run in parallel yet // tetrahedral mesher cannot be run in parallel yet
argList::noParallel();