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,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;
}
// ************************************************************************* //