From 21873a1cb7c7200c6626bfc61c4d3cb8f8a243c4 Mon Sep 17 00:00:00 2001 From: Henrik Rusche Date: Thu, 31 May 2018 17:01:37 +0200 Subject: [PATCH] Patched up some tutorials for CMake build --- bin/tools/RunFunctions | 22 ++++- cmake/FOAMMacros.cmake | 10 +- tutorials/CMakeLists.txt | 41 -------- tutorials/basic/CMakeLists.txt | 35 ------- .../basic/PODSolver/1DPODsin/CMakeLists.txt | 33 ------- .../PODSolver/1DPODsin/setTcos/CMakeLists.txt | 3 +- tutorials/basic/PODSolver/CMakeLists.txt | 33 ------- tutorials/basic/potentialFoam/CMakeLists.txt | 33 ------- .../potentialFoam/cylinder/CMakeLists.txt | 33 ------- .../analyticalCylinder/CMakeLists.txt | 3 +- .../basic/scalarTransportFoam/CMakeLists.txt | 33 ------- .../swirlTest/CMakeLists.txt | 33 ------- .../swirlTest/setSwirl/CMakeLists.txt | 3 +- tutorials/compressible/CMakeLists.txt | 33 ------- tutorials/compressible/rhoCentralFoam/Allrun | 2 +- .../rhoCentralFoam/CMakeLists.txt | 33 ------- .../biconic25-55Run35/CMakeLists.txt | 33 ------- .../datToFoam/CMakeLists.txt | 3 +- tutorials/finiteArea/CMakeLists.txt | 34 ------- .../finiteArea/liquidFilmFoam/CMakeLists.txt | 33 ------- .../dropsSpreading/CMakeLists.txt | 33 ------- .../setInitialDroplet/CMakeLists.txt | 3 +- .../finiteArea/surfactantFoam/CMakeLists.txt | 33 ------- .../sphereTransport/CMakeLists.txt | 33 ------- .../sphereSurfactantFoam/CMakeLists.txt | 3 +- .../sphereTransport/sphereTransport/Allrun | 2 +- tutorials/heatTransfer/CMakeLists.txt | 34 ------- .../buoyantPisoFoam/CMakeLists.txt | 33 ------- .../buoyantPisoFoam/hotRoom/CMakeLists.txt | 33 ------- .../hotRoom/setHotRoom/CMakeLists.txt | 46 --------- .../hotRoom/setHotRoom/Make/files | 3 - .../hotRoom/setHotRoom/Make/options | 5 - .../hotRoom/setHotRoom/createFields.H | 13 --- .../hotRoom/setHotRoom/setHotRoom.C | 94 ------------------- .../hotRadiationRoom/system/fvSolution | 2 +- .../heatTransfer/setHotRoom/CMakeLists.txt | 3 +- tutorials/immersedBoundary/CMakeLists.txt | 34 ------- .../system/controlDict | 1 + .../system/controlDict | 1 + .../sphereInChannel/CMakeLists.txt | 33 ------- .../refineSphereMesh/CMakeLists.txt | 46 --------- .../thickPlateRefinedMesh/CMakeLists.txt | 33 ------- .../refineThickPlateMesh/CMakeLists.txt | 46 --------- tutorials/incompressible/CMakeLists.txt | 33 ------- .../system/controlDict | 5 + .../incompressible/icoDyMFoam/CMakeLists.txt | 34 ------- .../icoDyMFoam/movingBlockRBF/CMakeLists.txt | 33 ------- .../RBFMotionFunction/CMakeLists.txt | 8 +- .../movingConeMotion/CMakeLists.txt | 33 ------- .../setMotionMovingCone/CMakeLists.txt | 3 +- tutorials/lagrangian/CMakeLists.txt | 34 ------- .../icoLagrangianFoam/CMakeLists.txt | 33 ------- .../icoLagrangianFoam/channelParticles/Allrun | 2 +- .../constant/polyMesh/boundary | 2 +- .../icoLagrangianFoam/CMakeLists.txt | 4 +- .../rhoPisoTwinParcelFoam/CMakeLists.txt | 33 ------- .../rhoPisoTwinParcelFoam/CMakeLists.txt | 3 +- .../simplifiedSiwek/Allrun | 2 +- tutorials/multiphase/CMakeLists.txt | 33 ------- .../multiphase/interDyMFoam/CMakeLists.txt | 33 ------- .../interDyMFoam/ras/CMakeLists.txt | 33 ------- .../ras/sloshingTank3D6DoF/CMakeLists.txt | 33 ------- .../sloshingTank3D6DoF/gen6DoF/CMakeLists.txt | 3 +- tutorials/solidMechanics/CMakeLists.txt | 34 ------- .../elasticSolidFoam/CMakeLists.txt | 33 ------- .../elasticSolidFoam/plateHole/Allrun | 4 +- .../elasticSolidFoam/plateHole/CMakeLists.txt | 33 ------- .../analyticalPlateHole/CMakeLists.txt | 3 +- .../elasticThermalSolidFoam/CMakeLists.txt | 33 ------- .../hotCylinder/Allrun | 2 +- .../hotCylinder/CMakeLists.txt | 33 ------- .../analyticalHotCylinder/CMakeLists.txt | 3 +- 72 files changed, 76 insertions(+), 1552 deletions(-) delete mode 100644 tutorials/CMakeLists.txt delete mode 100644 tutorials/basic/CMakeLists.txt delete mode 100644 tutorials/basic/PODSolver/1DPODsin/CMakeLists.txt delete mode 100644 tutorials/basic/PODSolver/CMakeLists.txt delete mode 100644 tutorials/basic/potentialFoam/CMakeLists.txt delete mode 100644 tutorials/basic/potentialFoam/cylinder/CMakeLists.txt delete mode 100644 tutorials/basic/scalarTransportFoam/CMakeLists.txt delete mode 100644 tutorials/basic/scalarTransportFoam/swirlTest/CMakeLists.txt delete mode 100644 tutorials/compressible/CMakeLists.txt delete mode 100644 tutorials/compressible/rhoCentralFoam/CMakeLists.txt delete mode 100644 tutorials/compressible/rhoCentralFoam/biconic25-55Run35/CMakeLists.txt delete mode 100644 tutorials/finiteArea/CMakeLists.txt delete mode 100644 tutorials/finiteArea/liquidFilmFoam/CMakeLists.txt delete mode 100644 tutorials/finiteArea/liquidFilmFoam/dropsSpreading/CMakeLists.txt delete mode 100644 tutorials/finiteArea/surfactantFoam/CMakeLists.txt delete mode 100644 tutorials/finiteArea/surfactantFoam/sphereTransport/CMakeLists.txt delete mode 100644 tutorials/heatTransfer/CMakeLists.txt delete mode 100644 tutorials/heatTransfer/buoyantPisoFoam/CMakeLists.txt delete mode 100644 tutorials/heatTransfer/buoyantPisoFoam/hotRoom/CMakeLists.txt delete mode 100644 tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/CMakeLists.txt delete mode 100644 tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/Make/files delete mode 100644 tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/Make/options delete mode 100644 tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/createFields.H delete mode 100644 tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C delete mode 100644 tutorials/immersedBoundary/CMakeLists.txt delete mode 100644 tutorials/immersedBoundary/sphereInChannel/CMakeLists.txt delete mode 100644 tutorials/immersedBoundary/sphereInChannel/refineSphereMesh/CMakeLists.txt delete mode 100644 tutorials/immersedBoundary/thickPlateRefinedMesh/CMakeLists.txt delete mode 100644 tutorials/immersedBoundary/thickPlateRefinedMesh/refineThickPlateMesh/CMakeLists.txt delete mode 100644 tutorials/incompressible/CMakeLists.txt delete mode 100644 tutorials/incompressible/icoDyMFoam/CMakeLists.txt delete mode 100644 tutorials/incompressible/icoDyMFoam/movingBlockRBF/CMakeLists.txt delete mode 100644 tutorials/incompressible/icoDyMFoam/movingConeMotion/CMakeLists.txt delete mode 100644 tutorials/lagrangian/CMakeLists.txt delete mode 100644 tutorials/lagrangian/icoLagrangianFoam/CMakeLists.txt delete mode 100644 tutorials/lagrangian/rhoPisoTwinParcelFoam/CMakeLists.txt delete mode 100644 tutorials/multiphase/CMakeLists.txt delete mode 100644 tutorials/multiphase/interDyMFoam/CMakeLists.txt delete mode 100644 tutorials/multiphase/interDyMFoam/ras/CMakeLists.txt delete mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/CMakeLists.txt delete mode 100644 tutorials/solidMechanics/CMakeLists.txt delete mode 100644 tutorials/solidMechanics/elasticSolidFoam/CMakeLists.txt delete mode 100644 tutorials/solidMechanics/elasticSolidFoam/plateHole/CMakeLists.txt delete mode 100644 tutorials/solidMechanics/elasticThermalSolidFoam/CMakeLists.txt delete mode 100644 tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/CMakeLists.txt diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions index b079c6b5a..4ddba2b6d 100644 --- a/bin/tools/RunFunctions +++ b/bin/tools/RunFunctions @@ -106,7 +106,12 @@ compileApplication () # simultaneously, and some of them depend on the compilation of a # common application. echo "Warning: Missing lockfile command. Your compilation may fail." - wmake $1 + if [ "$WM_USE_CMAKE" = "1" ]; + then + (cd $1; cmake .; make) + else + wmake $1 + fi else # We make sure to serialize the compilation in case we are called simultaneously lockFilename="./compileApplication.lock" @@ -116,15 +121,24 @@ compileApplication () # We wait for the lock release at most 10 x 10 seconds = 100 seconds lockfile -10 -r 10 $lockFilename - wmake $1 + if [ "$WM_USE_CMAKE" = "1" ]; + then + (cd $1; cmake .; make) + else + wmake $1 + fi rm -rf $lockFilename fi } compileLibrary () { - echo "Compiling $1 application" - wmake libso $1 + echo "Compiling $1 library" + if [ "$WM_USE_CMAKE" = "1" ]; + (cd $1; cmake .; make) + then + wmake libso $1 + fi } cloneCase () diff --git a/cmake/FOAMMacros.cmake b/cmake/FOAMMacros.cmake index c442cb475..98c9c012d 100644 --- a/cmake/FOAMMacros.cmake +++ b/cmake/FOAMMacros.cmake @@ -82,11 +82,17 @@ function(add_foam_library lib) endfunction() function(add_foam_executable exe) - set(options "") + set(options USERSPACE) set(oneValueArgs "") set(multiValueArgs DEPENDS SOURCES) cmake_parse_arguments(AFE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) - + + if(${AFE_USERSPACE}) + message(STATUS Got here) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY $ENV{FOAM_USER_LIBBIN}) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $ENV{FOAM_USER_APPBIN}) + endif() + add_executable(${exe} ${AFE_SOURCES}) target_link_libraries(${exe} ${AFE_DEPENDS}) install (TARGETS ${exe} DESTINATION bin) diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt deleted file mode 100644 index 385d454fa..000000000 --- a/tutorials/CMakeLists.txt +++ /dev/null @@ -1,41 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(solidMechanics) -add_subdirectory(multiphase) -add_subdirectory(immersedBoundary) -add_subdirectory(compressible) -add_subdirectory(incompressible) -add_subdirectory(lagrangian) -add_subdirectory(heatTransfer) -add_subdirectory(finiteArea) -add_subdirectory(basic) \ No newline at end of file diff --git a/tutorials/basic/CMakeLists.txt b/tutorials/basic/CMakeLists.txt deleted file mode 100644 index 876d99475..000000000 --- a/tutorials/basic/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(scalarTransportFoam) -add_subdirectory(potentialFoam) -add_subdirectory(PODSolver) \ No newline at end of file diff --git a/tutorials/basic/PODSolver/1DPODsin/CMakeLists.txt b/tutorials/basic/PODSolver/1DPODsin/CMakeLists.txt deleted file mode 100644 index f34aca677..000000000 --- a/tutorials/basic/PODSolver/1DPODsin/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(setTcos) \ No newline at end of file diff --git a/tutorials/basic/PODSolver/1DPODsin/setTcos/CMakeLists.txt b/tutorials/basic/PODSolver/1DPODsin/setTcos/CMakeLists.txt index 31bec57fc..7ccd96d67 100644 --- a/tutorials/basic/PODSolver/1DPODsin/setTcos/CMakeLists.txt +++ b/tutorials/basic/PODSolver/1DPODsin/setTcos/CMakeLists.txt @@ -41,6 +41,7 @@ if(NOT FOAM_FOUND) endif() add_foam_executable(setTcos -# DEPENDS finiteVolume + DEPENDS finiteVolume SOURCES ${SOURCES} + USERSPACE # Hack: User, Site support not implemented ) diff --git a/tutorials/basic/PODSolver/CMakeLists.txt b/tutorials/basic/PODSolver/CMakeLists.txt deleted file mode 100644 index 74ec0277f..000000000 --- a/tutorials/basic/PODSolver/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(1DPODsin) \ No newline at end of file diff --git a/tutorials/basic/potentialFoam/CMakeLists.txt b/tutorials/basic/potentialFoam/CMakeLists.txt deleted file mode 100644 index aae6bcd9b..000000000 --- a/tutorials/basic/potentialFoam/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(cylinder) \ No newline at end of file diff --git a/tutorials/basic/potentialFoam/cylinder/CMakeLists.txt b/tutorials/basic/potentialFoam/cylinder/CMakeLists.txt deleted file mode 100644 index a7cef6c95..000000000 --- a/tutorials/basic/potentialFoam/cylinder/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(analyticalCylinder) \ No newline at end of file diff --git a/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/CMakeLists.txt b/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/CMakeLists.txt index 462697428..4d85be98b 100644 --- a/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/CMakeLists.txt +++ b/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/CMakeLists.txt @@ -41,6 +41,7 @@ if(NOT FOAM_FOUND) endif() add_foam_executable(analyticalCylinder -# DEPENDS finiteVolume + DEPENDS finiteVolume SOURCES ${SOURCES} + USERSPACE # Hack: User, Site support not implemented ) diff --git a/tutorials/basic/scalarTransportFoam/CMakeLists.txt b/tutorials/basic/scalarTransportFoam/CMakeLists.txt deleted file mode 100644 index cea917f80..000000000 --- a/tutorials/basic/scalarTransportFoam/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(swirlTest) \ No newline at end of file diff --git a/tutorials/basic/scalarTransportFoam/swirlTest/CMakeLists.txt b/tutorials/basic/scalarTransportFoam/swirlTest/CMakeLists.txt deleted file mode 100644 index 4e1eb13f5..000000000 --- a/tutorials/basic/scalarTransportFoam/swirlTest/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(setSwirl) \ No newline at end of file diff --git a/tutorials/basic/scalarTransportFoam/swirlTest/setSwirl/CMakeLists.txt b/tutorials/basic/scalarTransportFoam/swirlTest/setSwirl/CMakeLists.txt index 7ecbd66ee..3a456fa3f 100644 --- a/tutorials/basic/scalarTransportFoam/swirlTest/setSwirl/CMakeLists.txt +++ b/tutorials/basic/scalarTransportFoam/swirlTest/setSwirl/CMakeLists.txt @@ -41,6 +41,7 @@ if(NOT FOAM_FOUND) endif() add_foam_executable(setSwirl -# DEPENDS finiteVolume + DEPENDS finiteVolume SOURCES ${SOURCES} + USERSPACE # Hack: User, Site support not implemented ) diff --git a/tutorials/compressible/CMakeLists.txt b/tutorials/compressible/CMakeLists.txt deleted file mode 100644 index c040297e4..000000000 --- a/tutorials/compressible/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(rhoCentralFoam) \ No newline at end of file diff --git a/tutorials/compressible/rhoCentralFoam/Allrun b/tutorials/compressible/rhoCentralFoam/Allrun index d20d46fdd..c9f7d4375 100755 --- a/tutorials/compressible/rhoCentralFoam/Allrun +++ b/tutorials/compressible/rhoCentralFoam/Allrun @@ -34,7 +34,7 @@ do if [ "$case" = "biconic25-55Run35" ] ; then cd $case - wmake datToFoam + compileApplication datToFoam runApplication datToFoam grid256.dat CONST="constant" diff --git a/tutorials/compressible/rhoCentralFoam/CMakeLists.txt b/tutorials/compressible/rhoCentralFoam/CMakeLists.txt deleted file mode 100644 index 4a9d85283..000000000 --- a/tutorials/compressible/rhoCentralFoam/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(biconic25-55Run35) \ No newline at end of file diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/CMakeLists.txt b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/CMakeLists.txt deleted file mode 100644 index b699134c9..000000000 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(datToFoam) \ No newline at end of file diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/CMakeLists.txt b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/CMakeLists.txt index 8abe6cb54..d5c2e5b66 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/CMakeLists.txt +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/CMakeLists.txt @@ -41,6 +41,7 @@ if(NOT FOAM_FOUND) endif() add_foam_executable(datToFoam -# DEPENDS finiteVolume + DEPENDS finiteVolume SOURCES ${SOURCES} + USERSPACE # Hack: User, Site support not implemented ) diff --git a/tutorials/finiteArea/CMakeLists.txt b/tutorials/finiteArea/CMakeLists.txt deleted file mode 100644 index c9f2fe833..000000000 --- a/tutorials/finiteArea/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(surfactantFoam) -add_subdirectory(liquidFilmFoam) \ No newline at end of file diff --git a/tutorials/finiteArea/liquidFilmFoam/CMakeLists.txt b/tutorials/finiteArea/liquidFilmFoam/CMakeLists.txt deleted file mode 100644 index 817e00b32..000000000 --- a/tutorials/finiteArea/liquidFilmFoam/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(dropsSpreading) \ No newline at end of file diff --git a/tutorials/finiteArea/liquidFilmFoam/dropsSpreading/CMakeLists.txt b/tutorials/finiteArea/liquidFilmFoam/dropsSpreading/CMakeLists.txt deleted file mode 100644 index ba7f0effe..000000000 --- a/tutorials/finiteArea/liquidFilmFoam/dropsSpreading/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(setInitialDroplet) \ No newline at end of file diff --git a/tutorials/finiteArea/liquidFilmFoam/dropsSpreading/setInitialDroplet/CMakeLists.txt b/tutorials/finiteArea/liquidFilmFoam/dropsSpreading/setInitialDroplet/CMakeLists.txt index 7d165877a..d59672c9a 100644 --- a/tutorials/finiteArea/liquidFilmFoam/dropsSpreading/setInitialDroplet/CMakeLists.txt +++ b/tutorials/finiteArea/liquidFilmFoam/dropsSpreading/setInitialDroplet/CMakeLists.txt @@ -41,6 +41,7 @@ if(NOT FOAM_FOUND) endif() add_foam_executable(setInitialDroplet -# DEPENDS finiteVolume + DEPENDS finiteVolume finiteArea SOURCES ${SOURCES} + USERSPACE # Hack: User, Site support not implemented ) diff --git a/tutorials/finiteArea/surfactantFoam/CMakeLists.txt b/tutorials/finiteArea/surfactantFoam/CMakeLists.txt deleted file mode 100644 index 0bb2f7fa2..000000000 --- a/tutorials/finiteArea/surfactantFoam/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(sphereTransport) \ No newline at end of file diff --git a/tutorials/finiteArea/surfactantFoam/sphereTransport/CMakeLists.txt b/tutorials/finiteArea/surfactantFoam/sphereTransport/CMakeLists.txt deleted file mode 100644 index b7a69308d..000000000 --- a/tutorials/finiteArea/surfactantFoam/sphereTransport/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(sphereSurfactantFoam) \ No newline at end of file diff --git a/tutorials/finiteArea/surfactantFoam/sphereTransport/sphereSurfactantFoam/CMakeLists.txt b/tutorials/finiteArea/surfactantFoam/sphereTransport/sphereSurfactantFoam/CMakeLists.txt index 646ad316f..6d3b48989 100644 --- a/tutorials/finiteArea/surfactantFoam/sphereTransport/sphereSurfactantFoam/CMakeLists.txt +++ b/tutorials/finiteArea/surfactantFoam/sphereTransport/sphereSurfactantFoam/CMakeLists.txt @@ -41,6 +41,7 @@ if(NOT FOAM_FOUND) endif() add_foam_executable(sphereSurfactantFoam -# DEPENDS finiteVolume + DEPENDS finiteVolume finiteArea SOURCES ${SOURCES} + USERSPACE # Hack: User, Site support not implemented ) diff --git a/tutorials/finiteArea/surfactantFoam/sphereTransport/sphereTransport/Allrun b/tutorials/finiteArea/surfactantFoam/sphereTransport/sphereTransport/Allrun index feb5e2e51..cf63bc9f6 100755 --- a/tutorials/finiteArea/surfactantFoam/sphereTransport/sphereTransport/Allrun +++ b/tutorials/finiteArea/surfactantFoam/sphereTransport/sphereTransport/Allrun @@ -4,7 +4,7 @@ application="sphereSurfactantFoam" -wmake ../$application +compileApplication ../$application runApplication makeFaMesh runApplication $application diff --git a/tutorials/heatTransfer/CMakeLists.txt b/tutorials/heatTransfer/CMakeLists.txt deleted file mode 100644 index 2a4691dad..000000000 --- a/tutorials/heatTransfer/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(buoyantPisoFoam) -add_subdirectory(setHotRoom) \ No newline at end of file diff --git a/tutorials/heatTransfer/buoyantPisoFoam/CMakeLists.txt b/tutorials/heatTransfer/buoyantPisoFoam/CMakeLists.txt deleted file mode 100644 index 5f80c2b86..000000000 --- a/tutorials/heatTransfer/buoyantPisoFoam/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(hotRoom) \ No newline at end of file diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/CMakeLists.txt b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/CMakeLists.txt deleted file mode 100644 index d767abcfe..000000000 --- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(setHotRoom) \ No newline at end of file diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/CMakeLists.txt b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/CMakeLists.txt deleted file mode 100644 index bfef0cf41..000000000 --- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/CMakeLists.txt +++ /dev/null @@ -1,46 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -list(APPEND SOURCES - setHotRoom.C -) - -# Set minimal environment for external compilation -if(NOT FOAM_FOUND) - cmake_minimum_required(VERSION 2.8) - find_package(FOAM REQUIRED) -endif() - -add_foam_executable(setHotRoom -# DEPENDS finiteVolume - SOURCES ${SOURCES} -) diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/Make/files b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/Make/files deleted file mode 100644 index afc08f453..000000000 --- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -setHotRoom.C - -EXE = $(FOAM_USER_APPBIN)/setHotRoom diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/Make/options b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/Make/options deleted file mode 100644 index fa15f1245..000000000 --- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/Make/options +++ /dev/null @@ -1,5 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude - -EXE_LIBS = \ - -lfiniteVolume diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/createFields.H b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/createFields.H deleted file mode 100644 index cde21f4cd..000000000 --- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/createFields.H +++ /dev/null @@ -1,13 +0,0 @@ - Info<< "Reading field T\n" << endl; - volScalarField T - ( - IOobject - ( - "T", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C deleted file mode 100644 index de341ca03..000000000 --- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C +++ /dev/null @@ -1,94 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | foam-extend: Open Source CFD - \\ / O peration | Version: 4.0 - \\ / A nd | Web: http://www.foam-extend.org - \\/ M anipulation | For copyright notice see file Copyright -------------------------------------------------------------------------------- -License - This file is part of foam-extend. - - foam-extend is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation, either version 3 of the License, or (at your - option) any later version. - - foam-extend is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with foam-extend. If not, see . - -Application - setHotRoom - -Description - Set the initial field of T for the hot room problem. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "OSspecific.H" -#include "fixedValueFvPatchFields.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - -# include "setRootCase.H" - -# include "createTime.H" -# include "createMesh.H" -# include "createFields.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -volScalarField::GeometricBoundaryField& Tpatches = T.boundaryField(); - -forAll(Tpatches, patchI) -{ - if - ( - (typeid(Tpatches[patchI]) == typeid(fixedValueFvPatchScalarField)) - && - (mesh.boundaryMesh()[patchI].name() == "floor") - ) - { - fixedValueFvPatchScalarField& Tpatch = - refCast(Tpatches[patchI]); - - const vectorField& faceCentres = - mesh.Cf().boundaryField()[patchI]; - - forAll(faceCentres, facei) - { - if - ( - (faceCentres[facei].x() > 4.5) && - (faceCentres[facei].x() < 5.5) && - (faceCentres[facei].z() > 4.5) && - (faceCentres[facei].z() < 5.5) - ) - { - Tpatch[facei] = 600; - } - else - { - Tpatch[facei] = 300; - } - } - }; - - Info<< "Writing modified field T\n" << endl; - T.write(); - - Info<< "End\n" << endl; - - return 0; -} - -} -// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution index 767df6d51..26347ee44 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution @@ -51,7 +51,7 @@ solvers tolerance 1e-05; relTol 0.1; } - G PCG + G { solver CG; preconditioner Cholesky; diff --git a/tutorials/heatTransfer/setHotRoom/CMakeLists.txt b/tutorials/heatTransfer/setHotRoom/CMakeLists.txt index bfef0cf41..1bd93cfde 100644 --- a/tutorials/heatTransfer/setHotRoom/CMakeLists.txt +++ b/tutorials/heatTransfer/setHotRoom/CMakeLists.txt @@ -41,6 +41,7 @@ if(NOT FOAM_FOUND) endif() add_foam_executable(setHotRoom -# DEPENDS finiteVolume + DEPENDS finiteVolume SOURCES ${SOURCES} + USERSPACE # Hack: User, Site support not implemented ) diff --git a/tutorials/immersedBoundary/CMakeLists.txt b/tutorials/immersedBoundary/CMakeLists.txt deleted file mode 100644 index b00eda79f..000000000 --- a/tutorials/immersedBoundary/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(sphereInChannel) -add_subdirectory(thickPlateRefinedMesh) \ No newline at end of file diff --git a/tutorials/immersedBoundary/cylinderInSquareLaplace/system/controlDict b/tutorials/immersedBoundary/cylinderInSquareLaplace/system/controlDict index d2f3a94d8..48c7f6b6e 100644 --- a/tutorials/immersedBoundary/cylinderInSquareLaplace/system/controlDict +++ b/tutorials/immersedBoundary/cylinderInSquareLaplace/system/controlDict @@ -46,6 +46,7 @@ runTimeModifiable yes; libs ( + "liblduSolvers.so" "libimmersedBoundary.so" ); diff --git a/tutorials/immersedBoundary/refiningMovingCylinderInChannelIco/system/controlDict b/tutorials/immersedBoundary/refiningMovingCylinderInChannelIco/system/controlDict index 2434442fc..cd57f9501 100644 --- a/tutorials/immersedBoundary/refiningMovingCylinderInChannelIco/system/controlDict +++ b/tutorials/immersedBoundary/refiningMovingCylinderInChannelIco/system/controlDict @@ -59,6 +59,7 @@ maxCo 0.2; libs ( + "liblduSolvers.so" "libimmersedBoundary.so" "libimmersedBoundaryDynamicMesh.so" ); diff --git a/tutorials/immersedBoundary/sphereInChannel/CMakeLists.txt b/tutorials/immersedBoundary/sphereInChannel/CMakeLists.txt deleted file mode 100644 index e7523951c..000000000 --- a/tutorials/immersedBoundary/sphereInChannel/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(refineSphereMesh) \ No newline at end of file diff --git a/tutorials/immersedBoundary/sphereInChannel/refineSphereMesh/CMakeLists.txt b/tutorials/immersedBoundary/sphereInChannel/refineSphereMesh/CMakeLists.txt deleted file mode 100644 index a81583497..000000000 --- a/tutorials/immersedBoundary/sphereInChannel/refineSphereMesh/CMakeLists.txt +++ /dev/null @@ -1,46 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -list(APPEND SOURCES - refineSphereMesh.C -) - -# Set minimal environment for external compilation -if(NOT FOAM_FOUND) - cmake_minimum_required(VERSION 2.8) - find_package(FOAM REQUIRED) -endif() - -add_foam_executable(refineSphereMesh -# DEPENDS finiteVolume - SOURCES ${SOURCES} -) diff --git a/tutorials/immersedBoundary/thickPlateRefinedMesh/CMakeLists.txt b/tutorials/immersedBoundary/thickPlateRefinedMesh/CMakeLists.txt deleted file mode 100644 index 1a1ba5913..000000000 --- a/tutorials/immersedBoundary/thickPlateRefinedMesh/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(refineThickPlateMesh) \ No newline at end of file diff --git a/tutorials/immersedBoundary/thickPlateRefinedMesh/refineThickPlateMesh/CMakeLists.txt b/tutorials/immersedBoundary/thickPlateRefinedMesh/refineThickPlateMesh/CMakeLists.txt deleted file mode 100644 index 6add93513..000000000 --- a/tutorials/immersedBoundary/thickPlateRefinedMesh/refineThickPlateMesh/CMakeLists.txt +++ /dev/null @@ -1,46 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -list(APPEND SOURCES - refineThickPlateMesh.C -) - -# Set minimal environment for external compilation -if(NOT FOAM_FOUND) - cmake_minimum_required(VERSION 2.8) - find_package(FOAM REQUIRED) -endif() - -add_foam_executable(refineThickPlateMesh -# DEPENDS finiteVolume - SOURCES ${SOURCES} -) diff --git a/tutorials/incompressible/CMakeLists.txt b/tutorials/incompressible/CMakeLists.txt deleted file mode 100644 index 995eb8540..000000000 --- a/tutorials/incompressible/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(icoDyMFoam) \ No newline at end of file diff --git a/tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/system/controlDict index 9196b0926..3df970e86 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/system/controlDict +++ b/tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/system/controlDict @@ -62,5 +62,10 @@ runTimeModifiable yes; // Output format for graphs graphFormat raw; +libs +( + "liblduSolvers.so" +); + // ************************************************************************* // diff --git a/tutorials/incompressible/icoDyMFoam/CMakeLists.txt b/tutorials/incompressible/icoDyMFoam/CMakeLists.txt deleted file mode 100644 index 3844ec576..000000000 --- a/tutorials/incompressible/icoDyMFoam/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(movingBlockRBF) -add_subdirectory(movingConeMotion) \ No newline at end of file diff --git a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/CMakeLists.txt b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/CMakeLists.txt deleted file mode 100644 index 48373c00b..000000000 --- a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(RBFMotionFunction) \ No newline at end of file diff --git a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/CMakeLists.txt b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/CMakeLists.txt index 09192fa6c..1716910f8 100644 --- a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/CMakeLists.txt +++ b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/CMakeLists.txt @@ -34,6 +34,12 @@ list(APPEND SOURCES RBFMotionFunctionObject.C ) +# Set minimal environment for external compilation +if(NOT FOAM_FOUND) + cmake_minimum_required(VERSION 2.8) + find_package(FOAM REQUIRED) +endif() + add_foam_library(RBFMotionFunction SHARED ${SOURCES}) -#target_link_libraries(RBFMotionFunction finiteVolume) +target_link_libraries(RBFMotionFunction PUBLIC RBFMotionSolver) diff --git a/tutorials/incompressible/icoDyMFoam/movingConeMotion/CMakeLists.txt b/tutorials/incompressible/icoDyMFoam/movingConeMotion/CMakeLists.txt deleted file mode 100644 index ea7c05e09..000000000 --- a/tutorials/incompressible/icoDyMFoam/movingConeMotion/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(setMotionMovingCone) \ No newline at end of file diff --git a/tutorials/incompressible/icoDyMFoam/movingConeMotion/setMotionMovingCone/CMakeLists.txt b/tutorials/incompressible/icoDyMFoam/movingConeMotion/setMotionMovingCone/CMakeLists.txt index 93809682b..5ca65e519 100644 --- a/tutorials/incompressible/icoDyMFoam/movingConeMotion/setMotionMovingCone/CMakeLists.txt +++ b/tutorials/incompressible/icoDyMFoam/movingConeMotion/setMotionMovingCone/CMakeLists.txt @@ -41,6 +41,7 @@ if(NOT FOAM_FOUND) endif() add_foam_executable(setMotionMovingCone -# DEPENDS finiteVolume + DEPENDS tetFiniteElement SOURCES ${SOURCES} + USERSPACE # Hack: User, Site support not implemented ) diff --git a/tutorials/lagrangian/CMakeLists.txt b/tutorials/lagrangian/CMakeLists.txt deleted file mode 100644 index faf4f04a2..000000000 --- a/tutorials/lagrangian/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(rhoPisoTwinParcelFoam) -add_subdirectory(icoLagrangianFoam) \ No newline at end of file diff --git a/tutorials/lagrangian/icoLagrangianFoam/CMakeLists.txt b/tutorials/lagrangian/icoLagrangianFoam/CMakeLists.txt deleted file mode 100644 index 305f94017..000000000 --- a/tutorials/lagrangian/icoLagrangianFoam/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(icoLagrangianFoam) \ No newline at end of file diff --git a/tutorials/lagrangian/icoLagrangianFoam/channelParticles/Allrun b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/Allrun index d1cf77d18..43f329b8f 100755 --- a/tutorials/lagrangian/icoLagrangianFoam/channelParticles/Allrun +++ b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/Allrun @@ -6,7 +6,7 @@ application=`getApplication` # make sure the application is compiled -wmake ../$application +compileApplication ../$application runApplication blockMesh runApplication $application diff --git a/tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/polyMesh/boundary b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/polyMesh/boundary index 8072643f7..4be188586 100644 --- a/tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/polyMesh/boundary +++ b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 4.0 | +| \\ / O peration | Version: v4.0-931-730452a-dirty | | \\ / A nd | Web: http://www.foam-extend.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/lagrangian/icoLagrangianFoam/icoLagrangianFoam/CMakeLists.txt b/tutorials/lagrangian/icoLagrangianFoam/icoLagrangianFoam/CMakeLists.txt index 37f395945..b7085ba1d 100644 --- a/tutorials/lagrangian/icoLagrangianFoam/icoLagrangianFoam/CMakeLists.txt +++ b/tutorials/lagrangian/icoLagrangianFoam/icoLagrangianFoam/CMakeLists.txt @@ -41,6 +41,8 @@ if(NOT FOAM_FOUND) endif() add_foam_executable(icoLagrangianFoam -# DEPENDS finiteVolume + DEPENDS lagrangianIntermediate SOURCES ${SOURCES} + USERSPACE # Hack: User, Site support not implemented ) + diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/CMakeLists.txt b/tutorials/lagrangian/rhoPisoTwinParcelFoam/CMakeLists.txt deleted file mode 100644 index 42f8deb0e..000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(rhoPisoTwinParcelFoam) \ No newline at end of file diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/CMakeLists.txt b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/CMakeLists.txt index 41b20dabb..6a9b69a35 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/CMakeLists.txt +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/CMakeLists.txt @@ -41,6 +41,7 @@ if(NOT FOAM_FOUND) endif() add_foam_executable(rhoPisoTwinParcelFoam -# DEPENDS finiteVolume + DEPENDS lagrangianIntermediate SOURCES ${SOURCES} + USERSPACE # Hack: User, Site support not implemented ) diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/Allrun b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/Allrun index d1cf77d18..43f329b8f 100755 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/Allrun +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/Allrun @@ -6,7 +6,7 @@ application=`getApplication` # make sure the application is compiled -wmake ../$application +compileApplication ../$application runApplication blockMesh runApplication $application diff --git a/tutorials/multiphase/CMakeLists.txt b/tutorials/multiphase/CMakeLists.txt deleted file mode 100644 index cb387a414..000000000 --- a/tutorials/multiphase/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(interDyMFoam) \ No newline at end of file diff --git a/tutorials/multiphase/interDyMFoam/CMakeLists.txt b/tutorials/multiphase/interDyMFoam/CMakeLists.txt deleted file mode 100644 index 3fa034a4c..000000000 --- a/tutorials/multiphase/interDyMFoam/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(ras) \ No newline at end of file diff --git a/tutorials/multiphase/interDyMFoam/ras/CMakeLists.txt b/tutorials/multiphase/interDyMFoam/ras/CMakeLists.txt deleted file mode 100644 index a8cae4fe6..000000000 --- a/tutorials/multiphase/interDyMFoam/ras/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(sloshingTank3D6DoF) \ No newline at end of file diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/CMakeLists.txt b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/CMakeLists.txt deleted file mode 100644 index 2a9f5604f..000000000 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(gen6DoF) \ No newline at end of file diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/CMakeLists.txt b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/CMakeLists.txt index 0ca6b7490..dd7f90558 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/CMakeLists.txt +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/CMakeLists.txt @@ -41,6 +41,7 @@ if(NOT FOAM_FOUND) endif() add_foam_executable(gen6DoF -# DEPENDS finiteVolume + DEPENDS finiteVolume SOURCES ${SOURCES} + USERSPACE # Hack: User, Site support not implemented ) diff --git a/tutorials/solidMechanics/CMakeLists.txt b/tutorials/solidMechanics/CMakeLists.txt deleted file mode 100644 index 4bf6047eb..000000000 --- a/tutorials/solidMechanics/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(elasticSolidFoam) -add_subdirectory(elasticThermalSolidFoam) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticSolidFoam/CMakeLists.txt b/tutorials/solidMechanics/elasticSolidFoam/CMakeLists.txt deleted file mode 100644 index 565a17deb..000000000 --- a/tutorials/solidMechanics/elasticSolidFoam/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(plateHole) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticSolidFoam/plateHole/Allrun b/tutorials/solidMechanics/elasticSolidFoam/plateHole/Allrun index 0989f69d8..ecb43fb60 100755 --- a/tutorials/solidMechanics/elasticSolidFoam/plateHole/Allrun +++ b/tutorials/solidMechanics/elasticSolidFoam/plateHole/Allrun @@ -8,5 +8,5 @@ application="elasticSolidFoam" runApplication blockMesh runApplication $application -(cd analyticalPlateHole && runApplication wmake) -runApplication analyticalPlateHole \ No newline at end of file +compileApplication analyticalPlateHole +runApplication analyticalPlateHole diff --git a/tutorials/solidMechanics/elasticSolidFoam/plateHole/CMakeLists.txt b/tutorials/solidMechanics/elasticSolidFoam/plateHole/CMakeLists.txt deleted file mode 100644 index c48a94be7..000000000 --- a/tutorials/solidMechanics/elasticSolidFoam/plateHole/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(analyticalPlateHole) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticSolidFoam/plateHole/analyticalPlateHole/CMakeLists.txt b/tutorials/solidMechanics/elasticSolidFoam/plateHole/analyticalPlateHole/CMakeLists.txt index ff02c374f..1d35c955e 100644 --- a/tutorials/solidMechanics/elasticSolidFoam/plateHole/analyticalPlateHole/CMakeLists.txt +++ b/tutorials/solidMechanics/elasticSolidFoam/plateHole/analyticalPlateHole/CMakeLists.txt @@ -41,6 +41,7 @@ if(NOT FOAM_FOUND) endif() add_foam_executable(analyticalPlateHole -# DEPENDS finiteVolume + DEPENDS finiteVolume SOURCES ${SOURCES} + USERSPACE # Hack: User, Site support not implemented ) diff --git a/tutorials/solidMechanics/elasticThermalSolidFoam/CMakeLists.txt b/tutorials/solidMechanics/elasticThermalSolidFoam/CMakeLists.txt deleted file mode 100644 index af9916043..000000000 --- a/tutorials/solidMechanics/elasticThermalSolidFoam/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(hotCylinder) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/Allrun b/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/Allrun index 394b0dcf8..cc691a7d2 100755 --- a/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/Allrun +++ b/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/Allrun @@ -8,5 +8,5 @@ application="elasticThermalSolidFoam" runApplication blockMesh runApplication $application -(cd analyticalHotCylinder && runApplication wmake) +compileApplication analyticalHotCylinder runApplication analyticalHotCylinder diff --git a/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/CMakeLists.txt b/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/CMakeLists.txt deleted file mode 100644 index 9c6ac05f8..000000000 --- a/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -------------------------------------------------------------------------- -# ======== | -# \ / F ield | foam-extend: Open Source CFD -# \ / O peration | Version: 4.1 -# \ / A nd | Web: http://www.foam-extend.org -# \/ M anipulation | For copyright notice see file Copyright -# -------------------------------------------------------------------------- -# License -# This file is part of foam-extend. -# -# foam-extend is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or {at your -# option} any later version. -# -# foam-extend is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with foam-extend. If not, see . -# -# Description -# CMakeLists.txt file for libraries and applications -# -# Author -# Henrik Rusche, Wikki GmbH, 2017. All rights reserved -# -# -# -------------------------------------------------------------------------- - -add_subdirectory(analyticalHotCylinder) \ No newline at end of file diff --git a/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/analyticalHotCylinder/CMakeLists.txt b/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/analyticalHotCylinder/CMakeLists.txt index 9a4c0cbfb..0422cbe3a 100644 --- a/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/analyticalHotCylinder/CMakeLists.txt +++ b/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/analyticalHotCylinder/CMakeLists.txt @@ -41,6 +41,7 @@ if(NOT FOAM_FOUND) endif() add_foam_executable(analyticalHotCylinder -# DEPENDS finiteVolume + DEPENDS finiteVolume SOURCES ${SOURCES} + USERSPACE # Hack: User, Site support not implemented )