From 53e6dc728fa25b3a3963832db1438d469d7cc3af Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Tue, 12 May 2015 09:58:04 +0100 Subject: [PATCH] Feature:IBM tutorial update --- .../system/fvSolution | 16 +++++++-------- .../cylBumpInterIbFoam/system/fvSolution | 20 +++++++++---------- .../system/fvSolution | 4 ++-- .../system/fvSolution | 4 ++-- .../system/controlDict | 2 +- .../system/fvSolution | 8 ++++---- .../system/fvSolution | 8 ++++---- .../cylinderInSquareLaplace/system/fvSolution | 4 ++-- .../system/fvSolution | 8 ++++---- .../pitzDailyBodyFitted/system/fvSolution | 16 +++++++-------- .../system/fvSolution | 12 +++++------ .../system/fvSolution | 11 ++++------ .../system/fvSolution | 16 +++++++-------- .../system/fvSolution | 16 +++++++-------- .../porousBumpChannelIb/system/fvSolution | 16 +++++++-------- .../system/fvSolution | 12 +++++------ .../refineSphereMesh/Make/options | 4 ++-- .../sphereInChannel/system/fvSolution | 8 ++++---- .../refineThickPlateMesh/Make/options | 4 ++-- .../thickPlateRefinedMesh/system/fvSolution | 12 +++++------ 20 files changed, 99 insertions(+), 102 deletions(-) diff --git a/tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/system/fvSolution b/tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/system/fvSolution index 198993006..b454c1c07 100644 --- a/tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/system/fvSolution +++ b/tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/system/fvSolution @@ -18,8 +18,8 @@ solvers { // p // { -// solver PCG; -// preconditioner DIC; +// solver CG; +// preconditioner Cholesky; // minIter 1; // maxIter 1000; @@ -54,8 +54,8 @@ solvers U { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; minIter 1; maxIter 1000; @@ -65,8 +65,8 @@ solvers k { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; minIter 1; maxIter 1000; @@ -76,8 +76,8 @@ solvers epsilon { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; minIter 1; maxIter 1000; diff --git a/tutorials/immersedBoundary/cylBumpInterIbFoam/system/fvSolution b/tutorials/immersedBoundary/cylBumpInterIbFoam/system/fvSolution index 5e619a548..b8ba0ebb0 100644 --- a/tutorials/immersedBoundary/cylBumpInterIbFoam/system/fvSolution +++ b/tutorials/immersedBoundary/cylBumpInterIbFoam/system/fvSolution @@ -18,8 +18,8 @@ solvers { pcorr { - solver PCG; - preconditioner DIC; + solver CG; + preconditioner Cholesky; minIter 1; maxIter 1000; @@ -29,8 +29,8 @@ solvers pd { - solver PCG; - preconditioner DIC; + solver CG; + preconditioner Cholesky; minIter 1; maxIter 1000; @@ -40,8 +40,8 @@ solvers pdFinal { - solver PCG; - preconditioner DIC; + solver CG; + preconditioner Cholesky; minIter 1; maxIter 1000; @@ -51,8 +51,8 @@ solvers U { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; minIter 1; @@ -63,8 +63,8 @@ solvers alpha1 { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; minIter 1; diff --git a/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSolution b/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSolution index 029062ad1..1bb2aae31 100644 --- a/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSolution +++ b/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSolution @@ -37,8 +37,8 @@ solvers U { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; minIter 1; maxIter 1000; diff --git a/tutorials/immersedBoundary/cylinderInChannelIcoIbFoam/system/fvSolution b/tutorials/immersedBoundary/cylinderInChannelIcoIbFoam/system/fvSolution index 029062ad1..1bb2aae31 100644 --- a/tutorials/immersedBoundary/cylinderInChannelIcoIbFoam/system/fvSolution +++ b/tutorials/immersedBoundary/cylinderInChannelIcoIbFoam/system/fvSolution @@ -37,8 +37,8 @@ solvers U { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; minIter 1; maxIter 1000; diff --git a/tutorials/immersedBoundary/cylinderInChannelPotential/system/controlDict b/tutorials/immersedBoundary/cylinderInChannelPotential/system/controlDict index 821e75012..f5ab697ef 100644 --- a/tutorials/immersedBoundary/cylinderInChannelPotential/system/controlDict +++ b/tutorials/immersedBoundary/cylinderInChannelPotential/system/controlDict @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application icoDyMFoam; +application potentialIbFoam; startFrom startTime; diff --git a/tutorials/immersedBoundary/cylinderInChannelPotential/system/fvSolution b/tutorials/immersedBoundary/cylinderInChannelPotential/system/fvSolution index 9ca956f32..5378fd9d3 100644 --- a/tutorials/immersedBoundary/cylinderInChannelPotential/system/fvSolution +++ b/tutorials/immersedBoundary/cylinderInChannelPotential/system/fvSolution @@ -18,8 +18,8 @@ solvers { p { - solver PCG; - preconditioner DIC; + solver CG; + preconditioner Cholesky; minIter 1; maxIter 1000; @@ -42,8 +42,8 @@ solvers U { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; minIter 1; maxIter 1000; diff --git a/tutorials/immersedBoundary/cylinderInChannelScalarTransport/system/fvSolution b/tutorials/immersedBoundary/cylinderInChannelScalarTransport/system/fvSolution index 5582cce3c..9ca699ca6 100644 --- a/tutorials/immersedBoundary/cylinderInChannelScalarTransport/system/fvSolution +++ b/tutorials/immersedBoundary/cylinderInChannelScalarTransport/system/fvSolution @@ -18,8 +18,8 @@ solvers { p { - solver PCG; - preconditioner DIC; + solver CG; + preconditioner Cholesky; minIter 1; maxIter 1000; @@ -29,8 +29,8 @@ solvers T { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; tolerance 1e-08; relTol 0; }; diff --git a/tutorials/immersedBoundary/cylinderInSquareLaplace/system/fvSolution b/tutorials/immersedBoundary/cylinderInSquareLaplace/system/fvSolution index b3996c9fc..235e1007e 100644 --- a/tutorials/immersedBoundary/cylinderInSquareLaplace/system/fvSolution +++ b/tutorials/immersedBoundary/cylinderInSquareLaplace/system/fvSolution @@ -18,8 +18,8 @@ solvers { T { - solver PCG; - preconditioner DIC; + solver CG; + preconditioner Cholesky; minIter 1; maxIter 1000; diff --git a/tutorials/immersedBoundary/cylinderInSquarePotential/system/fvSolution b/tutorials/immersedBoundary/cylinderInSquarePotential/system/fvSolution index a6afeff6a..ceeb56aaa 100644 --- a/tutorials/immersedBoundary/cylinderInSquarePotential/system/fvSolution +++ b/tutorials/immersedBoundary/cylinderInSquarePotential/system/fvSolution @@ -18,8 +18,8 @@ solvers { p { - solver PCG; - preconditioner DIC; + solver CG; + preconditioner Cholesky; minIter 1; maxIter 1000; @@ -42,8 +42,8 @@ solvers U { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; minIter 1; maxIter 1000; diff --git a/tutorials/immersedBoundary/pitzDailyBodyFitted/system/fvSolution b/tutorials/immersedBoundary/pitzDailyBodyFitted/system/fvSolution index 2129c8731..1559a725e 100644 --- a/tutorials/immersedBoundary/pitzDailyBodyFitted/system/fvSolution +++ b/tutorials/immersedBoundary/pitzDailyBodyFitted/system/fvSolution @@ -18,29 +18,29 @@ solvers { p { - solver PCG; - preconditioner DIC; + solver CG; + preconditioner Cholesky; tolerance 1e-06; relTol 0.01; } U { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; tolerance 1e-05; relTol 0.1; } k { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; tolerance 1e-05; relTol 0.1; } epsilon { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; tolerance 1e-05; relTol 0.1; } diff --git a/tutorials/immersedBoundary/pitzDailyLaminarIcoIbFoam/system/fvSolution b/tutorials/immersedBoundary/pitzDailyLaminarIcoIbFoam/system/fvSolution index 019a415e7..6328b9ff4 100644 --- a/tutorials/immersedBoundary/pitzDailyLaminarIcoIbFoam/system/fvSolution +++ b/tutorials/immersedBoundary/pitzDailyLaminarIcoIbFoam/system/fvSolution @@ -18,8 +18,8 @@ solvers { // p // { -// solver PCG; -// preconditioner DIC; +// solver CG; +// preconditioner Cholesky; // minIter 1; // maxIter 1000; @@ -54,11 +54,11 @@ solvers U { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; -// solver PCG; -// preconditioner DIC; +// solver CG; +// preconditioner Cholesky; minIter 1; maxIter 1000; diff --git a/tutorials/immersedBoundary/pitzDailyLaminarSimpleIbFoam/system/fvSolution b/tutorials/immersedBoundary/pitzDailyLaminarSimpleIbFoam/system/fvSolution index 1a33ac304..12ff1ce3d 100644 --- a/tutorials/immersedBoundary/pitzDailyLaminarSimpleIbFoam/system/fvSolution +++ b/tutorials/immersedBoundary/pitzDailyLaminarSimpleIbFoam/system/fvSolution @@ -18,8 +18,8 @@ solvers { // p // { -// solver PCG; -// preconditioner DIC; +// solver CG; +// preconditioner Cholesky; // minIter 1; // maxIter 1000; @@ -54,11 +54,8 @@ solvers U { - solver PBiCG; - preconditioner DILU; - -// solver PCG; -// preconditioner DIC; + solver BiCGStab; + preconditioner ILU0; minIter 1; maxIter 1000; diff --git a/tutorials/immersedBoundary/pitzDailyTurbulentSimpleIbFoam/system/fvSolution b/tutorials/immersedBoundary/pitzDailyTurbulentSimpleIbFoam/system/fvSolution index b82eec0a5..7efb39b60 100644 --- a/tutorials/immersedBoundary/pitzDailyTurbulentSimpleIbFoam/system/fvSolution +++ b/tutorials/immersedBoundary/pitzDailyTurbulentSimpleIbFoam/system/fvSolution @@ -18,8 +18,8 @@ solvers { p { - solver PCG; - preconditioner DIC; + solver CG; + preconditioner Cholesky; minIter 1; maxIter 1000; @@ -54,8 +54,8 @@ solvers U { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; minIter 1; maxIter 1000; @@ -65,8 +65,8 @@ solvers k { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; minIter 1; maxIter 1000; @@ -76,8 +76,8 @@ solvers epsilon { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; minIter 1; maxIter 1000; diff --git a/tutorials/immersedBoundary/porousBumpChannelBodyFitted/system/fvSolution b/tutorials/immersedBoundary/porousBumpChannelBodyFitted/system/fvSolution index b84c5de5b..638025e6a 100644 --- a/tutorials/immersedBoundary/porousBumpChannelBodyFitted/system/fvSolution +++ b/tutorials/immersedBoundary/porousBumpChannelBodyFitted/system/fvSolution @@ -19,32 +19,32 @@ solvers { p { - solver PCG; - preconditioner DIC; + solver CG; + preconditioner Cholesky; minIter 1; tolerance 1e-07; relTol 0.01; } U { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; minIter 1; tolerance 1e-07; relTol 0; } k { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; minIter 1; tolerance 1e-07; relTol 0; } epsilon { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; minIter 1; tolerance 1e-07; relTol 0; diff --git a/tutorials/immersedBoundary/porousBumpChannelIb/system/fvSolution b/tutorials/immersedBoundary/porousBumpChannelIb/system/fvSolution index f47461fc9..e32d4aa26 100644 --- a/tutorials/immersedBoundary/porousBumpChannelIb/system/fvSolution +++ b/tutorials/immersedBoundary/porousBumpChannelIb/system/fvSolution @@ -18,8 +18,8 @@ solvers { // p // { -// solver PCG; -// preconditioner DIC; +// solver CG; +// preconditioner Cholesky; // minIter 1; // maxIter 1000; @@ -54,8 +54,8 @@ solvers U { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; minIter 1; maxIter 1000; @@ -65,8 +65,8 @@ solvers k { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; minIter 1; maxIter 1000; @@ -76,8 +76,8 @@ solvers epsilon { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; minIter 1; maxIter 1000; diff --git a/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/system/fvSolution b/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/system/fvSolution index f5b91eb34..2d573d25f 100644 --- a/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/system/fvSolution +++ b/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/system/fvSolution @@ -18,8 +18,8 @@ solvers { p { - solver PCG; - preconditioner DIC; + solver CG; + preconditioner Cholesky; minIter 1; maxIter 1000; @@ -42,11 +42,11 @@ solvers U { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; -// solver PCG; -// preconditioner DIC; +// solver CG; +// preconditioner Cholesky; minIter 1; maxIter 1000; diff --git a/tutorials/immersedBoundary/sphereInChannel/refineSphereMesh/Make/options b/tutorials/immersedBoundary/sphereInChannel/refineSphereMesh/Make/options index 5c7a40a7c..7e7db4b58 100644 --- a/tutorials/immersedBoundary/sphereInChannel/refineSphereMesh/Make/options +++ b/tutorials/immersedBoundary/sphereInChannel/refineSphereMesh/Make/options @@ -1,5 +1,5 @@ EXE_INC = \ - -I../../../src/immersedBoundary/lnInclude \ + -I$(LIB_SRC)/immersedBoundary/immersedBoundary/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ @@ -12,4 +12,4 @@ EXE_LIBS = \ -lsurfMesh \ -lsampling \ -ldynamicMesh \ - -L$(FOAM_USER_LIBBIN) -limmersedBoundary + -limmersedBoundary diff --git a/tutorials/immersedBoundary/sphereInChannel/system/fvSolution b/tutorials/immersedBoundary/sphereInChannel/system/fvSolution index ee27d7dcc..683ea57c5 100644 --- a/tutorials/immersedBoundary/sphereInChannel/system/fvSolution +++ b/tutorials/immersedBoundary/sphereInChannel/system/fvSolution @@ -18,8 +18,8 @@ solvers { // p // { -// solver PCG; -// preconditioner DIC; +// solver CG; +// preconditioner Cholesky; // minIter 1; // maxIter 1000; @@ -61,8 +61,8 @@ solvers U { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; minIter 1; maxIter 1000; diff --git a/tutorials/immersedBoundary/thickPlateRefinedMesh/refineThickPlateMesh/Make/options b/tutorials/immersedBoundary/thickPlateRefinedMesh/refineThickPlateMesh/Make/options index 5c7a40a7c..7e7db4b58 100644 --- a/tutorials/immersedBoundary/thickPlateRefinedMesh/refineThickPlateMesh/Make/options +++ b/tutorials/immersedBoundary/thickPlateRefinedMesh/refineThickPlateMesh/Make/options @@ -1,5 +1,5 @@ EXE_INC = \ - -I../../../src/immersedBoundary/lnInclude \ + -I$(LIB_SRC)/immersedBoundary/immersedBoundary/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ @@ -12,4 +12,4 @@ EXE_LIBS = \ -lsurfMesh \ -lsampling \ -ldynamicMesh \ - -L$(FOAM_USER_LIBBIN) -limmersedBoundary + -limmersedBoundary diff --git a/tutorials/immersedBoundary/thickPlateRefinedMesh/system/fvSolution b/tutorials/immersedBoundary/thickPlateRefinedMesh/system/fvSolution index 8b12d5c94..bcd2238dd 100644 --- a/tutorials/immersedBoundary/thickPlateRefinedMesh/system/fvSolution +++ b/tutorials/immersedBoundary/thickPlateRefinedMesh/system/fvSolution @@ -18,8 +18,8 @@ solvers { // p // { -// solver PCG; -// preconditioner DIC; +// solver CG; +// preconditioner Cholesky; // minIter 1; // maxIter 1000; @@ -42,11 +42,11 @@ solvers U { - solver PBiCG; - preconditioner DILU; + solver BiCGStab; + preconditioner ILU0; -// solver PCG; -// preconditioner DIC; +// solver CG; +// preconditioner Cholesky; minIter 1; maxIter 1000;