From 4bbbbf780aff789aa73ed042cde8647c44e4aac3 Mon Sep 17 00:00:00 2001 From: Robert Keser Date: Fri, 31 Mar 2017 12:36:01 +0200 Subject: [PATCH 1/9] Bugfix: Windows now compiles surfaceCoarsen Author: Vanja Skuric --- applications/utilities/surface/surfaceCoarsen/Make/files | 2 +- .../utilities/surface/surfaceCoarsen/bunnylod/bunnygut.C | 2 +- .../surface/surfaceCoarsen/bunnylod/{list.h => listb.h} | 0 .../utilities/surface/surfaceCoarsen/bunnylod/progmesh.C | 4 ++-- .../utilities/surface/surfaceCoarsen/bunnylod/progmesh.h | 4 ++-- .../surface/surfaceCoarsen/bunnylod/{vector.C => vectorb.C} | 2 +- .../surface/surfaceCoarsen/bunnylod/{vector.h => vectorb.h} | 0 7 files changed, 7 insertions(+), 7 deletions(-) rename applications/utilities/surface/surfaceCoarsen/bunnylod/{list.h => listb.h} (100%) rename applications/utilities/surface/surfaceCoarsen/bunnylod/{vector.C => vectorb.C} (99%) rename applications/utilities/surface/surfaceCoarsen/bunnylod/{vector.h => vectorb.h} (100%) diff --git a/applications/utilities/surface/surfaceCoarsen/Make/files b/applications/utilities/surface/surfaceCoarsen/Make/files index f2a1e0725..f9538c5dd 100644 --- a/applications/utilities/surface/surfaceCoarsen/Make/files +++ b/applications/utilities/surface/surfaceCoarsen/Make/files @@ -1,5 +1,5 @@ bunnylod/progmesh.C -bunnylod/vector.C +bunnylod/vectorb.C surfaceCoarsen.C EXE = $(FOAM_APPBIN)/surfaceCoarsen diff --git a/applications/utilities/surface/surfaceCoarsen/bunnylod/bunnygut.C b/applications/utilities/surface/surfaceCoarsen/bunnylod/bunnygut.C index 506eb938a..17e89ab4e 100644 --- a/applications/utilities/surface/surfaceCoarsen/bunnylod/bunnygut.C +++ b/applications/utilities/surface/surfaceCoarsen/bunnylod/bunnygut.C @@ -19,7 +19,7 @@ #include #pragma warning(disable : 4244) -#include "vector.h" +#include "vectorb.h" #include "font.h" #include "progmesh.h" #include "rabdata.h" diff --git a/applications/utilities/surface/surfaceCoarsen/bunnylod/list.h b/applications/utilities/surface/surfaceCoarsen/bunnylod/listb.h similarity index 100% rename from applications/utilities/surface/surfaceCoarsen/bunnylod/list.h rename to applications/utilities/surface/surfaceCoarsen/bunnylod/listb.h diff --git a/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.C b/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.C index 165abef9f..ec29fd02f 100644 --- a/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.C +++ b/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.C @@ -13,8 +13,8 @@ #include //#include -#include "vector.h" -#include "list.h" +#include "vectorb.h" +#include "listb.h" #include "progmesh.h" #define min(x,y) (((x) <= (y)) ? (x) : (y)) diff --git a/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.h b/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.h index f87ce4cbe..c420d43fd 100644 --- a/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.h +++ b/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.h @@ -18,8 +18,8 @@ #ifndef PROGRESSIVE_MESH_H #define PROGRESSIVE_MESH_H -#include "vector.h" -#include "list.h" +#include "vectorb.h" +#include "listb.h" class tridata { public: diff --git a/applications/utilities/surface/surfaceCoarsen/bunnylod/vector.C b/applications/utilities/surface/surfaceCoarsen/bunnylod/vectorb.C similarity index 99% rename from applications/utilities/surface/surfaceCoarsen/bunnylod/vector.C rename to applications/utilities/surface/surfaceCoarsen/bunnylod/vectorb.C index d3ead286f..360886830 100644 --- a/applications/utilities/surface/surfaceCoarsen/bunnylod/vector.C +++ b/applications/utilities/surface/surfaceCoarsen/bunnylod/vectorb.C @@ -3,7 +3,7 @@ #include #include -#include "vector.h" +#include "vectorb.h" float sqr(float a) {return a*a;} diff --git a/applications/utilities/surface/surfaceCoarsen/bunnylod/vector.h b/applications/utilities/surface/surfaceCoarsen/bunnylod/vectorb.h similarity index 100% rename from applications/utilities/surface/surfaceCoarsen/bunnylod/vector.h rename to applications/utilities/surface/surfaceCoarsen/bunnylod/vectorb.h From cd214ab5a3ce711139c080145f144a34c92e0436 Mon Sep 17 00:00:00 2001 From: Robert Keser Date: Fri, 31 Mar 2017 15:53:16 +0200 Subject: [PATCH 2/9] Avoid compiling foamToTecplot360 on Windows Authors: Robert Keser & Vanja Skuric --- .../dataConversion/foamToTecplot360/Allwmake | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake index 935e8e399..a421f7649 100755 --- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake +++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake @@ -5,10 +5,16 @@ cd ${0%/*} || exit 1 # run from this directory set -x -# build tecio -wmake libso tecio/tecsrc +# foamToTecplot360 will not compile on MS Windows +if [ "$WM_OSTYPE" = "MSWindows" ] +then + echo MSWindows detected. Skipping compilation of foamToTecplot360. +else + # build tecio + wmake libso tecio/tecsrc -# build converter -wmake + # build converter + wmake +fi # ----------------------------------------------------------------- end-of-file From 75c66b113f26ff3c91f1e3aa40379b7e30538c4c Mon Sep 17 00:00:00 2001 From: Robert Keser Date: Tue, 4 Apr 2017 14:33:58 +0200 Subject: [PATCH 3/9] Started repairing tutorial cases on windows. --- tutorials/DNS/dnsFoam/boxTurb16/system/controlDict | 5 +++++ tutorials/basic/PODSolver/1DPODdiffusion/system/controlDict | 5 +++++ tutorials/basic/PODSolver/1DPODsin/system/controlDict | 5 +++++ .../basic/scalarTransportFoam/pitzDaily/system/controlDict | 5 +++++ .../basic/scalarTransportFoam/swirlTest/system/controlDict | 5 +++++ tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict | 1 + .../combustion/XiFoam/les/pitzDaily3D/system/controlDict | 1 + .../XiFoam/ras/moriyoshiHomogeneous/system/controlDict | 1 + 8 files changed, 28 insertions(+) diff --git a/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict b/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict index 5f7ef8972..1d978d0ad 100644 --- a/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict +++ b/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application dnsFoam; startFrom startTime; diff --git a/tutorials/basic/PODSolver/1DPODdiffusion/system/controlDict b/tutorials/basic/PODSolver/1DPODdiffusion/system/controlDict index 15a182c78..7077744b7 100644 --- a/tutorials/basic/PODSolver/1DPODdiffusion/system/controlDict +++ b/tutorials/basic/PODSolver/1DPODdiffusion/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application scalarTransportFoam; startFrom startTime; diff --git a/tutorials/basic/PODSolver/1DPODsin/system/controlDict b/tutorials/basic/PODSolver/1DPODsin/system/controlDict index 15a182c78..7077744b7 100644 --- a/tutorials/basic/PODSolver/1DPODsin/system/controlDict +++ b/tutorials/basic/PODSolver/1DPODsin/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application scalarTransportFoam; startFrom startTime; diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict b/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict index 37e54f040..3973d3eba 100644 --- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict +++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application scalarTransportFoam; startFrom startTime; diff --git a/tutorials/basic/scalarTransportFoam/swirlTest/system/controlDict b/tutorials/basic/scalarTransportFoam/swirlTest/system/controlDict index a3bbe1a77..fd66c7e97 100644 --- a/tutorials/basic/scalarTransportFoam/swirlTest/system/controlDict +++ b/tutorials/basic/scalarTransportFoam/swirlTest/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application scalarTransportFoam; startFrom startTime; diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict index 74ff00455..9a8802dad 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict +++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict @@ -18,6 +18,7 @@ FoamFile libs ( "libcompressibleLESModels.so" + "liblduSolvers.so" ) application XiFoam; diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict index 39b0497ee..1857fe0c6 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict @@ -18,6 +18,7 @@ FoamFile libs ( "libcompressibleLESModels.so" + "liblduSolvers.so" ) application XiFoam; diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict index 008b62200..aa10614c3 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict @@ -18,6 +18,7 @@ FoamFile libs ( "libcompressibleRASModels.so" + "liblduSolvers.so" ) application XiFoam; From 1f5e031f9cfa8904e0fe1f56938b6d46ffa74f5c Mon Sep 17 00:00:00 2001 From: Robert Keser Date: Mon, 17 Apr 2017 15:18:03 +0200 Subject: [PATCH 4/9] Repairing tutorial cases on windows. --- .../dieselFoam/aachenBomb/system/controlDict | 5 ++ .../engineFoam/kivaTest/system/controlDict | 6 ++ .../kivaTest/system/controlDict.1st | 6 ++ .../kivaTest/system/controlDict.2nd | 6 ++ .../les/smallPoolFire2D/system/controlDict | 1 + .../ras/counterFlowFlame2D/system/controlDict | 1 + .../dbnsTurbFoam/naca0012/system/controlDict | 1 + .../ras/backStep/system/controlDict | 5 ++ .../ras/backStep_IAPWS97/system/controlDict | 5 ++ .../ras/cavity_IAPWS97/system/controlDict | 5 ++ .../ras/t-junction/system/controlDict | 5 ++ .../angledDuct/system/controlDict | 1 + .../les/pitzDaily/system/controlDict | 1 + .../rhoPisoFoam/ras/cavity/system/controlDict | 1 + .../mixerVessel2D/system/controlDict | 1 + .../rhoPorousSimpleFoam/angledDuctExplicit/0 | 1 - .../angledDuctExplicit/0/T | 55 ++++++++++++++++ .../angledDuctExplicit/0/U | 58 +++++++++++++++++ .../angledDuctExplicit/0/alphat | 57 +++++++++++++++++ .../angledDuctExplicit/0/epsilon | 64 +++++++++++++++++++ .../angledDuctExplicit/0/k | 64 +++++++++++++++++++ .../angledDuctExplicit/0/mut | 62 ++++++++++++++++++ .../angledDuctExplicit/0/p | 52 +++++++++++++++ .../angledDuctExplicit/system/controlDict | 5 ++ .../angledDuctImplicit/system/controlDict | 5 ++ .../beaverJoseph/system/controlDict | 5 ++ .../porousPlug/system/controlDict | 5 ++ .../forwardStep/system/controlDict | 5 ++ .../rhoSonicFoam/shockTube/system/controlDict | 5 ++ .../shockTube/system/controlDict | 5 ++ .../wedge15Ma5/system/controlDict | 5 ++ .../system/controlDict | 5 ++ .../conjugateCavity/system/controlDict | 5 ++ .../conjugateCavity/system/controlDict | 5 ++ .../conjugateHeatedSolid/system/controlDict | 5 ++ .../chargedWire/system/controlDict | 5 ++ .../pitzDaily/system/controlDict | 5 ++ .../europeanCall/system/controlDict | 5 ++ .../heatedCavity/system/controlDict | 5 ++ .../hotRoom/system/controlDict | 1 + .../hotRoom/system/controlDict | 4 ++ .../iglooWithFridges/system/controlDict | 6 +- .../hotRoom/system/controlDict | 1 + .../hotRoom/system/controlDict | 6 ++ .../hotRadiationRoom/system/controlDict | 5 ++ .../hotRadiationRoomFvDOM/system/controlDict | 5 ++ .../system/controlDict | 5 ++ .../multiRegionHeater/Allrun | 17 +++++ .../multiRegionHeater/system/controlDict | 5 ++ .../multiRegionHeater/Allrun | 14 ++++ .../multiRegionHeater/system/controlDict | 4 ++ .../system/controlDict | 7 +- .../pitchingPlate/system/controlDict | 1 + .../system/controlDict | 6 +- .../system/controlDict | 7 +- .../system/controlDict | 5 ++ .../simpleSilencerLaminarIcoIbFoam/Allrun | 2 +- .../system/controlDict | 5 ++ .../immersedBoundary/sphereInChannel/Allrun | 2 +- .../sphereInChannel/system/controlDict | 1 + .../mixerGgiMRF/system/controlDict | 5 ++ .../boundaryLaunderSharma/system/controlDict | 5 ++ .../boundaryWallFunctions/system/controlDict | 5 ++ .../channelFoam/channel395/system/controlDict | 5 ++ .../movingConeTopo/system/controlDict | 1 + .../turboPassageRotating/system/controlDict | 1 + .../system/controlDict | 5 ++ .../system/controlDict | 5 ++ .../offsetCylinder/system/controlDict | 5 ++ .../system/controlDict | 5 ++ .../movingCone/system/controlDict | 5 ++ .../pimpleDyMFoam/wingMotion/Allrun | 7 +- .../system/controlDict | 6 +- .../pimpleFoam/t-junction/system/controlDict | 6 ++ .../pisoFoam/les/pitzDaily/system/controlDict | 1 + .../pitzDailyDirectMapped/system/controlDict | 1 + .../pisoFoam/ras/cavity/system/controlDict | 1 + .../squareBump/system/controlDict | 5 ++ .../simpleFoam/pitzDaily/system/controlDict | 5 ++ .../pitzDaily3Blocks/system/controlDict | 5 ++ .../pitzDailyExptInlet/system/controlDict | 5 ++ .../axialTurbine/system/controlDict | 5 ++ .../simpleSRFFoam/mixer/system/controlDict | 5 ++ .../simplifiedSiwek/system/controlDict | 6 ++ .../channelParticles/system/controlDict | 5 ++ .../filter/system/controlDict | 5 ++ .../parcelInBox/system/controlDict | 5 ++ .../verticalChannel/system/controlDict | 5 ++ .../evaporationTest/system/controlDict | 5 ++ .../simplifiedSiwek/system/controlDict | 5 ++ .../mixerVessel2D/system/controlDict | 5 ++ .../bubbleColumn/system/controlDict | 5 ++ .../les/throttle/system/controlDict | 3 +- .../les/throttle3D/system/controlDict | 1 + .../ras/throttle/system/controlDict | 1 + .../ras/floatingObject/system/controlDict | 1 + .../laminar/damBreak/system/controlDict | 5 ++ .../interFoam/les/nozzleFlow2D/Allrun | 10 ++- .../les/nozzleFlow2D/system/controlDict | 6 ++ .../interFoam/ras/damBreak/system/controlDict | 1 + .../settlingFoam/dahl/system/controlDict | 5 ++ .../settlingFoam/tank3D/system/controlDict | 5 ++ .../twoPhaseEulerFoam/bed/system/controlDict | 5 ++ .../twoPhaseEulerFoam/bed2/system/controlDict | 5 ++ .../bubbleColumn/system/controlDict | 5 ++ .../icoFsiFoam/flappingConsoleSmall/Allclean | 4 +- .../icoFsiFoam/flappingConsoleSmall/Allrun | 15 +++-- .../fluid/system/controlDict | 5 ++ .../HronTurekFsi/fluid/system/controlDict | 5 ++ .../HronTurekFsi/makeSerialLinks | 28 +++++--- .../bubble2D_r0.75mm/system/controlDict | 5 ++ .../hydrofoil/system/controlDict | 5 ++ .../interTrackFoam/ramp/system/controlDict | 5 ++ .../sloshing2D/system/controlDict | 5 ++ .../interTrackFoam/tank3D/system/controlDict | 5 ++ 115 files changed, 892 insertions(+), 40 deletions(-) delete mode 120000 tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0 create mode 100644 tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/T create mode 100644 tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/U create mode 100644 tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/alphat create mode 100644 tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/epsilon create mode 100644 tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/k create mode 100644 tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/mut create mode 100644 tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/p diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict b/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict index 6e0e7f393..16dee0fa2 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict +++ b/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application dieselFoam; startFrom startTime; diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict b/tutorials/combustion/engineFoam/kivaTest/system/controlDict index ab8914832..91e32eb7a 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict +++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict @@ -15,6 +15,12 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "libcompressibleRASModels.so" + "liblduSolvers.so" +) + application engineFoam; startFrom startTime; diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st index ab8914832..91e32eb7a 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st +++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st @@ -15,6 +15,12 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "libcompressibleRASModels.so" + "liblduSolvers.so" +) + application engineFoam; startFrom startTime; diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd index d87481d97..228054488 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd +++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd @@ -15,6 +15,12 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "libcompressibleRASModels.so" + "liblduSolvers.so" +) + application engineFoam; startFrom startTime; diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict index 672a24f3b..d94073946 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict +++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict @@ -17,6 +17,7 @@ FoamFile libs ( "libcompressibleLESModels.so" + "liblduSolvers.so" ) application fireFoam; diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict index ea47e0dca..0ab0ccbbf 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict @@ -18,6 +18,7 @@ FoamFile libs ( "libcompressibleRASModels.so" + "liblduSolvers.so" ) application reactingFoam; diff --git a/tutorials/compressible/dbnsTurbFoam/naca0012/system/controlDict b/tutorials/compressible/dbnsTurbFoam/naca0012/system/controlDict index 3c904334a..1268417c2 100644 --- a/tutorials/compressible/dbnsTurbFoam/naca0012/system/controlDict +++ b/tutorials/compressible/dbnsTurbFoam/naca0012/system/controlDict @@ -18,6 +18,7 @@ FoamFile libs ( "libcompressibleRASModels.so" + "liblduSolvers.so" ) application dbnsFASTurbFoam; diff --git a/tutorials/compressible/realFluidPisoFoam/ras/backStep/system/controlDict b/tutorials/compressible/realFluidPisoFoam/ras/backStep/system/controlDict index 382203db6..c9693adb6 100644 --- a/tutorials/compressible/realFluidPisoFoam/ras/backStep/system/controlDict +++ b/tutorials/compressible/realFluidPisoFoam/ras/backStep/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "libcompressibleRASModels.so" +) + application realFluidPisoFoam; startFrom latestTime; diff --git a/tutorials/compressible/realFluidPisoFoam/ras/backStep_IAPWS97/system/controlDict b/tutorials/compressible/realFluidPisoFoam/ras/backStep_IAPWS97/system/controlDict index 918f129f9..990d9c059 100644 --- a/tutorials/compressible/realFluidPisoFoam/ras/backStep_IAPWS97/system/controlDict +++ b/tutorials/compressible/realFluidPisoFoam/ras/backStep_IAPWS97/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "libcompressibleRASModels.so" +) + application realFluidPisoFoam; startFrom latestTime; diff --git a/tutorials/compressible/realFluidPisoFoam/ras/cavity_IAPWS97/system/controlDict b/tutorials/compressible/realFluidPisoFoam/ras/cavity_IAPWS97/system/controlDict index 486c4f7cc..f76c522f5 100644 --- a/tutorials/compressible/realFluidPisoFoam/ras/cavity_IAPWS97/system/controlDict +++ b/tutorials/compressible/realFluidPisoFoam/ras/cavity_IAPWS97/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "libcompressibleRASModels.so" +) + application realFluidPisoFoam; startFrom latestTime; diff --git a/tutorials/compressible/realFluidPisoFoam/ras/t-junction/system/controlDict b/tutorials/compressible/realFluidPisoFoam/ras/t-junction/system/controlDict index f3e29a18e..8da4a5a95 100644 --- a/tutorials/compressible/realFluidPisoFoam/ras/t-junction/system/controlDict +++ b/tutorials/compressible/realFluidPisoFoam/ras/t-junction/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "libcompressibleRASModels.so" +) + application realFluidPisoFoam; startFrom latestTime; diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict index b63420537..e7c130aae 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict @@ -18,6 +18,7 @@ FoamFile libs ( "libcompressibleRASModels" + "liblduSolvers.so" ) application rhoPimpleFoam; diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict index b425d93f4..c684638fc 100644 --- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict +++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict @@ -18,6 +18,7 @@ FoamFile libs ( "libcompressibleLESModels.so" + "liblduSolvers.so" ) application rhoPisoFoam; diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict index e90399f35..027293cd5 100644 --- a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict +++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict @@ -18,6 +18,7 @@ FoamFile libs ( "libcompressibleRASModels.so" + "liblduSolvers.so" ) application rhoPisoFoam; diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/controlDict b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/controlDict index cca858ba8..6a8059495 100644 --- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/controlDict +++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/controlDict @@ -18,6 +18,7 @@ FoamFile libs ( "libcompressibleRASModels.so" + "liblduSolvers.so" ) application rhoPorousMRFPimpleFoam; diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0 b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0 deleted file mode 120000 index f1c4a884b..000000000 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0 +++ /dev/null @@ -1 +0,0 @@ -../angledDuctImplicit/0 \ No newline at end of file diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/T b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/T new file mode 100644 index 000000000..5adbb6979 --- /dev/null +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/T @@ -0,0 +1,55 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | foam-extend: Open Source CFD | +| \\ / O peration | Version: 4.0 | +| \\ / A nd | Web: http://www.foam-extend.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object T; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 1 0 0 0]; + +internalField uniform 293; + +boundaryField +{ + + front + { + type zeroGradient; + } + back + { + type zeroGradient; + } + wall + { + type zeroGradient; + } + porosityWall + { + type zeroGradient; + } + + inlet + { + type fixedValue; + value $internalField; + } + outlet + { + type inletOutlet; + value $internalField; + inletValue $internalField; + } +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/U b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/U new file mode 100644 index 000000000..31ee6a345 --- /dev/null +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/U @@ -0,0 +1,58 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | foam-extend: Open Source CFD | +| \\ / O peration | Version: 4.0 | +| \\ / A nd | Web: http://www.foam-extend.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volVectorField; + object U; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform (0 0 0); + +boundaryField +{ + front + { + type fixedValue; + value uniform (0 0 0); + } + back + { + type fixedValue; + value uniform (0 0 0); + } + wall + { + type fixedValue; + value uniform (0 0 0); + } + porosityWall + { + type slip; + value uniform (0 0 0); + } + inlet + { + type flowRateInletVelocity; + flowRate 0.1; + value uniform (0 0 0); + } + outlet + { + type inletOutlet; + value uniform (0 0 0); + inletValue uniform (0 0 0); + } +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/alphat b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/alphat new file mode 100644 index 000000000..63456f5c1 --- /dev/null +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/alphat @@ -0,0 +1,57 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | foam-extend: Open Source CFD | +| \\ / O peration | Version: 4.0 | +| \\ / A nd | Web: http://www.foam-extend.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object alphat; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + front + { + type alphatWallFunction; + value uniform 0; + } + back + { + type alphatWallFunction; + value uniform 0; + } + wall + { + type alphatWallFunction; + value uniform 0; + } + porosityWall + { + type alphatWallFunction; + value uniform 0; + } + inlet + { + type calculated; + value uniform 0; + } + outlet + { + type calculated; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/epsilon b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/epsilon new file mode 100644 index 000000000..1ef8f3b88 --- /dev/null +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/epsilon @@ -0,0 +1,64 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | foam-extend: Open Source CFD | +| \\ / O peration | Version: 4.0 | +| \\ / A nd | Web: http://www.foam-extend.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class volScalarField; + location "0"; + object epsilon; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [ 0 2 -3 0 0 0 0 ]; + +internalField uniform 200; + +boundaryField +{ + front + { + type compressible::epsilonWallFunction; + value uniform 200; + } + + back + { + type compressible::epsilonWallFunction; + value uniform 200; + } + + wall + { + type compressible::epsilonWallFunction; + value uniform 200; + } + + porosityWall + { + type compressible::epsilonWallFunction; + value uniform 200; + } + + inlet + { + type compressible::turbulentMixingLengthDissipationRateInlet; + mixingLength 0.005; + value uniform 200; + } + + outlet + { + type inletOutlet; + inletValue uniform 200; + value uniform 200; + } +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/k b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/k new file mode 100644 index 000000000..2aa27baad --- /dev/null +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/k @@ -0,0 +1,64 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | foam-extend: Open Source CFD | +| \\ / O peration | Version: 4.0 | +| \\ / A nd | Web: http://www.foam-extend.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class volScalarField; + location "0"; + object k; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [ 0 2 -2 0 0 0 0 ]; + +internalField uniform 1; + +boundaryField +{ + front + { + type compressible::kqRWallFunction; + value uniform 1; + } + + back + { + type compressible::kqRWallFunction; + value uniform 1; + } + + wall + { + type compressible::kqRWallFunction; + value uniform 1; + } + + porosityWall + { + type compressible::kqRWallFunction; + value uniform 1; + } + + inlet + { + type turbulentIntensityKineticEnergyInlet; + intensity 0.05; + value uniform 1; + } + + outlet + { + type inletOutlet; + inletValue uniform 1; + value uniform 1; + } +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/mut b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/mut new file mode 100644 index 000000000..56eb68878 --- /dev/null +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/mut @@ -0,0 +1,62 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | foam-extend: Open Source CFD | +| \\ / O peration | Version: 4.0 | +| \\ / A nd | Web: http://www.foam-extend.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class volScalarField; + location "0"; + object mut; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [ 1 -1 -1 0 0 0 0 ]; + +internalField uniform 0; + +boundaryField +{ + front + { + type mutWallFunction; + value uniform 0; + } + + back + { + type mutWallFunction; + value uniform 0; + } + + wall + { + type mutWallFunction; + value uniform 0; + } + + porosityWall + { + type mutWallFunction; + value uniform 0; + } + + inlet + { + type calculated; + value uniform 0; + } + + outlet + { + type calculated; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/p b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/p new file mode 100644 index 000000000..7c9df1371 --- /dev/null +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0/p @@ -0,0 +1,52 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | foam-extend: Open Source CFD | +| \\ / O peration | Version: 4.0 | +| \\ / A nd | Web: http://www.foam-extend.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object p; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -2 0 0 0 0]; + +internalField uniform 1.0e5; + +boundaryField +{ + front + { + type zeroGradient; + } + back + { + type zeroGradient; + } + wall + { + type zeroGradient; + } + porosityWall + { + type zeroGradient; + } + + inlet + { + type zeroGradient; + } + outlet + { + type fixedValue; + value $internalField; + } +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict index 4a50bb28b..213fa2e9f 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application rhoPorousSimpleFoam; startFrom startTime; diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict index 6738c89fe..9f5c50b49 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application rhoPorousSimpleFoam; startFrom startTime; diff --git a/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/system/controlDict index d9b271f46..2b2f39693 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/system/controlDict +++ b/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application rhoPorousSimpleFoam; startFrom startTime; diff --git a/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/system/controlDict index d9b271f46..2b2f39693 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/system/controlDict +++ b/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application rhoPorousSimpleFoam; startFrom startTime; diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict b/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict index 13c2b1766..27c9f8098 100644 --- a/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict +++ b/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application rhoSonicFoam; startFrom latestTime; diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict b/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict index 3ee55be18..0ec166d21 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict +++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application rhoSonicFoam; startFrom startTime; diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict b/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict index f6f78f845..e3ef02d1d 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict +++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application rhopSonicFoam; startFrom startTime; diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict index ce871c833..82f90fefe 100644 --- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict +++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application rhopSonicFoam; startFrom startTime; diff --git a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/system/controlDict b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/system/controlDict index ae77c38e3..09463ad49 100644 --- a/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/system/controlDict +++ b/tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application steadyUniversalMRFFoam; startFrom startTime; diff --git a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/controlDict b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/controlDict index 42809ba66..210445859 100644 --- a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/controlDict +++ b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application conjugateHeatFoam; startFrom startTime; diff --git a/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/system/controlDict b/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/system/controlDict index c360dee80..6922edaab 100644 --- a/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/system/controlDict +++ b/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application conjugateHeatSimpleFoam; startFrom startTime; diff --git a/tutorials/coupled/conjugateHeatSimpleFoam/conjugateHeatedSolid/system/controlDict b/tutorials/coupled/conjugateHeatSimpleFoam/conjugateHeatedSolid/system/controlDict index a34ba72db..d8cd1d4fe 100644 --- a/tutorials/coupled/conjugateHeatSimpleFoam/conjugateHeatedSolid/system/controlDict +++ b/tutorials/coupled/conjugateHeatSimpleFoam/conjugateHeatedSolid/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application conjugateHeatSimpleFoam; startFrom startTime; diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict index 654e78b5e..a03d15310 100644 --- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict +++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application electrostaticFoam; startFrom startTime; diff --git a/tutorials/equationReader/equationReaderDemo/pitzDaily/system/controlDict b/tutorials/equationReader/equationReaderDemo/pitzDaily/system/controlDict index 4a484fc21..ddc6e3bae 100644 --- a/tutorials/equationReader/equationReaderDemo/pitzDaily/system/controlDict +++ b/tutorials/equationReader/equationReaderDemo/pitzDaily/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application simpleFoam; startFrom startTime; diff --git a/tutorials/financial/financialFoam/europeanCall/system/controlDict b/tutorials/financial/financialFoam/europeanCall/system/controlDict index 791c4c785..27198da2b 100644 --- a/tutorials/financial/financialFoam/europeanCall/system/controlDict +++ b/tutorials/financial/financialFoam/europeanCall/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application financialFoam; startFrom startTime; diff --git a/tutorials/heatTransfer/boussinesqBuoyantFoam/heatedCavity/system/controlDict b/tutorials/heatTransfer/boussinesqBuoyantFoam/heatedCavity/system/controlDict index 3275dfa6d..157d143d6 100644 --- a/tutorials/heatTransfer/boussinesqBuoyantFoam/heatedCavity/system/controlDict +++ b/tutorials/heatTransfer/boussinesqBuoyantFoam/heatedCavity/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" + +) application boussinesqBuoyantFoam; startFrom startTime; diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict index 2dccf2f10..bbeca1268 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict +++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict @@ -18,6 +18,7 @@ FoamFile libs ( "libincompressibleRASModels.so" + "liblduSolvers.so" ) application buoyantBoussinesqPisoFoam; diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict index c79459eb1..299892d2e 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict @@ -15,6 +15,10 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); application buoyantBoussinesqSimpleFoam; startFrom latestTime; diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict index b87e8957f..770d1f0ba 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict @@ -15,7 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -libs ("libparMetisDecomp.so"); +libs +( + "libparMetisDecomp.so" + "liblduSolvers.so" +) application buoyantBoussinesqSimpleFoam; diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict index 863f3b4e1..128b0ff88 100644 --- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict +++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict @@ -18,6 +18,7 @@ FoamFile libs ( "libcompressibleRASModels.so" + "liblduSolvers.so" ) application buoyantPisoFoam; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict index d853784d0..9d1ce1d66 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict @@ -14,6 +14,12 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "libcompressibleRASModels.so" + "liblduSolvers.so" +) + application buoyantSimpleFoam; startFrom latestTime; diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict index 741372081..f126b69f8 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application buoyantSimpleRadiationFoam; startFrom latestTime; diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/controlDict b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/controlDict index 6ebe47c58..bde9d115b 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/controlDict +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application buoyantSimpleRadiationFoam; startFrom latestTime; diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/system/controlDict b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/system/controlDict index 6ebe47c58..bde9d115b 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/system/controlDict +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application buoyantSimpleRadiationFoam; startFrom latestTime; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun index e23a9bf42..862bac22e 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun @@ -83,6 +83,23 @@ runApplicationAndReportOnError () # We force the display of a stack trace if we encounter problems export FOAM_ABORT=1 +# Symbolic links don't work on MS Windows so we make real copies +if [ "$WM_OSTYPE" = "MSWindows" ] +then + echo "MSWindows detected -> we need to recreate symbolic links which will be actual copies of orginal files (MSWin does not support symbolic links)" + # Symbolic links for topAir + ln -sf "$PWD/constant/bottomAir/thermophysicalProperties" "$PWD/constant/topAir/thermophysicalProperties" + ln -sf "$PWD/constant/bottomAir/g" "$PWD/constant/topAir/g" + ln -sf "$PWD/constant/bottomAir/turbulenceProperties" "$PWD/constant/topAir/turbulenceProperties" + ln -sf "$PWD/system/bottomAir/fvSolution" "$PWD/system/topAir/fvSolution" + ln -sf "$PWD/system/bottomAir/fvSchemes" "$PWD/system/topAir/fvSchemes" + # Symbolic links for leftSolid + ln -sf "$PWD/system/heater/fvSchemes" "$PWD/system/leftSolid/fvSchemes" + ln -sf "$PWD/system/heater/fvSolution" "$PWD/system/leftSolid/fvSolution" + # Symbolic links for rightSolid + ln -sf "$PWD/system/heater/fvSchemes" "$PWD/system/rightSolid/fvSchemes" + ln -sf "$PWD/system/heater/fvSolution" "$PWD/system/rightSolid/fvSolution" +fi rm -rf constant/polyMesh/sets runApplicationAndReportOnError blockMesh runApplicationAndReportOnError setSet -batch makeCellSets.setSet diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict index 1dd112e25..844b739f0 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application chtFoam; startFrom latestTime; diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun index 58a131c60..6c6c36e80 100755 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/Allrun @@ -32,6 +32,20 @@ do changeDictionary -region $i > log.changeDictionary.$i 2>&1 done +# Symbolic links don't work on MS Windows so we make real copies +if [ "$WM_OSTYPE" = "MSWindows" ] +then + echo "MSWindows detected -> we need to recreate symbolic links which will be actual copies of orginal files (MSWin does not support symbolic links)" + # Symbolic links for bottomAir + ln -sf "$PWD/system/topAir/fvSolution" "$PWD/system/bottomAir/fvSolution" + ln -sf "$PWD/system/topAir/fvSchemes" "$PWD/system/bottomAir/fvSchemes" + # Symbolic links for leftSolid + ln -sf "$PWD/system/heater/fvSchemes" "$PWD/system/leftSolid/fvSchemes" + ln -sf "$PWD/system/heater/fvSolution" "$PWD/system/leftSolid/fvSolution" + # Symbolic links for rightSolid + ln -sf "$PWD/system/heater/fvSchemes" "$PWD/system/rightSolid/fvSchemes" + ln -sf "$PWD/system/heater/fvSolution" "$PWD/system/rightSolid/fvSolution" +fi #-- Run on single processor runApplication chtMultiRegionSimpleFoam diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/controlDict index 5e49f244f..c4934ac5e 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/controlDict +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/controlDict @@ -15,6 +15,10 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); application chtMultiRegionSimpleFoam; startFrom startTime; diff --git a/tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/system/controlDict b/tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/system/controlDict index 0eb29b94b..f6062f398 100644 --- a/tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/system/controlDict +++ b/tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/system/controlDict @@ -14,12 +14,6 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -libs -( - "libimmersedBoundaryTurbulence.so" - "liblduSolvers.so" -) - application simpleIbFoam; startFrom startTime; @@ -54,6 +48,7 @@ libs ( "libimmersedBoundary.so" "libimmersedBoundaryTurbulence.so" + "liblduSolvers.so" ); functions diff --git a/tutorials/immersedBoundary/pitchingPlate/system/controlDict b/tutorials/immersedBoundary/pitchingPlate/system/controlDict index 81598e98f..8f66b3607 100644 --- a/tutorials/immersedBoundary/pitchingPlate/system/controlDict +++ b/tutorials/immersedBoundary/pitchingPlate/system/controlDict @@ -54,6 +54,7 @@ libs "libdynamicFvMesh.so" "libimmersedBoundary.so" "libimmersedBoundaryDynamicFvMesh.so" + "liblduSolvers.so" ); diff --git a/tutorials/immersedBoundary/pitzDailyLaminarIcoIbFoam/system/controlDict b/tutorials/immersedBoundary/pitzDailyLaminarIcoIbFoam/system/controlDict index 62c260ab0..b006ce0b7 100644 --- a/tutorials/immersedBoundary/pitzDailyLaminarIcoIbFoam/system/controlDict +++ b/tutorials/immersedBoundary/pitzDailyLaminarIcoIbFoam/system/controlDict @@ -49,7 +49,11 @@ adjustTimeStep no; maxCo 0.2; -libs ( "libimmersedBoundary.so"); +libs +( + "libimmersedBoundary.so" + "liblduSolvers.so" +); // functions // ( diff --git a/tutorials/immersedBoundary/pitzDailyTurbulentSimpleIbFoam/system/controlDict b/tutorials/immersedBoundary/pitzDailyTurbulentSimpleIbFoam/system/controlDict index 5132e6700..592c11213 100644 --- a/tutorials/immersedBoundary/pitzDailyTurbulentSimpleIbFoam/system/controlDict +++ b/tutorials/immersedBoundary/pitzDailyTurbulentSimpleIbFoam/system/controlDict @@ -14,12 +14,6 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -libs -( - "liblduSolvers.so" - "libimmersedBoundaryTurbulence.so" -) - application simpleIbFoam; startFrom startTime; @@ -54,6 +48,7 @@ libs ( "libimmersedBoundary.so" "libimmersedBoundaryTurbulence.so" + "liblduSolvers.so" ); functions diff --git a/tutorials/immersedBoundary/porousBumpChannelBodyFitted/system/controlDict b/tutorials/immersedBoundary/porousBumpChannelBodyFitted/system/controlDict index 4036b36ff..018cd7c38 100644 --- a/tutorials/immersedBoundary/porousBumpChannelBodyFitted/system/controlDict +++ b/tutorials/immersedBoundary/porousBumpChannelBodyFitted/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application porousSimpleFoam; startFrom startTime; diff --git a/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/Allrun b/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/Allrun index 0d6a7b158..e3658380c 100755 --- a/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/Allrun +++ b/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/Allrun @@ -14,7 +14,7 @@ runApplication blockMesh runApplication refineImmersedBoundaryMesh -ibCellCellFaces \rm -rf constant/polyMesh -\mv 0/polyMesh constant/polyMesh/ +\mv 0/polyMesh constant/polyMesh \rm -rf 0 \mkdir 0 diff --git a/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/system/controlDict b/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/system/controlDict index eb1604d11..092329f66 100644 --- a/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/system/controlDict +++ b/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application icoDyMFoam; startFrom startTime; diff --git a/tutorials/immersedBoundary/sphereInChannel/Allrun b/tutorials/immersedBoundary/sphereInChannel/Allrun index f346111da..eb5d02a7d 100755 --- a/tutorials/immersedBoundary/sphereInChannel/Allrun +++ b/tutorials/immersedBoundary/sphereInChannel/Allrun @@ -16,7 +16,7 @@ runApplication blockMesh runApplication refineSphereMesh \rm -rf constant/polyMesh -\mv 0/polyMesh constant/polyMesh/ +\mv 0/polyMesh constant/polyMesh \rm -rf 0 \mkdir 0 diff --git a/tutorials/immersedBoundary/sphereInChannel/system/controlDict b/tutorials/immersedBoundary/sphereInChannel/system/controlDict index 14606bfb9..011cb9c36 100644 --- a/tutorials/immersedBoundary/sphereInChannel/system/controlDict +++ b/tutorials/immersedBoundary/sphereInChannel/system/controlDict @@ -52,6 +52,7 @@ maxCo 0.2; libs ( "libimmersedBoundary.so" + "liblduSolvers.so" ); functions diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerGgiMRF/system/controlDict b/tutorials/incompressible/MRFSimpleFoam/mixerGgiMRF/system/controlDict index 8c33515d2..89fe9e88b 100644 --- a/tutorials/incompressible/MRFSimpleFoam/mixerGgiMRF/system/controlDict +++ b/tutorials/incompressible/MRFSimpleFoam/mixerGgiMRF/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application MRFSimpleFoam; startFrom startTime; diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict index c9baeb36a..56f545cd7 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict +++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application boundaryFoam; startFrom startTime; diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict index abea164be..88fa90536 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict +++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + // Foam Application Class application boundaryFoam; diff --git a/tutorials/incompressible/channelFoam/channel395/system/controlDict b/tutorials/incompressible/channelFoam/channel395/system/controlDict index e7c374c4f..b29d0a87f 100644 --- a/tutorials/incompressible/channelFoam/channel395/system/controlDict +++ b/tutorials/incompressible/channelFoam/channel395/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application channelOodles; startFrom startTime; diff --git a/tutorials/incompressible/icoDyMFoam/movingConeTopo/system/controlDict b/tutorials/incompressible/icoDyMFoam/movingConeTopo/system/controlDict index 9a643c9b6..9f3343fb9 100644 --- a/tutorials/incompressible/icoDyMFoam/movingConeTopo/system/controlDict +++ b/tutorials/incompressible/icoDyMFoam/movingConeTopo/system/controlDict @@ -17,6 +17,7 @@ FoamFile libs ( "libtopoChangerFvMesh.so" + "liblduSolvers.so" ) application icoDyMFoam; diff --git a/tutorials/incompressible/icoDyMFoam/turboPassageRotating/system/controlDict b/tutorials/incompressible/icoDyMFoam/turboPassageRotating/system/controlDict index 728c95c72..ce5a8b828 100644 --- a/tutorials/incompressible/icoDyMFoam/turboPassageRotating/system/controlDict +++ b/tutorials/incompressible/icoDyMFoam/turboPassageRotating/system/controlDict @@ -17,6 +17,7 @@ FoamFile libs ( "libscotchDecomp.so" + "liblduSolvers.so" ) application icoDyMFoam; diff --git a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/system/controlDict b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/system/controlDict index f14051c8f..66ab7dc4c 100644 --- a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/system/controlDict +++ b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application icoFoam; startFrom startTime; diff --git a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirY_spanZ/system/controlDict b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirY_spanZ/system/controlDict index 52f422441..863f4587d 100644 --- a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirY_spanZ/system/controlDict +++ b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirY_spanZ/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application icoFoam; startFrom startTime; diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict index 6093fb746..34b5f3af3 100644 --- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict +++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application nonNewtonianIcoFoam; startFrom startTime; diff --git a/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/system/controlDict b/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/system/controlDict index 4dfb2c537..f843ec779 100644 --- a/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/system/controlDict +++ b/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application pUCoupledFoam; startFrom startTime; diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict index 9fd372ac1..aac60ce6d 100644 --- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict +++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application pimpleDyMFoam; startFrom startTime; diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun index 060b5e0ac..a4ca68512 100755 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun @@ -24,8 +24,9 @@ cd ../wingMotion2D_pimpleDyMFoam \cp -r 0.org 0 runApplication mapFields ../wingMotion2D_simpleFoam -sourceTime latestTime -consistent mv 0/pointDisplacement.unmapped 0/pointDisplacement -runApplication decomposePar -runParallel pimpleDyMFoam 3 -runApplication reconstructPar +runApplication pimpleDyMFoam +#runApplication decomposePar +#runParallel pimpleDyMFoam 2 +#runApplication reconstructPar # ----------------------------------------------------------------- end-of-file diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/controlDict index 22a990902..ac594ab96 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/controlDict +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/controlDict @@ -49,7 +49,11 @@ adjustTimeStep yes; maxCo 0.9; -libs ("libforces.so"); +libs +( + "libforces.so" + "liblduSolvers.so" +); functions { diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict index d8e0a1040..1b2ecab61 100644 --- a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict @@ -15,6 +15,12 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "libincompressibleRASModels.so" + "liblduSolvers.so" +); + application pimpleFoam; startFrom startTime; diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict index da4193d19..83b93db20 100644 --- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict +++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict @@ -18,6 +18,7 @@ FoamFile libs ( "libincompressibleLESModels.so" + "liblduSolvers.so" ) application pisoFoam; diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict index 17ba7ea7b..94a6dbe40 100644 --- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict +++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict @@ -18,6 +18,7 @@ FoamFile libs ( "libincompressibleLESModels.so" + "liblduSolvers.so" ) application pisoFoam; diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict b/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict index 490ba7ff5..f3c959172 100644 --- a/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict +++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict @@ -18,6 +18,7 @@ FoamFile libs ( "libincompressibleRASModels.so" + "liblduSolvers.so" ) application pisoFoam; diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict b/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict index 855bd4c55..08b74f91c 100644 --- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict +++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application shallowWaterFoam; startFrom startTime; diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict index c910c2447..6299d0592 100644 --- a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict +++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application simpleFoam; startFrom startTime; diff --git a/tutorials/incompressible/simpleFoam/pitzDaily3Blocks/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDaily3Blocks/system/controlDict index 67aa95108..018d85c76 100644 --- a/tutorials/incompressible/simpleFoam/pitzDaily3Blocks/system/controlDict +++ b/tutorials/incompressible/simpleFoam/pitzDaily3Blocks/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application simpleFoam; startFrom startTime; diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict index 67aa95108..018d85c76 100644 --- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict +++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application simpleFoam; startFrom startTime; diff --git a/tutorials/incompressible/simpleSRFFoam/axialTurbine/system/controlDict b/tutorials/incompressible/simpleSRFFoam/axialTurbine/system/controlDict index 0406c8a3b..af8c6009c 100644 --- a/tutorials/incompressible/simpleSRFFoam/axialTurbine/system/controlDict +++ b/tutorials/incompressible/simpleSRFFoam/axialTurbine/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application simpleSRFFoam; startFrom startTime; diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict b/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict index b70856d60..1c58a3fb2 100644 --- a/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict +++ b/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application simpleSRFFoam; startFrom startTime; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict index a16d29e43..2d71c8e4d 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict @@ -15,6 +15,12 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "libcompressibleLESModels.so" + "liblduSolvers.so" +); + application coalChemistryFoam; startFrom latestTime; diff --git a/tutorials/lagrangian/icoLagrangianFoam/channelParticles/system/controlDict b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/system/controlDict index 5e1bacb60..673b8a022 100644 --- a/tutorials/lagrangian/icoLagrangianFoam/channelParticles/system/controlDict +++ b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application icoLagrangianFoam; startFrom firstTime; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict index 056a1c554..26d5ff4a9 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application porousExplicitSourceReactingParcelFoam; startFrom startTime; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/controlDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/controlDict index ecc7a8c68..5f62bf9e8 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/controlDict +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + startFoam startTime; startTime 0; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict index cc7dbe9c6..c41d7eee1 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + startFoam latestTime; startTime 0; diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict index 6a0d60319..6c392282c 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application reactingParcelFoam; startFrom startTime; diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict index 44c32874f..b24ee3c32 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application rhoPisoTwinParcelFoam; startFrom latestTime; diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/controlDict b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/controlDict index 1ec9ffd94..efad17f28 100644 --- a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/controlDict +++ b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application MRFInterFoam; startFrom startTime; diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict index 52d190aa7..2d397bf9f 100644 --- a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application bubbleFoam; startFrom startTime; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict index 752bc9f56..38305b0e7 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict @@ -18,7 +18,8 @@ FoamFile libs ( "libincompressibleLESModels.so" -) + "liblduSolvers.so" +); application cavitatingFoam; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict index 372f7aa96..3cd251b96 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict @@ -18,6 +18,7 @@ FoamFile libs ( "libincompressibleLESModels.so" + "liblduSolvers.so" ) application cavitatingFoam; diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict index 5c19d6379..c66db6e25 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict @@ -17,6 +17,7 @@ FoamFile libs ( "libincompressibleRASModels.so" + "liblduSolvers.so" ) startFrom latestTime; diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict index b19f2c17c..52977076e 100644 --- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict @@ -56,6 +56,7 @@ libs "libincompressibleRASModels.so" "libfvMotionSolver.so" "libforces.so" + "liblduSolvers.so" ); diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict index 4ae337fb4..24aca39ce 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +) + application interFoam; startFrom startTime; diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun index 655eb4c88..469ba42ba 100755 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun @@ -24,8 +24,14 @@ while [ "$i" -lt 3 ] ; do cp system/cellSetDict.${i} system/cellSetDict runApplication cellSet runRefineMesh - cp -r 1e-08/polyMesh/* constant/polyMesh - rm -rf 1e-08 + if [ "$WM_OSTYPE" = "MSWindows" ] + then + cp -r 1e-008/polyMesh/* constant/polyMesh + rm -rf 1e-008 + else + cp -r 1e-08/polyMesh/* constant/polyMesh + rm -rf 1e-08 + fi i=`expr $i + 1` done cp constant/polyMesh/boundary.org constant/polyMesh/boundary diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict index ffe1a2ee9..6ca34dfc1 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict @@ -15,6 +15,12 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "libincompressibleLESModels.so" + "liblduSolvers.so" +); + application interFoam; startFrom latestTime; diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict b/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict index f18a2b217..8a68151c8 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict +++ b/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict @@ -18,6 +18,7 @@ FoamFile libs ( "libincompressibleRASModels.so" + "liblduSolvers.so" ) application interFoam; diff --git a/tutorials/multiphase/settlingFoam/dahl/system/controlDict b/tutorials/multiphase/settlingFoam/dahl/system/controlDict index a93d4772f..875cc540f 100644 --- a/tutorials/multiphase/settlingFoam/dahl/system/controlDict +++ b/tutorials/multiphase/settlingFoam/dahl/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application settlingFoam; startFrom startTime; diff --git a/tutorials/multiphase/settlingFoam/tank3D/system/controlDict b/tutorials/multiphase/settlingFoam/tank3D/system/controlDict index bb9620230..45d3e5994 100644 --- a/tutorials/multiphase/settlingFoam/tank3D/system/controlDict +++ b/tutorials/multiphase/settlingFoam/tank3D/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application settlingFoam; startFrom startTime; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict index 5c2c5bda7..7f1911c97 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application twoPhaseEulerFoam; startFrom latestTime; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict index a6c66153d..3caa453d5 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application twoPhaseEulerFoam; startFrom latestTime; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict index e84d0e8fd..b7d4759f2 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application twoPhaseEulerFoam; startFrom startTime; diff --git a/tutorials/solidMechanics/deprecatedTutorials/icoFsiFoam/flappingConsoleSmall/Allclean b/tutorials/solidMechanics/deprecatedTutorials/icoFsiFoam/flappingConsoleSmall/Allclean index 782554e31..26b2a7e3c 100755 --- a/tutorials/solidMechanics/deprecatedTutorials/icoFsiFoam/flappingConsoleSmall/Allclean +++ b/tutorials/solidMechanics/deprecatedTutorials/icoFsiFoam/flappingConsoleSmall/Allclean @@ -13,9 +13,9 @@ do done cd fluid -\rm -f constant/solid system/solid 0/solid +\rm -rf constant/solid system/solid 0/solid cd .. cd solid -\rm -f 0/0 constant/constant +\rm -rf 0/0 constant/constant cd .. diff --git a/tutorials/solidMechanics/deprecatedTutorials/icoFsiFoam/flappingConsoleSmall/Allrun b/tutorials/solidMechanics/deprecatedTutorials/icoFsiFoam/flappingConsoleSmall/Allrun index f5d393a44..65f118a63 100755 --- a/tutorials/solidMechanics/deprecatedTutorials/icoFsiFoam/flappingConsoleSmall/Allrun +++ b/tutorials/solidMechanics/deprecatedTutorials/icoFsiFoam/flappingConsoleSmall/Allrun @@ -7,21 +7,24 @@ application=icoFsiFoam cd fluid runApplication blockMesh +cd ../solid +runApplication blockMesh +cd ../fluid cd constant -ln -s ../../solid/constant solid +cp -r ../../solid/constant solid cd .. cd 0 -ln -s ../../solid/0 solid +cp -r ../../solid/0 solid cd .. cd .. -cd solid -runApplication blockMesh -cd .. +#cd solid +#runApplication blockMesh +#cd .. pwd makeFsiCaseLinks fluid solid cd fluid runApplication $application cd .. -makeFsiResultsLinks fluid solid \ No newline at end of file +makeFsiResultsLinks fluid solid diff --git a/tutorials/solidMechanics/deprecatedTutorials/icoFsiFoam/flappingConsoleSmall/fluid/system/controlDict b/tutorials/solidMechanics/deprecatedTutorials/icoFsiFoam/flappingConsoleSmall/fluid/system/controlDict index 4f4a10ad0..2b44ea10e 100644 --- a/tutorials/solidMechanics/deprecatedTutorials/icoFsiFoam/flappingConsoleSmall/fluid/system/controlDict +++ b/tutorials/solidMechanics/deprecatedTutorials/icoFsiFoam/flappingConsoleSmall/fluid/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application icoFoam; startFrom startTime; diff --git a/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/system/controlDict b/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/system/controlDict index 3a166be2a..d5f340ec7 100644 --- a/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/system/controlDict +++ b/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application icoFsiElasticNonLinULSolidFoam; startFrom latestTime; diff --git a/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/makeSerialLinks b/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/makeSerialLinks index b3453576f..9372b9d4a 100755 --- a/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/makeSerialLinks +++ b/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/makeSerialLinks @@ -6,11 +6,23 @@ if [ "$#" -ne 2 ]; then exit 1 fi -cd $1 -cd constant -ln -s ../../$2/constant solid -cd ../system -ln -s ../../$2/system solid -cd ../0 -ln -s ../../$2/0 solid -cd ../.. +if [ "$WM_OSTYPE" = "MSWindows" ] +then + cd $1 + cd constant + cp -r ../../$2/constant solid + cd ../system + cp -r ../../$2/system solid + cd ../0 + cp -r ../../$2/0 solid + cd ../.. +else + cd $1 + cd constant + ln -s ../../$2/constant solid + cd ../system + ln -s ../../$2/system solid + cd ../0 + ln -s ../../$2/0 solid + cd ../.. +fi diff --git a/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/system/controlDict b/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/system/controlDict index eafb7ff32..c4b2e7f30 100644 --- a/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/system/controlDict +++ b/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + applicationClass bubbleInterTrackFoam; startFrom startTime; diff --git a/tutorials/surfaceTracking/interTrackFoam/hydrofoil/system/controlDict b/tutorials/surfaceTracking/interTrackFoam/hydrofoil/system/controlDict index 562b8a31f..aa6926269 100644 --- a/tutorials/surfaceTracking/interTrackFoam/hydrofoil/system/controlDict +++ b/tutorials/surfaceTracking/interTrackFoam/hydrofoil/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application interTrackFoam; startFrom startTime; diff --git a/tutorials/surfaceTracking/interTrackFoam/ramp/system/controlDict b/tutorials/surfaceTracking/interTrackFoam/ramp/system/controlDict index d9525fe38..b9d53fedf 100644 --- a/tutorials/surfaceTracking/interTrackFoam/ramp/system/controlDict +++ b/tutorials/surfaceTracking/interTrackFoam/ramp/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application interTrackFoam; startFrom startTime; diff --git a/tutorials/surfaceTracking/interTrackFoam/sloshing2D/system/controlDict b/tutorials/surfaceTracking/interTrackFoam/sloshing2D/system/controlDict index f8fdc74e6..c5369464a 100644 --- a/tutorials/surfaceTracking/interTrackFoam/sloshing2D/system/controlDict +++ b/tutorials/surfaceTracking/interTrackFoam/sloshing2D/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + applicationClass interTrackFoam; startFrom latestTime; diff --git a/tutorials/surfaceTracking/interTrackFoam/tank3D/system/controlDict b/tutorials/surfaceTracking/interTrackFoam/tank3D/system/controlDict index edb2d92e5..34dccd4c0 100644 --- a/tutorials/surfaceTracking/interTrackFoam/tank3D/system/controlDict +++ b/tutorials/surfaceTracking/interTrackFoam/tank3D/system/controlDict @@ -15,6 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application interTrackFoam; startFrom latestTime; From e2a3e461228dc01983b6fa1c2ed0e71e40642cfb Mon Sep 17 00:00:00 2001 From: Robert Keser Date: Mon, 17 Apr 2017 15:23:30 +0200 Subject: [PATCH 5/9] Windows RunFunctions update. --- bin/tools/RunFunctions | 64 +++++++++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 17 deletions(-) diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions index 0178dfaea..83d7fbc37 100644 --- a/bin/tools/RunFunctions +++ b/bin/tools/RunFunctions @@ -71,6 +71,11 @@ runParallel () LOG_NAME=log.$APP_NAME fi + if [ "$WM_OSTYPE" = "MSWindows" ] + then + APP_RUN="${APP_RUN}.exe" + fi + if [ -f $LOG_NAME ] ; then echo "$APP_NAME already run on $PWD: remove log file to run" else @@ -135,27 +140,52 @@ cloneCase () makeFsiCaseLinks () { - cd $1 - cd system - ln -s ../../$2/system $2 - cd ../constant - ln -s ../../$2/constant $2 - cd ../0 - ln -s ../../$2/0 $2 - cd ../.. + if [ "$WM_OSTYPE" = "MSWindows" ] + then + cd $1 + cd system + cp -r ../../$2/system $2 + cd ../constant + cp -r ../../$2/constant $2 + cd ../0 + cp -r ../../$2/0 $2 + cd ../.. + else + cd $1 + cd system + ln -s ../../$2/system $2 + cd ../constant + ln -s ../../$2/constant $2 + cd ../0 + ln -s ../../$2/0 $2 + cd ../.. + fi } makeFsiResultsLinks () { - cd $1 - TIME_DIRS=`foamInfoExec -times | sed '1,/constant/d'` - echo "makeFsiResultsLinks for" $TIME_DIRS - cd ../$2 - for T in $TIME_DIRS - do - ln -s ../$1/${T}/solid ${T} - done - cd .. + if [ "$WM_OSTYPE" = "MSWindows" ] + then + cd $1 + TIME_DIRS=`foamInfoExec -times | sed '1,/constant/d'` + echo "makeFsiResultsLinks for" $TIME_DIRS + cd ../$2 + for T in $TIME_DIRS + do + cp -r ../$1/${T}/solid ${T} + done + cd .. + else + cd $1 + TIME_DIRS=`foamInfoExec -times | sed '1,/constant/d'` + echo "makeFsiResultsLinks for" $TIME_DIRS + cd ../$2 + for T in $TIME_DIRS + do + ln -s ../$1/${T}/solid ${T} + done + cd .. + fi } #------------------------------------------------------------------------------ From 64eed6d825dfb94a4bf235da62e8d1f3e02e0208 Mon Sep 17 00:00:00 2001 From: Robert Keser Date: Mon, 17 Apr 2017 15:27:50 +0200 Subject: [PATCH 6/9] Bugfix: Reading files on Windows (recognizing relative or absoulte path) Author: Vanja Skuric --- src/OSspecific/MSWindows/printStack.C | 16 +++++++++++----- src/OSspecific/POSIX/printStack.C | 16 +++++++++++----- .../functionEntries/includeEntry/includeEntry.C | 2 +- src/foam/global/argList/argList.C | 7 +++++-- .../chemkinReader/chemkinReader.C | 10 ++++++++-- 5 files changed, 36 insertions(+), 15 deletions(-) diff --git a/src/OSspecific/MSWindows/printStack.C b/src/OSspecific/MSWindows/printStack.C index 6ff3799e2..6120bb0a0 100644 --- a/src/OSspecific/MSWindows/printStack.C +++ b/src/OSspecific/MSWindows/printStack.C @@ -126,7 +126,7 @@ void printSourceFileAndLine myAddress = nStream.str(); } - if (filename[0] == '/') + if (filename[0] == '/' || filename[1] == ':') { string line = pOpen ( @@ -266,7 +266,10 @@ void getSymbolForRaw const word& address ) { - if (filename.size() && filename[0] == '/') + if + ( + filename.size() && (filename[0] == '/' || filename[1] == ':') + ) { string fcnt = pOpen ( @@ -316,7 +319,10 @@ void error::printStack(Ostream& os) string::size_type space = line.rfind(' ') + 1; fileName libPath = line.substr(space, line.size()-space); - if (libPath.size() && libPath[0] == '/') + if + ( + libPath.size() && (libPath[0] == '/' || libPath[1] == ':') + ) { string offsetString(line.substr(0, line.find('-'))); IStringStream offsetStr(offsetString); @@ -359,10 +365,10 @@ void error::printStack(Ostream& os) programFile = msg.substr(0, min(spacePos, bracketPos)); // not an absolute path - if (programFile[0] != '/') + if (programFile[0] != '/' && programFile[1] != ':') { string tmp = pOpen("which " + programFile); - if (tmp[0] == '/' || tmp[0] == '~') + if (tmp[0] == '/' || tmp[1] == ':' || tmp[0] == '~') { programFile = tmp; } diff --git a/src/OSspecific/POSIX/printStack.C b/src/OSspecific/POSIX/printStack.C index ccbcc159e..c22b88f1b 100644 --- a/src/OSspecific/POSIX/printStack.C +++ b/src/OSspecific/POSIX/printStack.C @@ -130,7 +130,7 @@ void printSourceFileAndLine } #ifndef darwin - if (filename[0] == '/') + if (filename[0] == '/' || filename[1] == ':') #else if (1) #endif @@ -175,7 +175,10 @@ void getSymbolForRaw const word& address ) { - if (filename.size() && filename[0] == '/') + if + ( + filename.size() && (filename[0] == '/' || filename[1] == ':') + ) { string fcnt = pOpen ( @@ -224,7 +227,10 @@ void error::printStack(Ostream& os) string::size_type space = line.rfind(' ') + 1; fileName libPath = line.substr(space, line.size()-space); - if (libPath.size() && libPath[0] == '/') + if + ( + libPath.size() && (libPath[0] == '/' || libPath[1] == ':') + ) { string offsetString(line.substr(0, line.find('-'))); IStringStream offsetStr(offsetString); @@ -268,10 +274,10 @@ void error::printStack(Ostream& os) programFile = msg.substr(0, min(spacePos, bracketPos)); // not an absolute path - if (programFile[0] != '/') + if (programFile[0] != '/' && programFile[1] != ':') { string tmp = pOpen("which " + programFile); - if (tmp[0] == '/' || tmp[0] == '~') + if (tmp[0] == '/' || tmp[1] == ':' || tmp[0] == '~') { programFile = tmp; } diff --git a/src/foam/db/dictionary/functionEntries/includeEntry/includeEntry.C b/src/foam/db/dictionary/functionEntries/includeEntry/includeEntry.C index 5da286a8b..8e69c125f 100644 --- a/src/foam/db/dictionary/functionEntries/includeEntry/includeEntry.C +++ b/src/foam/db/dictionary/functionEntries/includeEntry/includeEntry.C @@ -77,7 +77,7 @@ Foam::fileName Foam::functionEntries::includeEntry::includeFileName fileName fName(is); fName.expand(); - if (fName.size() && fName[0] != '/') + if (fName.size() && fName[0] != '/' && fName[1] != ':') { fName = fileName(is.name()).path()/fName; } diff --git a/src/foam/global/argList/argList.C b/src/foam/global/argList/argList.C index 151f53c63..4b17f67cc 100644 --- a/src/foam/global/argList/argList.C +++ b/src/foam/global/argList/argList.C @@ -159,7 +159,10 @@ void Foam::argList::getRootCase() casePath = cwd(); options_.erase("case"); } - else if (casePath[0] != '/' && casePath.name() == "..") + else if + ( + casePath[0] != '/' && casePath[1] != ':' && casePath.name() == ".." + ) { // avoid relative cases ending in '..' - makes for very ugly names casePath = cwd()/casePath; @@ -177,7 +180,7 @@ void Foam::argList::getRootCase() case_ = globalCase_; // Set the case and case-name as an environment variable - if (rootPath_[0] == '/') + if (rootPath_[0] == '/' || rootPath_[1] == ':') { // Absolute path - use as-is setEnv("FOAM_CASE", rootPath_/globalCase_, true); diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C index 9e9b3a425..0ca39f3d6 100644 --- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C +++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C @@ -884,12 +884,18 @@ Foam::chemkinReader::chemkinReader(const dictionary& thermoDict) fileName relPath = thermoDict.name().path(); if (relPath.size()) { - if (chemkinFile.size() && chemkinFile[0] != '/') + if + ( + chemkinFile.size() && chemkinFile[0] != '/' && chemkinFile[1] != ':' + ) { chemkinFile = relPath/chemkinFile; } - if (thermoFile.size() && thermoFile[0] != '/') + if + ( + thermoFile.size() && thermoFile[0] != '/' && thermoFile[1] != ':' + ) { thermoFile = relPath/thermoFile; } From 8607f3d224c8321e8b10ea807147c406449cad73 Mon Sep 17 00:00:00 2001 From: Robert Keser Date: Wed, 19 Apr 2017 14:18:57 +0200 Subject: [PATCH 7/9] Repairing tutorial cases on windows. --- .../snappyMultiRegionHeater/Allrun | 12 ++++++------ .../snappyMultiRegionHeater/system/controlDict | 7 ++++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun index aa68b8f4d..de53ca41b 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun @@ -10,11 +10,11 @@ runApplication snappyHexMesh -overwrite runApplication splitMeshRegions -cellZones # copy fields -cp 0/* 0.001/bottomAir/ -cp 0/* 0.001/heater/ -cp 0/* 0.001/leftSolid/ -cp 0/* 0.001/rightSolid/ -cp 0/* 0.001/topAir/ +cp 0/* 0.001/bottomAir +cp 0/* 0.001/heater +cp 0/* 0.001/leftSolid +cp 0/* 0.001/rightSolid +cp 0/* 0.001/topAir # remove fluid fields from solid regions (important for post-processing) for i in heater leftSolid rightSolid @@ -25,7 +25,7 @@ done # remove solid fields from fluid regions (important for post-processing) for i in bottomAir topAir do - rm -f 0*/$i/{cp,K,rho} + rm -f 0*/$i/{cp,Kappa,rho} done for i in bottomAir topAir heater leftSolid rightSolid diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict index 737ac8f06..c4c562ce8 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict @@ -15,7 +15,12 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -libs ("libcompressibleTurbulenceModel.so" "libcompressibleRASModels.so"); +libs +( + "libcompressibleTurbulenceModel.so" + "libcompressibleRASModels.so" + "liblduSolvers.so" +); application snappyHexMesh; From d69eccdc69390ccf1c07165487ddd95991aa4111 Mon Sep 17 00:00:00 2001 From: Robert Keser Date: Wed, 19 Apr 2017 14:21:43 +0200 Subject: [PATCH 8/9] Bugfix: Avoid zero in log function in dsmcInitialise Authors: Robert Keser & Vanja Skuric --- .../dsmc/clouds/Templates/DsmcCloud/DsmcCloudTemplate.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudTemplate.C b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudTemplate.C index e6f41746a..64da4d95f 100644 --- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudTemplate.C +++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudTemplate.C @@ -1144,7 +1144,7 @@ Foam::scalar Foam::DsmcCloud::equipartitionInternalEnergy else if (iDof < 2.0 + SMALL && iDof > 2.0 - SMALL) { // Special case for iDof = 2, i.e. diatomics; - Ei = -log(rndGen_.scalar01())*kb*temperature; + Ei = -log(max(rndGen_.scalar01(), VSMALL))*kb*temperature; } else { From 407350379854c00967628038eeb7e3862869257b Mon Sep 17 00:00:00 2001 From: Robert Keser Date: Fri, 21 Apr 2017 16:55:02 +0200 Subject: [PATCH 9/9] Repairing tutorial cases on windows. --- .../twoBlocksMixingPlane_dirZ_spanY/system/controlDict | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirZ_spanY/system/controlDict b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirZ_spanY/system/controlDict index 52f422441..863f4587d 100644 --- a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirZ_spanY/system/controlDict +++ b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirZ_spanY/system/controlDict @@ -14,6 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs +( + "liblduSolvers.so" +); + application icoFoam; startFrom startTime;