zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
andy
2010-11-05 12:52:38 +00:00
parent e338bd79ca ff72ba14cb
commit 2db6f12146
39 changed files with 71 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / O peration | Version: 1.7.1 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@ -106,7 +106,8 @@ castellatedMeshControls
// Explicit feature edge refinement
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Specifies a level for any cell intersected by its edges.
// Specifies a level for any cell intersected by explicitly provided
// edges.
// This is a featureEdgeMesh, read from constant/triSurface for now.
features
(

6
bin/mpirunDebug
View File

@ -161,7 +161,7 @@ for ((proc=0; proc<$nProcs; proc++))
do
procCmdFile="$PWD/processor${proc}.sh"
procLog="processor${proc}.log"
geom="-geometry 120x20+$xpos+$ypos"
geom="-geometry 120x15+$xpos+$ypos"
case "$WM_MPLIB" in
*OPENMPI)
@ -183,11 +183,11 @@ do
echo "${node}xterm -font fixed -title 'processor'$proc $geom -e $procCmdFile" >> $PWD/mpirun.schema
;;
2)
echo "$sourceFoam; cd $PWD; gdb -command $PWD/gdbCommands >& $procLog" >> $procCmdFile
echo "$sourceFoam; cd $PWD; gdb -command $PWD/gdbCommands $exec > $procLog 2>&1" >> $procCmdFile
echo "${node}$procCmdFile" >> $PWD/mpirun.schema
;;
3)
echo "$sourceFoam; cd $PWD; $exec $args >& $procLog" >> $procCmdFile
echo "$sourceFoam; cd $PWD; $exec $args > $procLog 2>&1" >> $procCmdFile
echo "${node}$procCmdFile" >> $PWD/mpirun.schema
;;
4)

13
bin/tools/foamConfigurePaths
View File

@ -53,7 +53,8 @@ _inlineSed()
backup=`tempfile`
cp $1 $backup
sed -i -e "$2" $1
cmp $1 $backup || usage "Failed : $3"
cmp --quiet $1 $backup && usage "Failed : $3"
return 0
}
@ -70,9 +71,7 @@ do
;;
--foamInstall)
[ "$#" -ge 2 ] || usage "'$1' option requires an argument"
foamInstall="$2"
echo "** foamInstall:$foamInstall"
foamInstall="$2"
_inlineSed \
etc/bashrc \
'/^[^#]/s@foamInstall=.*@foamInstall='"$foamInstall@" \
@ -81,7 +80,7 @@ do
;;
--projectName)
[ "$#" -ge 2 ] || usage "'$1' option requires an argument"
projectName="$2"
projectName="$2"
_inlineSed \
etc/bashrc \
'/^[^#]/s@WM_PROJECT_DIR=.*@WM_PROJECT_DIR=$WM_PROJECT_INST_DIR/'"$projectName@" \
@ -90,7 +89,7 @@ do
;;
--archOption)
[ "$#" -ge 2 ] || usage "'$1' option requires an argument"
archOption="$2"
archOption="$2"
_inlineSed \
etc/bashrc \
'/^[^#]/s@: ${WM_ARCH_OPTION:=64}@WM_ARCH_OPTION='"$archOption@" \
@ -99,7 +98,7 @@ do
;;
--paraviewInstall)
[ "$#" -ge 2 ] || usage "'$1' option requires an argument"
paraviewInstall="$2"
paraviewInstall="$2"
_inlineSed \
etc/apps/paraview3/bashrc \
'/^[^#]/s@ParaView_DIR=.*@ParaView_DIR='"$paraviewInstall@" \

17
src/meshTools/PointEdgeWave/PointEdgeWave.C
View File

@ -515,13 +515,16 @@ void Foam::PointEdgeWave<Type>::handleProcPatches()
label meshPointI = pd.sharedPointLabels()[i];
// Retrieve my entries from the shared points
updatePoint
(
meshPointI,
sharedData[pd.sharedPointAddr()[i]],
propagationTol_,
allPointInfo_[meshPointI]
);
if (sharedData[pd.sharedPointAddr()[i]].valid())
{
updatePoint
(
meshPointI,
sharedData[pd.sharedPointAddr()[i]],
propagationTol_,
allPointInfo_[meshPointI]
);
}
}
}

5
src/meshTools/PointEdgeWave/PointEdgeWave.H
View File

@ -350,7 +350,10 @@ public:
{
forAll(x, i)
{
x[i].updatePoint(y[i], PointEdgeWave<Type>::propagationTol());
if (y[i].valid())
{
x[i].updatePoint(y[i], PointEdgeWave<Type>::propagationTol());
}
}
}
};

2
tutorials/combustion/fireFoam/les/smallPoolFire2D/system/createPatchDict
View File

@ -25,7 +25,7 @@ FoamFile
// Tolerance used in matching faces. Absolute tolerance is span of
// face times this factor. To load incorrectly matches meshes set this
// to a higher value.
matchTolerance 1E-3;
matchTolerance 1e-3;
// Do a synchronisation of coupled points after creation of any patches.
pointSync true;

2
tutorials/combustion/fireFoam/les/smallPoolFire3D/system/createPatchDict
View File

@ -25,7 +25,7 @@ FoamFile
// Tolerance used in matching faces. Absolute tolerance is span of
// face times this factor. To load incorrectly matches meshes set this
// to a higher value.
matchTolerance 1E-3;
matchTolerance 1e-3;
// Do a synchronisation of coupled points after creation of any patches.
pointSync true;

2
tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict
View File

@ -25,7 +25,7 @@ regions
// Set patch values (using ==)
boxToFace
{
box (4.5 -1000 4.5) (5.5 1E-5 5.5);
box (4.5 -1000 4.5) (5.5 1e-5 5.5);
fieldValues
(

2
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict
View File

@ -25,7 +25,7 @@ regions
// Set patch values (using ==)
boxToFace
{
box (4.5 -1000 4.5) (5.5 1E-5 5.5);
box (4.5 -1000 4.5) (5.5 1e-5 5.5);
fieldValues
(

2
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
View File

@ -409,7 +409,7 @@ debug 0;
// Merge tolerance. Is fraction of overall bounding box of initial mesh.
// Note: the write tolerance needs to be higher than this.
mergeTolerance 1E-6;
mergeTolerance 1e-6;
// ************************************************************************* //

2
tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict
View File

@ -25,7 +25,7 @@ regions
// Set patch values (using ==)
boxToFace
{
box (4.5 -1000 4.5) (5.5 1E-5 5.5);
box (4.5 -1000 4.5) (5.5 1e-5 5.5);
fieldValues
(

2
tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/setFieldsDict
View File

@ -25,7 +25,7 @@ regions
// Set patch values (using ==)
boxToFace
{
box (4.5 -1000 4.5) (5.5 1E-5 5.5);
box (4.5 -1000 4.5) (5.5 1e-5 5.5);
fieldValues
(

2
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
View File

@ -65,7 +65,7 @@ directionalSolidThermoCoeffs
{
type axes;
e1 (1 0 0);
e3 (-3.1807824E-6 -0.99813473 0.0610505);
e3 (-3.1807824e-6 -0.99813473 0.0610505);
}
}

4
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution
View File

@ -20,14 +20,14 @@ solvers
{
solver PCG;
preconditioner DIC;
tolerance 1E-06;
tolerance 1e-06;
relTol 0.1;
}
TFinal
{
$T;
tolerance 1E-06;
tolerance 1e-06;
relTol 0;
}
}

4
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution
View File

@ -20,14 +20,14 @@ solvers
{
solver PCG;
preconditioner DIC;
tolerance 1E-06;
tolerance 1e-06;
relTol 0.1;
}
TFinal
{
$T;
tolerance 1E-06;
tolerance 1e-06;
relTol 0;
}
}

4
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution
View File

@ -20,14 +20,14 @@ solvers
{
solver PCG;
preconditioner DIC;
tolerance 1E-06;
tolerance 1e-06;
relTol 0.1;
}
TFinal
{
$T;
tolerance 1E-06;
tolerance 1e-06;
relTol 0;
}
}

2
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/solidThermophysicalProperties
View File

@ -65,7 +65,7 @@ directionalSolidThermoCoeffs
{
type axes;
e1 (1 0 0);
e3 (-3.1807824E-6 -0.99813473 0.0610505);
e3 (-3.1807824e-6 -0.99813473 0.0610505);
}
}

9
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/fvSolution
View File

@ -20,22 +20,17 @@ solvers
{
solver PCG;
preconditioner DIC;
tolerance 1E-06;
tolerance 1e-06;
relTol 0.1;
}
TFinal
{
$T;
tolerance 1E-06;
tolerance 1e-06;
relTol 0;
}
}
PISO
{
nNonOrthogonalCorrectors 1;
}
PIMPLE
{
nNonOrthogonalCorrectors 1;

9
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSolution
View File

@ -20,22 +20,17 @@ solvers
{
solver PCG;
preconditioner DIC;
tolerance 1E-06;
tolerance 1e-06;
relTol 0.1;
}
TFinal
{
$T;
tolerance 1E-06;
tolerance 1e-06;
relTol 0;
}
}
PISO
{
nNonOrthogonalCorrectors 1;
}
PIMPLE
{
nNonOrthogonalCorrectors 1;

9
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSolution
View File

@ -20,22 +20,17 @@ solvers
{
solver PCG;
preconditioner DIC;
tolerance 1E-06;
tolerance 1e-06;
relTol 0.1;
}
TFinal
{
$T;
tolerance 1E-06;
tolerance 1e-06;
relTol 0;
}
}
PISO
{
nNonOrthogonalCorrectors 1;
}
PIMPLE
{
nNonOrthogonalCorrectors 1;

2
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties
View File

@ -65,7 +65,7 @@ directionalSolidThermoCoeffs
{
type axes;
e1 (1 0 0);
e3 (-3.1807824E-6 -0.99813473 0.0610505);
e3 (-3.1807824e-6 -0.99813473 0.0610505);
}
}

2
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/solidThermophysicalProperties
View File

@ -65,7 +65,7 @@ directionalSolidThermoCoeffs
{
type axes;
e1 (1 0 0);
e3 (-3.1807824E-6 -0.99813473 0.0610505);
e3 (-3.1807824e-6 -0.99813473 0.0610505);
}
}

2
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/solidThermophysicalProperties
View File

@ -65,7 +65,7 @@ directionalSolidThermoCoeffs
{
type axes;
e1 (1 0 0);
e3 (-3.1807824E-6 -0.99813473 0.0610505);
e3 (-3.1807824e-6 -0.99813473 0.0610505);
}
}

2
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
mixture
{

4
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution
View File

@ -20,14 +20,14 @@ solvers
{
solver PCG;
preconditioner DIC;
tolerance 1E-06;
tolerance 1e-06;
relTol 0.1;
}
TFinal
{
$T;
tolerance 1E-06;
tolerance 1e-06;
relTol 0;
}
}

4
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution
View File

@ -20,14 +20,14 @@ solvers
{
solver PCG;
preconditioner DIC;
tolerance 1E-06;
tolerance 1e-06;
relTol 0.1;
}
TFinal
{
$T;
tolerance 1E-06;
tolerance 1e-06;
relTol 0;
}
}

4
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution
View File

@ -20,14 +20,14 @@ solvers
{
solver PCG;
preconditioner DIC;
tolerance 1E-06;
tolerance 1e-06;
relTol 0.1;
}
TFinal
{
$T;
tolerance 1E-06;
tolerance 1e-06;
relTol 0;
}
}

2
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict
View File

@ -391,7 +391,7 @@ debug 0;
// Merge tolerance. Is fraction of overall bounding box of initial mesh.
// Note: the write tolerance needs to be higher than this.
mergeTolerance 1E-6;
mergeTolerance 1e-6;
// ************************************************************************* //

2
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
thermoType hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
mixture
{

2
tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/createPatchDict
View File

@ -18,7 +18,7 @@ FoamFile
// Tolerance used in matching faces. Absolute tolerance is span of
// face times this factor. To load incorrectly matches meshes set this
// to a higher value.
matchTolerance 1E-3;
matchTolerance 1e-3;
// Do a synchronisation of coupled points after creation of any patches.
// Note: this does not work with points that are on multiple coupled patches

2
tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict
View File

@ -323,7 +323,7 @@ debug 0;
// Merge tolerance. Is fraction of overall bounding box of initial mesh.
// Note: the write tolerance needs to be higher than this.
mergeTolerance 1E-6;
mergeTolerance 1e-6;
// ************************************************************************* //

4
tutorials/incompressible/simpleFoam/motorBike/system/controlDict
View File

@ -100,8 +100,8 @@ functions
axis x; //distance;
// Note: tracks slightly offset so as not to be on a face
start (-1.001 1E-7 0.0011);
end (-1.001 1E-7 1.0011);
start (-1.001 1e-7 0.0011);
end (-1.001 1e-7 1.0011);
nPoints 20;
}
}

2
tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
View File

@ -334,7 +334,7 @@ debug 0;
// Merge tolerance. Is fraction of overall bounding box of initial mesh.
// Note: the write tolerance needs to be higher than this.
mergeTolerance 1E-6;
mergeTolerance 1e-6;
// ************************************************************************* //

4
tutorials/incompressible/simpleFoam/windTurbineTerrain/system/snappyHexMeshDict
View File

@ -49,7 +49,7 @@ geometry
type triSurfaceMesh;
name terrain;
//tolerance 1E-5; // optional:non-default tolerance on intersections
//tolerance 1e-5; // optional:non-default tolerance on intersections
//maxTreeDepth 10; // optional:depth of octree. Decrease only in case
// of memory limitations.
@ -429,7 +429,7 @@ debug 0;
// Merge tolerance. Is fraction of overall bounding box of initial mesh.
// Note: the write tolerance needs to be higher than this.
mergeTolerance 1E-6;
mergeTolerance 1e-6;
// ************************************************************************* //

2
tutorials/lagrangian/reactingParcelFilmFoam/panel/system/createPatchDict
View File

@ -17,7 +17,7 @@ FoamFile
// Tolerance used in matching faces. Absolute tolerance is span of
// face times this factor. To load incorrectly matches meshes set this
// to a higher value.
matchTolerance 1E-3;
matchTolerance 1e-3;
// Do a synchronisation of coupled points after creation of any patches.
pointSync false;

2
tutorials/lagrangian/reactingParcelFilmFoam/panel/system/wallFilmRegion/createPatchDict
View File

@ -17,7 +17,7 @@ FoamFile
// Tolerance used in matching faces. Absolute tolerance is span of
// face times this factor. To load incorrectly matches meshes set this
// to a higher value.
matchTolerance 1E-3;
matchTolerance 1e-3;
// Do a synchronisation of coupled points after creation of any patches.
pointSync false;

2
tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
View File

@ -343,7 +343,7 @@ debug 0;
// Merge tolerance. Is fraction of overall bounding box of initial mesh.
// Note: the write tolerance needs to be higher than this.
mergeTolerance 1E-6;
mergeTolerance 1e-6;
// ************************************************************************* //