GIT: Resolve conflict when applying Sergio's updates to new local branch

This commit is contained in:
sergio
2016-04-29 15:51:08 -07:00
committed by Andrew Heather
parent 51ea7379d6
commit b7ee80c926
16 changed files with 243 additions and 471 deletions

View File

@ -9,31 +9,25 @@ FoamFile
{
version 2.0;
format ascii;
class volScalarField;
class dictionary;
location "constant";
object boundaryRadiationProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 0;
boundaryField
region0_to_pyrolysisRegion_coupledWall
{
region0_to_pyrolysisRegion_coupledWall
{
type boundaryRadiation;
mode solidRadiation;
}
".*"
{
type boundaryRadiation;
mode lookup;
emissivity uniform 1.0;
absorptivity uniform 1.0;
transmissivity uniform 0.0;
}
mode solidRadiation;
}
".*"
{
mode lookup;
emissivity uniform 1.0;
absorptivity uniform 1.0;
transmissivity uniform 0.0;
}
// ************************************************************************* //

View File

@ -9,30 +9,27 @@ FoamFile
{
version 2.0;
format ascii;
class volScalarField;
class dictionary;
location "constant";
object boundaryRadiationProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 0;
boundaryField
".*"
{
".*"
{
type boundaryRadiation;
mode lookup;
emissivity uniform 1.0;
value uniform 0;
}
"(region0_to.*)"
{
type boundaryRadiation;
mode solidRadiation;
value uniform 0;
}
type boundaryRadiation;
mode lookup;
emissivity uniform 1.0;
value uniform 0;
}
"(region0_to.*)"
{
type boundaryRadiation;
mode solidRadiation;
value uniform 0;
}
// ************************************************************************* //

View File

@ -9,29 +9,39 @@ FoamFile
{
version 2.0;
format ascii;
class volScalarField;
class dictionary;
location "constant";
object boundaryRadiationProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 0;
boundaryField
base
{
".*"
{
type boundaryRadiation;
mode lookup;
emissivity uniform 1.0;
value uniform 0;
}
frontAndBack
{
type empty;
}
mode lookup;
emissivity uniform 1.0;
value uniform 0;
}
outlet
{
mode lookup;
emissivity uniform 1.0;
value uniform 0;
}
sides
{
mode lookup;
emissivity uniform 1.0;
value uniform 0;
}
inlet
{
mode lookup;
emissivity uniform 1.0;
value uniform 0;
}
// ************************************************************************* //

View File

@ -9,7 +9,7 @@ application=`getApplication`
runApplication blockMesh
runApplication topoSet
runApplication createPatch -overwrite
runApplication decomposePar -force -constant
runApplication decomposePar -force
# Run
runParallel $application

View File

@ -9,25 +9,18 @@ FoamFile
{
version 2.0;
format ascii;
class volScalarField;
class dictionary;
location "constant";
object boundaryRadiationProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 0;
boundaryField
".*"
{
".*"
{
type boundaryRadiation;
mode lookup;
emissivity uniform 1.0;
absorptivity uniform 0.0;
value uniform 0.0;
}
mode lookup;
emissivity uniform 1.0;
absorptivity uniform 0.0;
}
// ************************************************************************* //

View File

@ -9,52 +9,18 @@ FoamFile
{
version 2.0;
format ascii;
class volScalarField;
class dictionary;
location "constant";
object boundaryRadiationProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 0;
boundaryField
".*"
{
box
{
type boundaryRadiation;
mode lookup;
emissivity uniform 1.0;
absorptivity uniform 1.0;
value uniform 0;
}
floor
{
type boundaryRadiation;
mode lookup;
emissivity uniform 1.0;
absorptivity uniform 1.0;
value uniform 0;
}
ceiling
{
type boundaryRadiation;
mode lookup;
emissivity uniform 1.0;
absorptivity uniform 1.0;
value uniform 0;
}
fixedWalls
{
type boundaryRadiation;
mode lookup;
emissivity uniform 1.0;
absorptivity uniform 1.0;
value uniform 0;
}
mode lookup;
emissivity uniform 1.0;
absorptivity uniform 1.0;
}
// ************************************************************************* //

View File

@ -9,25 +9,18 @@ FoamFile
{
version 2.0;
format ascii;
class volScalarField;
class dictionary;
location "constant";
object boundaryRadiationProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 0;
boundaryField
".*"
{
".*"
{
type boundaryRadiation;
mode lookup;
emissivity uniform 1.0;
absorptivity uniform 1.0;
value uniform 0.0;
}
mode lookup;
emissivity uniform 1.0;
absorptivity uniform 1.0;
}
// ************************************************************************* //

View File

@ -9,42 +9,30 @@ FoamFile
{
version 2.0;
format ascii;
class volScalarField;
class dictionary;
location "constant";
object boundaryRadiationProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 0;
boundaryField
".*"
{
".*"
{
type boundaryRadiation;
mode lookup;
emissivity uniform 1.0;
absorptivity uniform 0.0;
transmissivity uniform 1.0;
mode lookup;
emissivity uniform 1.0;
absorptivity uniform 0.0;
transmissivity uniform 1.0;
}
value uniform 0.0;
}
air_to_solid
{
type boundaryRadiation;
mode solidRadiation;
value uniform 0;
}
air_to_floor
{
type boundaryRadiation;
mode solidRadiation;
value uniform 0;
}
air_to_solid
{
mode solidRadiation;
value uniform 0;
}
air_to_floor
{
mode solidRadiation;
value uniform 0;
}
// ************************************************************************* //

View File

@ -9,32 +9,25 @@ FoamFile
{
version 2.0;
format ascii;
class volScalarField;
class dictionary;
location "constant";
object boundaryRadiationProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 0;
boundaryField
".*"
{
".*"
{
type boundaryRadiation;
mode lookup;
emissivity uniform 1.0;
absorptivity uniform 1.0;
value uniform 0; // Dummy value
}
"bottomAir_to_.*"
{
type boundaryRadiation;
mode solidRadiation;
value uniform 0; // Dummy value
}
mode lookup;
emissivity uniform 1.0;
absorptivity uniform 1.0;
}
"bottomAir_to_.*"
{
type boundaryRadiation;
mode solidRadiation;
}
// ************************************************************************* //

View File

@ -9,31 +9,21 @@ FoamFile
{
version 2.0;
format ascii;
class volScalarField;
class dictionary;
location "constant";
object boundaryRadiationProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 0;
boundaryField
".*"
{
".*"
{
type boundaryRadiation;
mode lookup;
emissivity uniform 1.0;
value uniform 0; // Dummy value
}
mode lookup;
emissivity uniform 1.0;
}
"topAir_to_.*"
{
type boundaryRadiation;
mode solidRadiation;
value uniform 0; // Dummy value
}
"topAir_to_.*"
{
mode solidRadiation;
}
// ************************************************************************* //

View File

@ -9,33 +9,18 @@ FoamFile
{
version 2.0;
format ascii;
class volScalarField;
class dictionary;
location "constant";
object boundaryRadiationProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 0;
boundaryField
".*"
{
".*"
{
type boundaryRadiation;
mode lookup;
emissivity uniform 1.0;
absorptivity uniform 0.0;
value uniform 0.0;
}
symmetry
{
type symmetryPlane;
}
frontAndBack
{
type empty;
}
mode lookup;
emissivity uniform 1.0;
absorptivity uniform 0.0;
}
// ************************************************************************* //