Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

Conflicts:
	src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H
This commit is contained in:
sergio
2016-12-05 15:32:26 -08:00
219 changed files with 2413 additions and 1432 deletions

View File

@ -23,8 +23,8 @@ coupledFaces
coupledFacesSet
{
wallPatchName baffleWall;
cyclicMasterPatchName baffleCyclic_half0;
wallPatch baffleWall;
cyclicMasterPatch baffleCyclic_half0;
}
}

View File

@ -44,7 +44,7 @@ boundaryField
"region0_to_.*"
{
type compressible::turbulentTemperatureRadCoupledMixed;
neighbourFieldName T;
neighbourField T;
kappaMethod solidThermo;
QrNbr Qr;
Qr none;

View File

@ -20,7 +20,7 @@ FoamFile
pyrolysisModel thermo;
regionName panelRegion;
region panelRegion;
noPyrolysisCoeffs
{

View File

@ -11,12 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
object SurfaceFilmProperties;
object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel none;
regionName none;
region none;
active false;

View File

@ -77,7 +77,7 @@ functions
writeControl timeStep;
writeInterval 200;
log true;
patchName region0_to_panelRegion_wallPanel;
patch region0_to_panelRegion_wallPanel;
probeLocations
(
(0.15 0.0 0.01) // HF2
@ -94,7 +94,7 @@ functions
writeControl timeStep;
writeInterval 200;
log true;
patchName inlet;
patch inlet;
probeLocations
(
( 0.0 0.0 0.0 ) // HF1

View File

@ -21,7 +21,7 @@ pyrolysis
pyrolysisModel reactingOneDim;
regionName pyrolysisRegion;
region pyrolysisRegion;
reactingOneDimCoeffs
{

View File

@ -11,7 +11,7 @@ FoamFile
format ascii;
class dictionary;
location "constant";
object SurfaceFilmProperties;
object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -19,7 +19,7 @@ active true;
surfaceFilmModel thermoSingleLayer;
regionName filmRegion;
region filmRegion;
thermoSingleLayerCoeffs
{

View File

@ -21,7 +21,7 @@ pyrolysis
pyrolysisModel reactingOneDim;
regionName panelRegion;
region panelRegion;
reactingOneDimCoeffs
{

View File

@ -11,12 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
object SurfaceFilmProperties;
object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel none;
regionName none;
region none;
active false;

View File

@ -21,7 +21,7 @@ FoamFile
pyrolysisModel reactingOneDim;
regionName panelRegion;
region panelRegion;
reactingOneDimCoeffs
{

View File

@ -11,7 +11,7 @@ FoamFile
format ascii;
class dictionary;
location "constant";
object SurfaceFilmProperties;
object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -19,5 +19,5 @@ active false;
surfaceFilmModel none;
regionName none;
region none;

View File

@ -21,7 +21,7 @@ pyrolysis
pyrolysisModel none;
regionName panelRegion;
region panelRegion;
reactingOneDimCoeffs
{

View File

@ -11,12 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
object SurfaceFilmProperties;
object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel none;
regionName none;
region none;
active false;

View File

@ -21,7 +21,7 @@ pyrolysis
pyrolysisModel none;
regionName panelRegion;
region panelRegion;
reactingOneDimCoeffs
{

View File

@ -11,12 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
object SurfaceFilmProperties;
object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel none;
regionName none;
region none;
active false;

View File

@ -8,17 +8,17 @@
T
{
type compressible::thermalBaffle;
kappaMethod fluidThermo;
value uniform 300;
type compressible::thermalBaffle;
kappaMethod fluidThermo;
value uniform 300;
regionName ${baffleRegionName};
active yes;
region ${baffleRegion};
active yes;
# include "3DbaffleSolidThermo"
# include "3DbaffleSolidThermo"
// New fvMesh (region) information
# include "extrudeModel"
// New fvMesh (region) information
# include "extrudeModel"
}
// ************************************************************************* //

View File

@ -6,22 +6,22 @@
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
baffleRegionName baffle3DRegion;
baffleRegion baffle3DRegion;
masterPatchName baffle3DRegionMaster;
masterPatch baffle3DRegionMaster;
slavePatchName baffle3DRegionSlave;
slavePatch baffle3DRegionSlave;
oneD false;
oneD false;
nLayers 50;
nLayers 50;
thickness 0.02;
thickness 0.02;
Kappa 0.01;
Kappa 0.01;
Cp 15;
Cp 15;
rho 80;
rho 80;
// ************************************************************************* //

View File

@ -55,7 +55,7 @@ boundaryField
// Mode of operation: inert, condensation, vaporization,
// condensationAndEvaporation
mode condensationAndEvaporation;
specieName H2O;
specie H2O;
carrierMolWeight 28.9 ;//Air from thermophysicalProperties
L 0.1;
Tvap 273; //Minimum temperature for evaporation

View File

@ -47,6 +47,7 @@ laplacianSchemes
laplacian(rhorAUf,p_rgh) Gauss linear corrected;
laplacian(alphaEff,h) Gauss linear corrected;
laplacian(((rho*nut)+thermo:mu),H2O) Gauss linear corrected;
laplacian(DH2O,H2O) Gauss linear corrected;
}
interpolationSchemes

View File

@ -23,7 +23,7 @@ airToporous
constantHeatTransferCoeffs
{
interpolationMethod cellVolumeWeight;
nbrRegionName porous;
nbrRegion porous;
master false;
nbrModel porousToair;
@ -40,7 +40,7 @@ porosityBlockage
interRegionExplicitPorositySourceCoeffs
{
interpolationMethod cellVolumeWeight;
nbrRegionName porous;
nbrRegion porous;
type DarcyForchheimer;

View File

@ -23,7 +23,7 @@ porousToair
constantHeatTransferCoeffs
{
interpolationMethod cellVolumeWeight;
nbrRegionName air;
nbrRegion air;
master true;
nbrModel airToporous;

View File

@ -49,4 +49,5 @@ adjustTimeStep yes;
maxCo 5;
// ************************************************************************* //

View File

@ -58,7 +58,7 @@ functions
fields (p U);
lifeTime 10000;
nSubCycle 5;
cloudName particleTracks;
cloud particleTracks;
seedSampleSet uniform;
uniformCoeffs
{

View File

@ -57,7 +57,7 @@ postPro1
visible yes;
tubeRadius 0.01;
colourBy field;
fieldName U;
field U;
range (0 20);
opacity 1;
scalarBar
@ -97,7 +97,7 @@ postPro1
visible yes;
featureEdges no;
colourBy field;
fieldName U;
field U;
range (0 30);
opacity 1;
scalarBar

View File

@ -32,7 +32,7 @@ streamLines
nSubCycle 5;
// Cloud name to use
cloudName particleTracks;
cloud particleTracks;
// Seeding method.
seedSampleSet uniform; //cloud; //triSurfaceMeshPointSet;

View File

@ -4,7 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Alternative decomposeParDict name:
decompDict="-decomposeParDict system/decomposeParDict.6"
## Standard decomposeParDict name:
# unset decompDict
# copy motorbike surface from resources directory
\cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
@ -13,6 +16,14 @@ runApplication surfaceFeatureExtract
runApplication blockMesh
runApplication decomposePar $decompDict
# Using distributedTriSurfaceMesh?
if foamDictionary -entry geometry -value system/snappyHexMeshDict | \
grep -q distributedTriSurfaceMesh
then
runParallel $decompDict surfaceRedistributePar motorBike.obj independent
fi
runParallel $decompDict snappyHexMesh -overwrite
#- For non-parallel running: - set the initial fields

View File

@ -22,13 +22,13 @@ method hierarchical;
simpleCoeffs
{
n (4 1 1);
n (6 1 1);
delta 0.001;
}
hierarchicalCoeffs
{
n (2 2 1);
n (3 2 1);
delta 0.001;
order xyz;
}

View File

@ -39,7 +39,7 @@ streamLines
// Cloud name to use
cloudName particleTracks;
cloud particleTracks;
// Seeding method.
seedSampleSet uniform; //cloud; //triSurfaceMeshPointSet;

View File

@ -18,7 +18,7 @@ near
writeControl writeTime;
// Calculate every
executeControl writeTime;
executeControl writeTime;
// Fields to be sampled. Per field original name and mapped field to
// create.
@ -29,10 +29,10 @@ near
);
// Patches/groups to sample (regular expressions)
patches (motorBikeGroup);
patches (motorBikeGroup);
// Distance to sample
distance 0.001;
distance 0.001;
}
// Use UNear to track along wall
@ -48,7 +48,7 @@ wallBoundedStreamLines
setFormat vtk; //gnuplot; //xmgr; //raw; //jplot;
// Velocity field to use for tracking.
U UNear;
U UNear;
// Interpolation method. Default is cellPoint.
// interpolationScheme pointMVC;
@ -65,7 +65,7 @@ wallBoundedStreamLines
lifeTime 100;
// Cloud name to use
cloudName wallBoundedParticleTracks;
cloud wallBoundedParticleTracks;
// Seeding method.
seedSampleSet patchSeed; //cloud; //triSurfaceMeshPointSet;

View File

@ -64,16 +64,16 @@ functions
trackForward true;
// Names of fields to sample. Should contain above velocity field!
fields (p k U);
fields (p k U);
// Steps particles can travel before being removed
lifeTime 10000;
// Number of steps per cell (estimate). Set to 1 to disable subcycling.
nSubCycle 5;
nSubCycle 5;
// Cloud name to use
cloudName particleTracks;
cloud particleTracks;
// Seeding method.
seedSampleSet uniform; //cloud; //triSurfaceMeshPointSet;

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
continuousPhaseName air;
continuousPhase air;
rho.air 1.2;

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
continuousPhaseName air;
continuousPhase air;
rho.air 1.2;

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
continuousPhaseName air;
continuousPhase air;
rho.air 1.2;

View File

@ -72,7 +72,7 @@ subModels
massTotal 40;
SOI 1;
parcelBasisType mass;
patchName inlet;
patch inlet;
duration 4;
parcelsPerSecond 100644;
U0 (-10 0 0);

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
continuousPhaseName air;
continuousPhase air;
rho.air 1.2;

View File

@ -80,7 +80,7 @@ subModels
{
type patchInjection;
parcelBasisType fixed;
patchName lowerInlet;
patch lowerInlet;
U0 (18.7939 6.8404 0);
nParticle 1;
parcelsPerSecond 1390885;
@ -105,7 +105,7 @@ subModels
{
type patchInjection;
parcelBasisType fixed;
patchName upperInlet;
patch upperInlet;
U0 (18.7939 -6.8404 0);
nParticle 1;
parcelsPerSecond 1390885;

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
continuousPhaseName air;
continuousPhase air;
rho.air 1.2;

View File

@ -11,13 +11,13 @@ FoamFile
format ascii;
class dictionary;
location "constant";
object SurfaceFilmProperties;
object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel thermoSingleLayer;
regionName wallFilmRegion;
region wallFilmRegion;
active true;

View File

@ -11,13 +11,13 @@ FoamFile
format ascii;
class dictionary;
location "constant";
object SurfaceFilmProperties;
object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel thermoSingleLayer;
regionName wallFilmRegion;
region wallFilmRegion;
active true;
@ -108,7 +108,7 @@ thermoSingleLayerCoeffs
drippingInjectionCoeffs
{
cloudName reactingCloud1;
cloud reactingCloud1;
deltaStable 0;
particlesPerParcel 100.0;

View File

@ -11,13 +11,13 @@ FoamFile
format ascii;
class dictionary;
location "constant";
object SurfaceFilmProperties;
object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel kinematicSingleLayer;
regionName wallFilmRegion;
region wallFilmRegion;
active true;

View File

@ -11,13 +11,13 @@ FoamFile
format ascii;
class dictionary;
location "constant";
object SurfaceFilmProperties;
object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel thermoSingleLayer;
regionName wallFilmRegion;
region wallFilmRegion;
active true;

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
cloudName reactingCloud1;
cloud reactingCloud1;
sampleFrequency 1;

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
cloudName reactingCloud1;
cloud reactingCloud1;
sampleFrequency 1;

View File

@ -80,7 +80,7 @@ subModels
SOI 0.01;
massTotal 8;
parcelBasisType mass;
patchName inletCentral;
patch inletCentral;
duration 10000;
parcelsPerSecond 1e5;
U0 (40 0 0);

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
cloudName reactingCloud1Tracks;
cloud reactingCloud1Tracks;
fields
(

View File

@ -84,7 +84,7 @@ subModels
type patchInjection;
massFlowRate 0.8e-03;
parcelBasisType mass;
patchName inletCentral;
patch inletCentral;
parcelsPerSecond 100;
duration 1; // NOTE: set to 1 for steady state
U0 (0 40 0);

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
cloudName reactingCloud1Tracks;
cloud reactingCloud1Tracks;
fields
(

View File

@ -84,7 +84,7 @@ subModels
type patchInjection;
massFlowRate 0.8e-03;
parcelBasisType mass;
patchName inletCentral;
patch inletCentral;
parcelsPerSecond 100;
duration 1; // NOTE: set to 1 for steady state
U0 (0 40 0);

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
cloudName reactingCloud1;
cloud reactingCloud1;
sampleFrequency 1;

View File

@ -97,7 +97,7 @@ int main(int argc, char *argv[])
radiusFieldXY.write();
if(calcDirections)
if (calcDirections)
{
vectorIOField radialDirection

View File

@ -66,7 +66,7 @@ subModels
interface
{
C -10;
alphaName alpha.water;
alpha alpha.water;
}
}
@ -79,7 +79,7 @@ subModels
SOI 0;
parcelBasisType fixed;//mass;
nParticle 1;
patchName inlet;
patch inlet;
duration 1;
parcelsPerSecond 1e5;
U0 (0 0 0.1);

View File

@ -40,7 +40,7 @@ boundaryField
wall2
{
type copiedFixedValue;
sourceFieldName T.liquid;
sourceField T.liquid;
value uniform 368;
}
defaultFaces

View File

@ -40,7 +40,7 @@ boundaryField
wall2
{
type copiedFixedValue;
sourceFieldName T.liquid;
sourceField T.liquid;
value uniform 368;
}
defaultFaces