Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

This commit is contained in:
andy
2013-01-04 11:16:27 +00:00
307 changed files with 10257 additions and 3221 deletions

View File

@ -21,7 +21,7 @@ active no;
regionName none;
thermoBaffle2DCoeffs
thermoBaffleCoeffs
{
}

View File

@ -22,7 +22,7 @@ dictionaryReplacement
{
"region0_to.*"
{
type compressible::temperatureThermoBaffle;
type compressible::thermoBaffle;
neighbourFieldName T;
kappa solidThermo;
kappaName none;

View File

@ -88,7 +88,7 @@ dictionaryReplacement
{
"baffle.*"
{
type compressible::temperatureThermoBaffle1D<hConstSolidThermoPhysics>;
type compressible::thermoBaffle1D<hConstSolidThermoPhysics>;
baffleActivated yes;
thickness uniform 0.005; // thickness [m]
Qs uniform 100; // heat flux [W/m2]

View File

@ -88,7 +88,7 @@ dictionaryReplacement
{
"baffle1Wall.*"
{
type compressible::temperatureThermoBaffle1D<hConstSolidThermoPhysics>;
type compressible::thermoBaffle1D<hConstSolidThermoPhysics>;
baffleActivated yes;
thickness uniform 0.005; // thickness [m]
Qs uniform 100; // heat flux [W/m2]

View File

@ -91,7 +91,7 @@ dictionaryReplacement
"region0_to.*"
{
type compressible::temperatureThermoBaffle;
type compressible::thermoBaffle;
// Coupled BC.
neighbourFieldName T;
@ -99,11 +99,11 @@ dictionaryReplacement
kappaName none;
// Thermo baffle model
thermoBaffleModel thermoBaffle2D;
thermoBaffleModel thermoBaffle;
regionName baffleRegion;
infoOutput no;
active yes;
thermoBaffle2DCoeffs
thermoBaffleCoeffs
{
}

View File

@ -9,7 +9,7 @@ application=`getApplication`
runApplication blockMesh
runApplication topoSet
runApplication subsetMesh -overwrite -cellSet c0 -patch floatingObject
runApplication subsetMesh -overwrite c0 -patch floatingObject
cp -r 0.org 0 > /dev/null 2>&1
runApplication $application

View File

@ -20,6 +20,9 @@ internalField uniform (1 0 0);
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
inlet
{
type codedFixedValue;
@ -48,11 +51,6 @@ boundaryField
type fixedValue;
value uniform (0 0 0);
}
"side.*"
{
type cyclicAMI;
}
}
// ************************************************************************* //

View File

@ -21,6 +21,9 @@ internalField uniform 1;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
inlet
{
type turbulentMixingLengthDissipationRateInlet;
@ -39,11 +42,6 @@ boundaryField
type epsilonWallFunction;
value uniform 0;
}
"side.*"
{
type cyclicAMI;
}
}

View File

@ -21,6 +21,9 @@ internalField uniform 1;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
inlet
{
type turbulentIntensityKineticEnergyInlet;
@ -39,11 +42,6 @@ boundaryField
type kqRWallFunction;
value uniform 0;
}
"side.*"
{
type cyclicAMI;
}
}

View File

@ -20,6 +20,9 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
inlet
{
type zeroGradient;
@ -34,11 +37,6 @@ boundaryField
{
type zeroGradient;
}
"side.*"
{
type cyclicAMI;
}
}
// ************************************************************************* //

View File

@ -21,6 +21,9 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
inlet
{
type calculated;
@ -38,11 +41,6 @@ boundaryField
type nutkWallFunction;
value $internalField;
}
"side.*"
{
type cyclicAMI;
}
}

View File

@ -20,6 +20,9 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
inlet
{
type zeroGradient;
@ -35,11 +38,6 @@ boundaryField
{
type zeroGradient;
}
"side.*"
{
type cyclicAMI;
}
}
// ************************************************************************* //

View File

@ -36,4 +36,6 @@ cp -r 0.org 0
runApplication decomposePar -cellDist
runParallel $application 5
runApplication reconstructPar
# ----------------------------------------------------------------- end-of-file

View File

@ -15,6 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
libs
(
"libOpenFOAM.so"
"libincompressibleTurbulenceModel.so"
"libincompressibleRASModels.so"
);
application simpleFoam;
startFrom startTime;

View File

@ -13,7 +13,7 @@ runApplication blockMesh
runApplication topoSet
# create the obstacles - add obstacle patches to wallFilm patch
runApplication subsetMesh -cellSet c0 -patch wallFilm -overwrite
runApplication subsetMesh c0 -patch wallFilm -overwrite
# split the obstacle patches into cube[1-6]_patch[1-6]
echo "running patchifyObstacles"

View File

@ -10,7 +10,7 @@ runApplication surfaceFeatureExtract
runApplication blockMesh
runApplication topoSet -dict system/topoSetDict-background
mv log.topoSet log.topoSet.background
runApplication subsetMesh -cellSet background -patch walls -overwrite
runApplication subsetMesh background -patch walls -overwrite
runApplication cvMesh
runApplication collapseEdges -latestTime -collapseFaces

View File

@ -10,7 +10,7 @@ application=`getApplication`
runApplication blockMesh
runApplication topoSet
runApplication subsetMesh -overwrite -cellSet c0 -patch movingBlock
runApplication subsetMesh -overwrite c0 -patch movingBlock
cp -r 0.org 0 > /dev/null 2>&1
runApplication $application
./extractData log.$application

View File

@ -8,7 +8,7 @@ cp -r 0.org 0 > /dev/null 2>&1
runApplication blockMesh
#runApplication setSet -batch createObstacle.setSet
runApplication topoSet
runApplication subsetMesh -overwrite -cellSet c0 -patch walls
runApplication subsetMesh -overwrite c0 -patch walls
runApplication setFields
runApplication `getApplication`

View File

@ -9,7 +9,7 @@ application=`getApplication`
runApplication blockMesh
runApplication topoSet
runApplication subsetMesh -overwrite -cellSet c0 -patch floatingObject
runApplication subsetMesh -overwrite c0 -patch floatingObject
cp -r 0.org 0 > /dev/null 2>&1
runApplication setFields
runApplication $application