From 1313dc091ba668d1aca97dfb34c8e6316ec11443 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 27 Jul 2009 18:17:57 +0100 Subject: [PATCH 1/4] fixing typo in injection specs --- .../filter/constant/parcelInjectionProperties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/parcelInjectionProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/parcelInjectionProperties index 56a5040225..4b87511c20 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/parcelInjectionProperties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/parcelInjectionProperties @@ -16,9 +16,9 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // x y z u v w d rho mDot T cp Y0..YN ( - (0.1 0.32 0.0 0.5 0.25 0.0 0.001 1000 0.2 300 4200 1.0) - (0.1 0.44 0.0 0.5 0.1 0.0 0.001 1000 0.2 300 4200 1.0) - (0.1 0.56 0.0 0.5 -0.1.0 0.0 0.001 1000 0.2 300 4200 1.0) + (0.1 0.32 0.0 0.5 0.25 0.0 0.001 1000 0.2 300 4200 1.0) + (0.1 0.44 0.0 0.5 0.10 0.0 0.001 1000 0.2 300 4200 1.0) + (0.1 0.56 0.0 0.5 -0.10 0.0 0.001 1000 0.2 300 4200 1.0) (0.1 0.68 0.0 0.5 -0.25 0.0 0.001 1000 0.2 300 4200 1.0) ); From 1ec00de14ccc34cb0bd734b622e2055a448f579d Mon Sep 17 00:00:00 2001 From: henry Date: Tue, 28 Jul 2009 12:35:26 +0100 Subject: [PATCH 2/4] and back to dev..... --- etc/bashrc | 2 +- etc/cshrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/bashrc b/etc/bashrc index 0c460577e9..b4af75e716 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -33,7 +33,7 @@ #------------------------------------------------------------------------------ export WM_PROJECT=OpenFOAM -export WM_PROJECT_VERSION=1.6 +export WM_PROJECT_VERSION=dev ################################################################################ # USER EDITABLE PART diff --git a/etc/cshrc b/etc/cshrc index bc5f325dd6..39a5210ca0 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -32,7 +32,7 @@ #------------------------------------------------------------------------------ setenv WM_PROJECT OpenFOAM -setenv WM_PROJECT_VERSION 1.6 +setenv WM_PROJECT_VERSION dev ################################################################################ # USER EDITABLE PART From 1089bbc69c02d5b86cd7ffcb522e48d10930f22a Mon Sep 17 00:00:00 2001 From: henry Date: Wed, 29 Jul 2009 11:52:42 +0100 Subject: [PATCH 3/4] Corrected omega wall-function BCs. --- .../incompressible/simpleFoam/motorBike/0/k | 25 +++++++++++++- .../simpleFoam/motorBike/0/omega | 25 +++++++++++++- .../motorBike/0/turbulentBoundaryField | 33 ------------------- .../motorBike/constant/polyMesh/boundary | 2 +- 4 files changed, 49 insertions(+), 36 deletions(-) delete mode 100644 tutorials/incompressible/simpleFoam/motorBike/0/turbulentBoundaryField diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/k b/tutorials/incompressible/simpleFoam/motorBike/0/k index 257b472da8..457efefed2 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/0/k +++ b/tutorials/incompressible/simpleFoam/motorBike/0/k @@ -20,6 +20,29 @@ dimensions [0 2 -2 0 0 0 0]; internalField uniform $turbulentKE; -#include "turbulentBoundaryField" +boundaryField +{ + #include "fixedInlet" + + outlet + { + type inletOutlet; + inletValue $internalField; + value $internalField; + } + + lowerWall + { + type kqRWallFunction; + } + + "motorBike_.*" + { + type kqRWallFunction; + } + + #include "frontBackUpperPatches" +} + // ************************************************************************* // diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/omega b/tutorials/incompressible/simpleFoam/motorBike/0/omega index 94cbf590c2..16424f9bb3 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/0/omega +++ b/tutorials/incompressible/simpleFoam/motorBike/0/omega @@ -20,6 +20,29 @@ dimensions [0 0 -1 0 0 0 0]; internalField uniform $turbulentOmega; -#include "turbulentBoundaryField" +boundaryField +{ + #include "fixedInlet" + + outlet + { + type inletOutlet; + inletValue $internalField; + value $internalField; + } + + lowerWall + { + type omegaWallFunction; + } + + "motorBike_.*" + { + type omegaWallFunction; + } + + #include "frontBackUpperPatches" +} + // ************************************************************************* // diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/turbulentBoundaryField b/tutorials/incompressible/simpleFoam/motorBike/0/turbulentBoundaryField deleted file mode 100644 index aa4e5eded9..0000000000 --- a/tutorials/incompressible/simpleFoam/motorBike/0/turbulentBoundaryField +++ /dev/null @@ -1,33 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -boundaryField -{ - #include "fixedInlet" - - outlet - { - type inletOutlet; - inletValue $internalField; - value $internalField; - } - - lowerWall - { - type kqRWallFunction; - } - - "motorBike_.*" - { - type kqRWallFunction; - } - - #include "frontBackUpperPatches" -} - -// ************************************************************************* // diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary index e96b062da6..b79c6ad432 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary +++ b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ From 2d58cdf8ca26ef884eb7afb264005687b4011965 Mon Sep 17 00:00:00 2001 From: henry Date: Wed, 29 Jul 2009 12:52:06 +0100 Subject: [PATCH 4/4] Added a consistency check for the location of the installation. --- Allwmake | 8 ++++++++ applications/Allwmake | 9 +++++++++ src/Allwmake | 9 +++++++++ 3 files changed, 26 insertions(+) diff --git a/Allwmake b/Allwmake index c01c6c0d1a..ee6f075a0e 100755 --- a/Allwmake +++ b/Allwmake @@ -1,6 +1,14 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory +if [ "$PWD" != "$WM_PROJECT_DIR" ] +then + echo "Error: Current directory in not \$WM_PROJECT_DIR" + echo " The environment variable are not consistent with the installation." + echo " Check the OpenFOAM entries in your dot-files and source them." + exit 1 +fi + # wmake is required for subsequent targets ( cd wmake/src && make ) diff --git a/applications/Allwmake b/applications/Allwmake index 2a7eeae124..82a2ec0df4 100755 --- a/applications/Allwmake +++ b/applications/Allwmake @@ -1,5 +1,14 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory + +if [ "$PWD" != "$WM_PROJECT_DIR/applications" ] +then + echo "Error: Current directory in not \$WM_PROJECT_DIR/applications" + echo " The environment variable are not consistent with the installation." + echo " Check the OpenFOAM entries in your dot-files and source them." + exit 1 +fi + set -x wmake all solvers diff --git a/src/Allwmake b/src/Allwmake index f2b2adf037..5473238ed3 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -1,5 +1,14 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory + +if [ "$PWD" != "$WM_PROJECT_DIR/src" ] +then + echo "Error: Current directory in not \$WM_PROJECT_DIR/src" + echo " The environment variable are not consistent with the installation." + echo " Check the OpenFOAM entries in your dot-files and source them." + exit 1 +fi + set -x # update OpenFOAM version strings if required