mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev
This commit is contained in:
@ -16,7 +16,7 @@ FoamFile
|
||||
|
||||
convertToMeters 1;
|
||||
|
||||
vertices
|
||||
vertices
|
||||
(
|
||||
(-0.1 -0.04 -0.05)
|
||||
( 0.1 -0.04 -0.05)
|
||||
@ -28,18 +28,18 @@ vertices
|
||||
(-0.1 0.04 0.05)
|
||||
);
|
||||
|
||||
blocks
|
||||
blocks
|
||||
(
|
||||
hex (0 1 2 3 4 5 6 7) (30 10 10) simpleGrading (1 1 1)
|
||||
);
|
||||
|
||||
edges
|
||||
edges
|
||||
(
|
||||
);
|
||||
|
||||
patches
|
||||
patches
|
||||
(
|
||||
wall maxY
|
||||
wall maxY
|
||||
(
|
||||
(3 7 6 2)
|
||||
)
|
||||
@ -65,7 +65,7 @@ patches
|
||||
)
|
||||
);
|
||||
|
||||
mergePatchPairs
|
||||
mergePatchPairs
|
||||
(
|
||||
);
|
||||
|
||||
|
||||
@ -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: http://www.OpenFOAM.org |
|
||||
| \\/ M anipulation | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
@ -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 | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
@ -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: http://www.OpenFOAM.org |
|
||||
| \\/ M anipulation | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
@ -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: http://www.OpenFOAM.org |
|
||||
| \\/ M anipulation | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
@ -18,30 +18,13 @@ dictionaryReplacement
|
||||
{
|
||||
boundary
|
||||
{
|
||||
".*"
|
||||
minX
|
||||
{
|
||||
type wall;
|
||||
}
|
||||
bottomAir_to_leftSolid
|
||||
maxX
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion leftSolid;
|
||||
samplePatch leftSolid_to_bottomAir;
|
||||
}
|
||||
bottomAir_to_rightSolid
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion rightSolid;
|
||||
samplePatch rightSolid_to_bottomAir;
|
||||
}
|
||||
bottomAir_to_heater
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion heater;
|
||||
samplePatch heater_to_bottomAir;
|
||||
type wall;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*--------------------------------*- C++ -*----------------------------------*\
|
||||
| ========= | |
|
||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||
| \\ / O peration | Version: 1.6 |
|
||||
| \\ / O peration | Version: 1.6 |
|
||||
| \\ / A nd | Web: www.OpenFOAM.org |
|
||||
| \\/ M anipulation | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
@ -47,6 +47,8 @@ runTimeModifiable yes;
|
||||
|
||||
maxCo 0.3;
|
||||
|
||||
maxDi 10.0;
|
||||
|
||||
adjustTimeStep yes;
|
||||
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*--------------------------------*- C++ -*----------------------------------*\
|
||||
| ========= | |
|
||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||
| \\ / O peration | Version: 1.6 |
|
||||
| \\ / O peration | Version: 1.6 |
|
||||
| \\ / A nd | Web: http://www.OpenFOAM.org |
|
||||
| \\/ M anipulation | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
@ -18,37 +18,17 @@ dictionaryReplacement
|
||||
{
|
||||
boundary
|
||||
{
|
||||
".*"
|
||||
minY
|
||||
{
|
||||
type patch;
|
||||
}
|
||||
heater_to_bottomAir
|
||||
minZ
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion bottomAir;
|
||||
samplePatch bottomAir_to_heater;
|
||||
type patch;
|
||||
}
|
||||
heater_to_leftSolid
|
||||
maxZ
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion leftSolid;
|
||||
samplePatch leftSolid_to_heater;
|
||||
}
|
||||
heater_to_rightSolid
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion rightSolid;
|
||||
samplePatch rightSolid_to_heater;
|
||||
}
|
||||
heater_to_topAir
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion topAir;
|
||||
samplePatch topAir_to_heater;
|
||||
type patch;
|
||||
}
|
||||
}
|
||||
|
||||
@ -87,6 +67,7 @@ dictionaryReplacement
|
||||
".*"
|
||||
{
|
||||
type calculated;
|
||||
value uniform 8000;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -100,6 +81,7 @@ dictionaryReplacement
|
||||
".*"
|
||||
{
|
||||
type zeroGradient;
|
||||
value uniform 80;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -113,6 +95,7 @@ dictionaryReplacement
|
||||
".*"
|
||||
{
|
||||
type zeroGradient;
|
||||
value uniform 450;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -18,30 +18,13 @@ dictionaryReplacement
|
||||
{
|
||||
boundary
|
||||
{
|
||||
".*"
|
||||
minZ
|
||||
{
|
||||
type patch;
|
||||
}
|
||||
leftSolid_to_bottomAir
|
||||
maxZ
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion bottomAir;
|
||||
samplePatch bottomAir_to_leftSolid;
|
||||
}
|
||||
leftSolid_to_heater
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion heater;
|
||||
samplePatch heater_to_leftSolid;;
|
||||
}
|
||||
leftSolid_to_topAir
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion topAir;
|
||||
samplePatch topAir_to_leftSolid;;
|
||||
type patch;
|
||||
}
|
||||
}
|
||||
|
||||
@ -75,6 +58,7 @@ dictionaryReplacement
|
||||
".*"
|
||||
{
|
||||
type calculated;
|
||||
value uniform 8000;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -88,6 +72,7 @@ dictionaryReplacement
|
||||
".*"
|
||||
{
|
||||
type zeroGradient;
|
||||
value uniform 80;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -101,6 +86,7 @@ dictionaryReplacement
|
||||
".*"
|
||||
{
|
||||
type zeroGradient;
|
||||
value uniform 450;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -18,30 +18,13 @@ dictionaryReplacement
|
||||
{
|
||||
boundary
|
||||
{
|
||||
".*"
|
||||
minZ
|
||||
{
|
||||
type patch;
|
||||
}
|
||||
rightSolid_to_heater
|
||||
maxZ
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion heater;
|
||||
samplePatch heater_to_rightSolid;
|
||||
}
|
||||
rightSolid_to_bottomAir
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion bottomAir;
|
||||
samplePatch bottomAir_to_rightSolid;
|
||||
}
|
||||
rightSolid_to_topAir
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion topAir;
|
||||
samplePatch topAir_to_rightSolid;
|
||||
type patch;
|
||||
}
|
||||
}
|
||||
|
||||
@ -75,6 +58,7 @@ dictionaryReplacement
|
||||
".*"
|
||||
{
|
||||
type calculated;
|
||||
value uniform 8000;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -88,6 +72,7 @@ dictionaryReplacement
|
||||
".*"
|
||||
{
|
||||
type zeroGradient;
|
||||
value uniform 80;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -101,6 +86,7 @@ dictionaryReplacement
|
||||
".*"
|
||||
{
|
||||
type zeroGradient;
|
||||
value uniform 450;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,43 +16,6 @@ FoamFile
|
||||
|
||||
dictionaryReplacement
|
||||
{
|
||||
boundary
|
||||
{
|
||||
".*"
|
||||
{
|
||||
type wall;
|
||||
}
|
||||
minX
|
||||
{
|
||||
type patch;
|
||||
}
|
||||
maxX
|
||||
{
|
||||
type patch;
|
||||
}
|
||||
topAir_to_leftSolid
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion leftSolid;
|
||||
samplePatch leftSolid_to_topAir;
|
||||
}
|
||||
topAir_to_heater
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion heater;
|
||||
samplePatch heater_to_topAir;
|
||||
}
|
||||
topAir_to_rightSolid
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion rightSolid;
|
||||
samplePatch rightSolid_to_topAir;
|
||||
}
|
||||
}
|
||||
|
||||
U
|
||||
{
|
||||
internalField uniform (0.01 0 0);
|
||||
|
||||
@ -16,31 +16,6 @@ FoamFile
|
||||
|
||||
dictionaryReplacement
|
||||
{
|
||||
boundary
|
||||
{
|
||||
bottomAir_to_leftSolid
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion leftSolid;
|
||||
samplePatch leftSolid_to_bottomAir;
|
||||
}
|
||||
bottomAir_to_rightSolid
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion rightSolid;
|
||||
samplePatch rightSolid_to_bottomAir;
|
||||
}
|
||||
bottomAir_to_heater
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion heater;
|
||||
samplePatch heater_to_bottomAir;
|
||||
}
|
||||
}
|
||||
|
||||
U
|
||||
{
|
||||
internalField uniform (0 0 0);
|
||||
|
||||
@ -16,38 +16,6 @@ FoamFile
|
||||
|
||||
dictionaryReplacement
|
||||
{
|
||||
boundary
|
||||
{
|
||||
heater_to_bottomAir
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion bottomAir;
|
||||
samplePatch bottomAir_to_heater;
|
||||
}
|
||||
heater_to_leftSolid
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion leftSolid;
|
||||
samplePatch leftSolid_to_heater;
|
||||
}
|
||||
heater_to_rightSolid
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion rightSolid;
|
||||
samplePatch rightSolid_to_heater;
|
||||
}
|
||||
heater_to_topAir
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion topAir;
|
||||
samplePatch topAir_to_heater;
|
||||
}
|
||||
}
|
||||
|
||||
T
|
||||
{
|
||||
internalField uniform 300;
|
||||
|
||||
@ -16,31 +16,6 @@ FoamFile
|
||||
|
||||
dictionaryReplacement
|
||||
{
|
||||
boundary
|
||||
{
|
||||
leftSolid_to_bottomAir
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion bottomAir;
|
||||
samplePatch bottomAir_to_leftSolid;
|
||||
}
|
||||
leftSolid_to_heater
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion heater;
|
||||
samplePatch heater_to_leftSolid;;
|
||||
}
|
||||
leftSolid_to_topAir
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion topAir;
|
||||
samplePatch topAir_to_leftSolid;;
|
||||
}
|
||||
}
|
||||
|
||||
T
|
||||
{
|
||||
internalField uniform 300;
|
||||
|
||||
@ -16,31 +16,6 @@ FoamFile
|
||||
|
||||
dictionaryReplacement
|
||||
{
|
||||
boundary
|
||||
{
|
||||
rightSolid_to_heater
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion heater;
|
||||
samplePatch heater_to_rightSolid;
|
||||
}
|
||||
rightSolid_to_bottomAir
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion bottomAir;
|
||||
samplePatch bottomAir_to_rightSolid;
|
||||
}
|
||||
rightSolid_to_topAir
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion topAir;
|
||||
samplePatch topAir_to_rightSolid;
|
||||
}
|
||||
}
|
||||
|
||||
T
|
||||
{
|
||||
internalField uniform 300;
|
||||
|
||||
@ -16,31 +16,6 @@ FoamFile
|
||||
|
||||
dictionaryReplacement
|
||||
{
|
||||
boundary
|
||||
{
|
||||
topAir_to_leftSolid
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion leftSolid;
|
||||
samplePatch leftSolid_to_topAir;
|
||||
}
|
||||
topAir_to_heater
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion heater;
|
||||
samplePatch heater_to_topAir;
|
||||
}
|
||||
topAir_to_rightSolid
|
||||
{
|
||||
offset ( 0 0 0 );
|
||||
sampleMode nearestPatchFace;
|
||||
sampleRegion rightSolid;
|
||||
samplePatch rightSolid_to_topAir;
|
||||
}
|
||||
}
|
||||
|
||||
U
|
||||
{
|
||||
internalField uniform ( 0.01 0 0 );
|
||||
|
||||
Reference in New Issue
Block a user