songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
881b3dafa2
openfoam/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system
History
Mark Olesen 881b3dafa2 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
2010-12-21 10:19:53 +01:00
..
bottomAir chtMultiRegionFoam: updated thermodynamics 2010-11-02 18:57:39 +00:00
heater Merge remote branch 'OpenCFD/master' into olesenm 2010-12-21 10:19:53 +01:00
leftSolid Merge remote branch 'OpenCFD/master' into olesenm 2010-12-21 10:19:53 +01:00
rightSolid Merge remote branch 'OpenCFD/master' into olesenm 2010-12-21 10:19:53 +01:00
topAir chtMultiRegionFoam: updated thermodynamics 2010-11-02 18:57:39 +00:00
controlDict ENH: new basicSolidThermo, solid -> pointSolid and solidMixture -> 2010-12-08 16:20:43 +00:00
decomposeParDict Corrected headers. 2010-06-23 16:54:54 +01:00
fvSchemes Corrected headers. 2010-06-23 16:54:54 +01:00
fvSolution Corrected headers. 2010-06-23 16:54:54 +01:00
README solving for pd; new parallel b.c. 2009-06-02 14:59:07 +01:00

README 

fvSolution is used for outer correctors specification.
fvSchemes is only so that pre-processing activities can proceed