Commit graph

6 commits

Author SHA1 Message Date
Hrvoje Jasak
f3441a1a31 Merge branch 'macMaverickPort' into nextRelease
Conflicts:
	applications/solvers/solidMechanics/solidModels/Make/files
	applications/solvers/solidMechanics/solidModels/contactModel/contactPatchPair.C
	applications/solvers/solidMechanics/solidModels/contactModel/contactPatchPairCorrect.C
	applications/solvers/solidMechanics/solidModels/contactModel/contactProblem.C
	applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedDisplacementZeroShear/fixedDisplacementZeroShearFvPatchVectorField.C
	src/Allwmake
	src/solidModels/fvPatchFields/fixedDisplacementZeroShear/fixedDisplacementZeroShearFvPatchVectorField.H
	src/solidModels/fvPatchFields/solidTraction/solidTractionFvPatchVectorField.C
	src/solidModels/fvPatchFields/solidTraction/solidTractionFvPatchVectorField.H
	src/solidModels/fvPatchFields/solidTractionFree/solidTractionFreeFvPatchVectorField.C
	src/solidModels/fvPatchFields/solidTractionFree/solidTractionFreeFvPatchVectorField.H
	src/solidModels/fvPatchFields/timeVaryingSolidTraction/timeVaryingSolidTractionFvPatchVectorField.C
2013-11-04 09:57:50 +00:00
Hrvoje Jasak
d2a5f2f1a3 Mac OS X Maverick port 2013-11-03 20:28:05 +00:00
Philip Cardiff
87cb5a32fa rearranged solidMechanics and added symmTensor4thOrder and diagTensor fields 2013-10-16 10:47:48 +01:00
Henrik Rusche
3241862b6c Remove trailing whitespace systematically 2013-07-18 10:15:54 +02:00
Hrvoje Jasak
814982fb2b Merging surface tracking, 3. Zeljko Tukovic 2010-11-25 13:16:12 +00:00
Hrvoje Jasak
7da593c90c Re-merge of updates: new surface tracking, Zeljko Tukovic 2010-11-24 23:00:58 +00:00