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

This commit is contained in:
andy
2013-11-12 16:40:27 +00:00
16 changed files with 1047 additions and 479 deletions

View File

@ -9,7 +9,6 @@
T
{
type compressible::thermalBaffle1D<hConstSolidThermoPhysics>;
samplePatch baffle1DWall_slave;
thickness uniform 0.005; // thickness [m]
Qs uniform 100; // heat flux [W/m2]

View File

@ -29,35 +29,13 @@ baffles
surface triSurfaceMesh;
name baffle1D.stl;
patches
patchPairs
{
master
type wall;
patchFields
{
//- Master side patch
name baffle1DWall_master;
type wall;
inGroups (baffleWallGroup);
patchFields
{
#include "./0/include/wallBafflePatches"
#include "./0/include/1DBaffle/1DTemperatureMasterBafflePatches"
}
}
slave
{
//- Slave side patch
name baffle1DWall_slave;
type wall;
inGroups (baffleWallGroup);
patchFields
{
#include "./0/include/wallBafflePatches"
#include "./0/include/1DBaffle/1DTemperatureSlaveBafflePatches"
}
#include "./0/include/wallBafflePatches"
#include "./0/include/1DBaffle/1DTemperatureMasterBafflePatches"
}
}
}
@ -78,10 +56,7 @@ baffles
name ${masterPatchName};
type mappedWall;
type interRegionMappedWallGenerator;
inGroups (baffleWallGroup);
inGroups (baffleWallGroup);
sampleMode nearestPatchFace;
sampleRegion ${baffleRegionName};