GIT: Resolved conflicts arising from merge with develop branch (47eb24be) · Commits · Development / openfoam

Commit 47eb24be authored 8 years ago by

Andrew Heather

Browse files

GIT: Resolved conflicts arising from merge with develop branch

parents ad1e7982 ba249f8e

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

applications/test/fvc2D/Make/files 3 additions, 0 deletions

applications/test/fvc2D/Make/files
applications/test/fvc2D/Make/options 7 additions, 0 deletions

applications/test/fvc2D/Make/options
applications/test/fvc2D/Test-fvc2D.C 35 additions, 10 deletions

applications/test/fvc2D/Test-fvc2D.C
applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/files 1 addition, 2 deletions

...es/postProcessing/dataConversion/foamToEnsight/Make/files
applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options 4 additions, 2 deletions

.../postProcessing/dataConversion/foamToEnsight/Make/options
applications/utilities/postProcessing/dataConversion/foamToEnsight/checkData.H 28 additions, 16 deletions

...s/postProcessing/dataConversion/foamToEnsight/checkData.H
applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H 38 additions, 15 deletions

...Processing/dataConversion/foamToEnsight/checkMeshMoving.H
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightAsciiStream.H 7 additions, 15 deletions

...cessing/dataConversion/foamToEnsight/ensightAsciiStream.H
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightBinaryStream.H 4 additions, 17 deletions

...essing/dataConversion/foamToEnsight/ensightBinaryStream.H
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCaseTail.H 7 additions, 7 deletions

...Processing/dataConversion/foamToEnsight/ensightCaseTail.H
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloud.C 180 additions, 0 deletions

...ostProcessing/dataConversion/foamToEnsight/ensightCloud.C
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloud.H 36 additions, 9 deletions

...ostProcessing/dataConversion/foamToEnsight/ensightCloud.H
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudTemplates.C 192 additions, 0 deletions

...sing/dataConversion/foamToEnsight/ensightCloudTemplates.C
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C 145 additions, 169 deletions

...ostProcessing/dataConversion/foamToEnsight/ensightField.C
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H 2 additions, 5 deletions

...ostProcessing/dataConversion/foamToEnsight/ensightField.H
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C 50 additions, 52 deletions

...postProcessing/dataConversion/foamToEnsight/ensightMesh.C
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H 18 additions, 12 deletions

...postProcessing/dataConversion/foamToEnsight/ensightMesh.H
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightParticlePositions.H 0 additions, 54 deletions

...g/dataConversion/foamToEnsight/ensightParticlePositions.H
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightStream.H 3 additions, 7 deletions

...stProcessing/dataConversion/foamToEnsight/ensightStream.H
applications/utilities/postProcessing/dataConversion/foamToEnsight/findCloudFields.H 93 additions, 0 deletions

...Processing/dataConversion/foamToEnsight/findCloudFields.H

with 853 additions and 392 deletions

Please register or to comment

Admin message

GIT: Resolved conflicts arising from merge with develop branch