This repository has been archived on 2023-11-20. You can view files and clone it, but cannot push or open issues or pull requests.
foam-extend4.1-coherent-io/applications/solvers/surfaceTracking
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
..
bubbleInterTrackFoam Remove trailing whitespace systematically 2013-07-18 10:15:54 +02:00
freeSurface Merge branch 'macMaverickPort' into nextRelease 2013-11-04 09:57:50 +00:00
include Remove trailing whitespace systematically 2013-07-18 10:15:54 +02:00
interTrackFoam Remove trailing whitespace systematically 2013-07-18 10:15:54 +02:00
surfactantFoam Merge remote-tracking branch 'origin/proposal/famTutorialReorganization' into nextRelease 2013-07-08 11:52:32 +01:00
utilities/setFluidIndicator Tet fem reorganisation 2013-08-13 16:01:45 +01:00
Allwclean Re-merge of updates: new surface tracking, Zeljko Tukovic 2010-11-24 23:00:58 +00:00
Allwmake Compilation update 2010-11-25 22:49:59 +00:00