mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-12-28 03:37:59 +00:00
Merge remote branch 'OpenCFD/master' into olesenm
Conflicts: applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh.C applications/utilities/surface/surfaceCheck/surfaceCheck.C src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C NOTE: also needed to strip trailing space/lines in various files
This commit is contained in:
@ -0,0 +1,30 @@
|
||||
/*--------------------------------*- C++ -*----------------------------------*\
|
||||
| ========= | |
|
||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||
| \\ / O peration | Version: dev |
|
||||
| \\ / A nd | Web: www.OpenFOAM.com |
|
||||
| \\/ M anipulation | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
FoamFile
|
||||
{
|
||||
version 2.0;
|
||||
format ascii;
|
||||
class volScalarField;
|
||||
object Ychar;
|
||||
}
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
dimensions [0 0 0 0 0 0 0];
|
||||
|
||||
internalField uniform 0.5;
|
||||
|
||||
boundaryField
|
||||
{
|
||||
".*"
|
||||
{
|
||||
type calculated;
|
||||
value uniform 0.5;
|
||||
}
|
||||
}
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,30 @@
|
||||
/*--------------------------------*- C++ -*----------------------------------*\
|
||||
| ========= | |
|
||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||
| \\ / O peration | Version: dev |
|
||||
| \\ / A nd | Web: www.OpenFOAM.com |
|
||||
| \\/ M anipulation | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
FoamFile
|
||||
{
|
||||
version 2.0;
|
||||
format ascii;
|
||||
class volScalarField;
|
||||
object Ypmma;
|
||||
}
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
dimensions [0 0 0 0 0 0 0];
|
||||
|
||||
internalField uniform 0.5;
|
||||
|
||||
boundaryField
|
||||
{
|
||||
".*"
|
||||
{
|
||||
type calculated;
|
||||
value uniform 0.5;
|
||||
}
|
||||
}
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -12,14 +12,14 @@ runApplication splitMeshRegions -cellZones -overwrite
|
||||
# remove fluid fields from solid regions (important for post-processing)
|
||||
for i in heater leftSolid rightSolid
|
||||
do
|
||||
rm -f 0*/$i/{mut,alphat,epsilon,k,p,U}
|
||||
rm -f 0*/$i/{mut,alphat,epsilon,k,p,U,p_rgh}
|
||||
done
|
||||
|
||||
## remove solid fields from fluid regions (important for post-processing)
|
||||
#for i in bottomAir topAir
|
||||
#do
|
||||
# rm -f 0*/$i/{cp,K,rho}
|
||||
#done
|
||||
for i in bottomAir topAir
|
||||
do
|
||||
rm -f 0*/$i/{Ypmma,Ychar}
|
||||
done
|
||||
|
||||
for i in bottomAir topAir heater leftSolid rightSolid
|
||||
do
|
||||
|
||||
@ -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.com |
|
||||
| \\/ M anipulation | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
@ -15,48 +15,60 @@ FoamFile
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
thermoType constSolidThermo;
|
||||
//thermoType interpolatedSolidThermo;
|
||||
//thermoType directionalSolidThermo;
|
||||
//thermoType isotropicKSolidThermo;
|
||||
//thermoType directionalKSolidThermo;
|
||||
//thermoType solidMixtureThermo<multiComponentSolidMixture<exponentialSolidTransport<constSolidRad<exponentialSolidThermo<constRho>>>>>;
|
||||
|
||||
|
||||
constSolidThermoCoeffs
|
||||
{
|
||||
//- constant properties
|
||||
|
||||
//- thermo properties
|
||||
rho rho [1 -3 0 0 0 0 0] 8000;
|
||||
cp cp [0 2 -2 -1 0 0 0] 450;
|
||||
Cp Cp [0 2 -2 -1 0 0 0] 450;
|
||||
K K [1 1 -3 -1 0 0 0] 80;
|
||||
|
||||
// N/A
|
||||
Hf Hf [0 2 -2 0 0 0 0] 1;
|
||||
//- radiative properties
|
||||
kappa kappa [0 -1 0 0 0 0 0] 0;
|
||||
sigmaS sigmaS [0 -1 0 0 0 0 0] 0;
|
||||
emissivity emissivity [0 0 0 0 0 0 0] 1;
|
||||
|
||||
//- chemical properties
|
||||
Hf Hf [0 2 -2 0 0 0 0] 1;
|
||||
}
|
||||
|
||||
|
||||
interpolatedSolidThermoCoeffs
|
||||
isotropicKSolidThermoCoeffs
|
||||
{
|
||||
//- interpolated properties
|
||||
|
||||
//- thermo properties
|
||||
TValues (100 1000);
|
||||
rhoValues (1700 1700);
|
||||
rhoValues (1000 1700);
|
||||
cpValues (1700 1700);
|
||||
KValues (80 40);
|
||||
HfValues (1 1);
|
||||
|
||||
|
||||
//- radiative properties
|
||||
emissivityValues (1 1);
|
||||
kappaValues (0 0);
|
||||
sigmaSValues (0 0);
|
||||
|
||||
//- chemical properties
|
||||
HfValues (1 1);
|
||||
|
||||
}
|
||||
|
||||
|
||||
directionalSolidThermoCoeffs
|
||||
directionalKSolidThermoCoeffs
|
||||
{
|
||||
//- does interpolation and directional K in coordinate system.
|
||||
// Specify multiple values, one for each temperature. Properties are
|
||||
// interpolated according to the local temperature.
|
||||
|
||||
|
||||
//- thermo properties
|
||||
TValues (100 1000);
|
||||
rhoValues (1700 1700);
|
||||
cpValues (1700 1700);
|
||||
|
||||
KValues ((40 40 40) (40 40 40));
|
||||
KValues ((10 10 10) (40 40 40));
|
||||
|
||||
coordinateSystem
|
||||
{
|
||||
@ -65,12 +77,76 @@ directionalSolidThermoCoeffs
|
||||
{
|
||||
type axes;
|
||||
e1 (1 0 0);
|
||||
e3 (-3.1807824E-6 -0.99813473 0.0610505);
|
||||
e3 (-3.1807824e-6 -0.99813473 0.0610505);
|
||||
}
|
||||
}
|
||||
|
||||
//- chemical properties
|
||||
HfValues (1 1);
|
||||
|
||||
//- radiative properties
|
||||
emissivityValues (1 1);
|
||||
kappaValues (1 1);
|
||||
sigmaSValues (1 1);
|
||||
}
|
||||
|
||||
solidComponents
|
||||
(
|
||||
pmma char
|
||||
);
|
||||
|
||||
pmmaCoeffs
|
||||
{
|
||||
transportProperties
|
||||
{
|
||||
K0 0.152;
|
||||
n0 1.3;
|
||||
Tref 300; //K0*pow(T/Tref_, n0))
|
||||
}
|
||||
radiativeProperties
|
||||
{
|
||||
sigmaS 0.0;
|
||||
kappa 0.0;
|
||||
emissivity 0.1;
|
||||
}
|
||||
thermoProperties
|
||||
{
|
||||
Hf 0;
|
||||
C0 1462; // Cp = C0*(T/Tref)^n0
|
||||
Tref 300;
|
||||
n0 1.31;
|
||||
}
|
||||
densityProperties
|
||||
{
|
||||
rho 1114.0;
|
||||
}
|
||||
}
|
||||
|
||||
charCoeffs
|
||||
{
|
||||
transportProperties
|
||||
{
|
||||
K0 0.4;
|
||||
n0 1.3;
|
||||
Tref 300; //K0*pow(T/Tref_, n0))
|
||||
}
|
||||
radiativeProperties
|
||||
{
|
||||
sigmaS 0.0;
|
||||
kappa 0.0;
|
||||
emissivity 0.0;
|
||||
}
|
||||
thermoProperties
|
||||
{
|
||||
Hf 0;
|
||||
C0 611.0;; // Cp = C0*(T/Tref)^n0
|
||||
Tref 300;
|
||||
n0 1.31;
|
||||
}
|
||||
densityProperties
|
||||
{
|
||||
rho 11.5;
|
||||
}
|
||||
}
|
||||
|
||||
// ************************************************************************* //
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
/*--------------------------------*- C++ -*----------------------------------*\
|
||||
| ========= | |
|
||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||
| \\ / O peration | Version: 1.6 |
|
||||
| \\ / A nd | Web: www.OpenFOAM.com |
|
||||
| \\/ M anipulation | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
FoamFile
|
||||
{
|
||||
version 2.0;
|
||||
format ascii;
|
||||
class dictionary;
|
||||
object solidThermophysicalProperties;
|
||||
}
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
thermoType constSolidThermo;
|
||||
//thermoType interpolatedSolidThermo;
|
||||
//thermoType directionalSolidThermo;
|
||||
|
||||
constSolidThermoCoeffs
|
||||
{
|
||||
//- constant properties
|
||||
|
||||
rho rho [1 -3 0 0 0 0 0] 8000;
|
||||
cp cp [0 2 -2 -1 0 0 0] 450;
|
||||
K K [1 1 -3 -1 0 0 0] 80;
|
||||
|
||||
// N/A
|
||||
Hf Hf [0 2 -2 0 0 0 0] 1;
|
||||
emissivity emissivity [0 0 0 0 0 0 0] 1;
|
||||
}
|
||||
|
||||
|
||||
interpolatedSolidThermoCoeffs
|
||||
{
|
||||
//- interpolated properties
|
||||
|
||||
TValues (100 1000);
|
||||
rhoValues (1700 1700);
|
||||
cpValues (1700 1700);
|
||||
KValues (80 40);
|
||||
HfValues (1 1);
|
||||
emissivityValues (1 1);
|
||||
}
|
||||
|
||||
|
||||
directionalSolidThermoCoeffs
|
||||
{
|
||||
//- does interpolation and directional K in coordinate system.
|
||||
// Specify multiple values, one for each temperature. Properties are
|
||||
// interpolated according to the local temperature.
|
||||
|
||||
|
||||
TValues (100 1000);
|
||||
rhoValues (1700 1700);
|
||||
cpValues (1700 1700);
|
||||
|
||||
KValues ((40 40 40) (40 40 40));
|
||||
|
||||
coordinateSystem
|
||||
{
|
||||
origin (-0.000062 0.000019 0.000039);
|
||||
coordinateRotation
|
||||
{
|
||||
type axes;
|
||||
e1 (1 0 0);
|
||||
e3 (-3.1807824E-6 -0.99813473 0.0610505);
|
||||
}
|
||||
}
|
||||
|
||||
HfValues (1 1);
|
||||
emissivityValues (1 1);
|
||||
}
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1 @@
|
||||
../heater/solidThermophysicalProperties
|
||||
@ -1,76 +0,0 @@
|
||||
/*--------------------------------*- C++ -*----------------------------------*\
|
||||
| ========= | |
|
||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||
| \\ / O peration | Version: 1.6 |
|
||||
| \\ / A nd | Web: www.OpenFOAM.com |
|
||||
| \\/ M anipulation | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
FoamFile
|
||||
{
|
||||
version 2.0;
|
||||
format ascii;
|
||||
class dictionary;
|
||||
object solidThermophysicalProperties;
|
||||
}
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
thermoType constSolidThermo;
|
||||
//thermoType interpolatedSolidThermo;
|
||||
//thermoType directionalSolidThermo;
|
||||
|
||||
constSolidThermoCoeffs
|
||||
{
|
||||
//- constant properties
|
||||
|
||||
rho rho [1 -3 0 0 0 0 0] 8000;
|
||||
cp cp [0 2 -2 -1 0 0 0] 450;
|
||||
K K [1 1 -3 -1 0 0 0] 80;
|
||||
|
||||
// N/A
|
||||
Hf Hf [0 2 -2 0 0 0 0] 1;
|
||||
emissivity emissivity [0 0 0 0 0 0 0] 1;
|
||||
}
|
||||
|
||||
|
||||
interpolatedSolidThermoCoeffs
|
||||
{
|
||||
//- interpolated properties
|
||||
|
||||
TValues (100 1000);
|
||||
rhoValues (1700 1700);
|
||||
cpValues (1700 1700);
|
||||
KValues (80 40);
|
||||
HfValues (1 1);
|
||||
emissivityValues (1 1);
|
||||
}
|
||||
|
||||
|
||||
directionalSolidThermoCoeffs
|
||||
{
|
||||
//- does interpolation and directional K in coordinate system.
|
||||
// Specify multiple values, one for each temperature. Properties are
|
||||
// interpolated according to the local temperature.
|
||||
|
||||
|
||||
TValues (100 1000);
|
||||
rhoValues (1700 1700);
|
||||
cpValues (1700 1700);
|
||||
|
||||
KValues ((40 40 40) (40 40 40));
|
||||
|
||||
coordinateSystem
|
||||
{
|
||||
origin (-0.000062 0.000019 0.000039);
|
||||
coordinateRotation
|
||||
{
|
||||
type axes;
|
||||
e1 (1 0 0);
|
||||
e3 (-3.1807824E-6 -0.99813473 0.0610505);
|
||||
}
|
||||
}
|
||||
|
||||
HfValues (1 1);
|
||||
emissivityValues (1 1);
|
||||
}
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1 @@
|
||||
../heater/solidThermophysicalProperties
|
||||
@ -59,6 +59,36 @@ dictionaryReplacement
|
||||
}
|
||||
}
|
||||
|
||||
Ypmma
|
||||
{
|
||||
internalField uniform 0.5;
|
||||
|
||||
|
||||
boundaryField
|
||||
{
|
||||
".*"
|
||||
{
|
||||
type calculated;
|
||||
value uniform 0.5;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Ychar
|
||||
{
|
||||
internalField uniform 0.5;
|
||||
|
||||
boundaryField
|
||||
{
|
||||
".*"
|
||||
{
|
||||
type calculated;
|
||||
value uniform 0.5;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// ************************************************************************* //
|
||||
|
||||
@ -49,6 +49,36 @@ dictionaryReplacement
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ypmma
|
||||
{
|
||||
internalField uniform 0.5;
|
||||
|
||||
|
||||
boundaryField
|
||||
{
|
||||
".*"
|
||||
{
|
||||
type calculated;
|
||||
value uniform 0.5;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Ychar
|
||||
{
|
||||
internalField uniform 0.5;
|
||||
|
||||
boundaryField
|
||||
{
|
||||
".*"
|
||||
{
|
||||
type calculated;
|
||||
value uniform 0.5;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ************************************************************************* //
|
||||
|
||||
@ -49,6 +49,36 @@ dictionaryReplacement
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ypmma
|
||||
{
|
||||
internalField uniform 0.5;
|
||||
|
||||
|
||||
boundaryField
|
||||
{
|
||||
".*"
|
||||
{
|
||||
type calculated;
|
||||
value uniform 0.5;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Ychar
|
||||
{
|
||||
internalField uniform 0.5;
|
||||
|
||||
boundaryField
|
||||
{
|
||||
".*"
|
||||
{
|
||||
type calculated;
|
||||
value uniform 0.5;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ************************************************************************* //
|
||||
|
||||
Reference in New Issue
Block a user