From 04d26c8e38b11c24eeace78bf9185dd23795b4c9 Mon Sep 17 00:00:00 2001 From: henry Date: Mon, 5 Jan 2009 22:17:20 +0000 Subject: [PATCH 1/4] Corrected dimensions of kappa. --- .../kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index 44e276ddde..16e9a193d5 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -167,7 +167,7 @@ Foam::kineticTheoryModel::kineticTheoryModel IOobject::NO_WRITE ), Ua_.mesh(), - dimensionedScalar("zero", dimensionSet(0, 0, 0, 0, 0), 0.0) + dimensionedScalar("zero", dimensionSet(1, -1, -1, 0, 0), 0.0) ), gs0_ ( From d793344af21db996d39d5824ec07cf46b404d7b7 Mon Sep 17 00:00:00 2001 From: henry Date: Mon, 5 Jan 2009 22:18:19 +0000 Subject: [PATCH 2/4] Corrected mhdFoam tutorial scripts. --- bin/tools/CleanFunctions | 2 +- tutorials/mhdFoam/Allrun | 3 ++- tutorials/mhdFoam/hartmann/system/sampleDict | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bin/tools/CleanFunctions b/bin/tools/CleanFunctions index 1577d5583c..4f0ceb4023 100644 --- a/bin/tools/CleanFunctions +++ b/bin/tools/CleanFunctions @@ -88,7 +88,7 @@ removeCase () cleanSamples () { - rm -rf {samples,sampleSurfaces} > /dev/null 2>&1 + rm -rf {sets,samples,sampleSurfaces} > /dev/null 2>&1 } cleanUcomponents () diff --git a/tutorials/mhdFoam/Allrun b/tutorials/mhdFoam/Allrun index df0077cf05..aca66b3533 100755 --- a/tutorials/mhdFoam/Allrun +++ b/tutorials/mhdFoam/Allrun @@ -3,8 +3,9 @@ . $WM_PROJECT_DIR/bin/tools/RunFunctions # Get application name from directory -application="mdEquilibrationFoam" +application="mhdFoam" (cd hartmann && runApplication blockMesh) (cd hartmann && runApplication $application) +(cd hartmann && runApplication foamCalc components U) (cd hartmann && runApplication sample) diff --git a/tutorials/mhdFoam/hartmann/system/sampleDict b/tutorials/mhdFoam/hartmann/system/sampleDict index d7c5a97c45..e62120c869 100644 --- a/tutorials/mhdFoam/hartmann/system/sampleDict +++ b/tutorials/mhdFoam/hartmann/system/sampleDict @@ -18,9 +18,9 @@ interpolationScheme cellPoint; setFormat raw; -sets +sets ( - line_centreProfile + line_centreProfile { type uniform; @@ -34,9 +34,9 @@ sets surfaces (); -fields +fields ( - U.component(0) + Ux ); // ************************************************************************* // From efd8afdbb66deaa365461f92bf27f76ef10d1fd7 Mon Sep 17 00:00:00 2001 From: henry Date: Mon, 5 Jan 2009 22:22:43 +0000 Subject: [PATCH 3/4] Added the new "outputControl" option to the function objects. --- tutorials/twoPhaseEulerFoam/bed2/system/controlDict | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tutorials/twoPhaseEulerFoam/bed2/system/controlDict b/tutorials/twoPhaseEulerFoam/bed2/system/controlDict index 8deea7de4a..85c8fc5cb8 100644 --- a/tutorials/twoPhaseEulerFoam/bed2/system/controlDict +++ b/tutorials/twoPhaseEulerFoam/bed2/system/controlDict @@ -60,6 +60,8 @@ functions // Where to load it from (if not already in solver) functionObjectLibs ("libfieldAverage.so"); + outputControl outputTime; + // Fields to be averaged - runTime modifiable fields ( From 5f1c91904121ffefd26f0dce22a1aaf2a2f16c33 Mon Sep 17 00:00:00 2001 From: henry Date: Mon, 5 Jan 2009 22:23:25 +0000 Subject: [PATCH 4/4] Header automatically changed. Should we try to avoid this? --- .../hartmann/constant/polyMesh/boundary | 5 +- .../bed2/constant/polyMesh/boundary | 56 +++++++++---------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/tutorials/mhdFoam/hartmann/constant/polyMesh/boundary b/tutorials/mhdFoam/hartmann/constant/polyMesh/boundary index acc4e4c390..0be28ca208 100644 --- a/tutorials/mhdFoam/hartmann/constant/polyMesh/boundary +++ b/tutorials/mhdFoam/hartmann/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev-8cbffd16687e | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary b/tutorials/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary index 8b28212be9..e2e0e3a9f2 100644 --- a/tutorials/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary +++ b/tutorials/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev-8cbffd16687e | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,39 +10,37 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 4 ( -inlet -{ - type patch; - nFaces 30; - startFace 11770; -} - -outlet -{ - type patch; - nFaces 30; - startFace 11800; -} - -walls -{ - type wall; - nFaces 400; - startFace 11830; -} - -frontAndBackPlanes -{ - type empty; - nFaces 12000; - startFace 12230; -} + inlet + { + type patch; + nFaces 30; + startFace 11770; + } + outlet + { + type patch; + nFaces 30; + startFace 11800; + } + walls + { + type wall; + nFaces 400; + startFace 11830; + } + frontAndBackPlanes + { + type empty; + nFaces 12000; + startFace 12230; + } ) // ************************************************************************* //