songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,432 Commits 104 Branches 33 Tags 325 MiB
293398cea5
Commit Graph

3 Commits

Author SHA1 Message Date
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
sergio
262e6be2f8 ENH: new basicSolidThermo, solid -> pointSolid and solidMixture -> 
pointSolidMixture. chtMultiRegion tutorials and solvers
 2010-12-08 16:20:43 +00:00
Henry
f8ae2453df chtMultiRegionFoam: updated thermodynamics 2010-11-02 18:57:39 +00:00