Fixing conflict in triSurfaceMesh.C, committing failed automatic merge of master. (a117c97e) · Commits · Development / openfoam · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

openfoam
- Activity
- Members
- Labels
- Releases
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Admin message

Site will likely be offline for maintenance 14/15 April - more details soon

Development
openfoam
Commits
a117c97e

Commit a117c97e authored 15 years ago by

graham

Downloads
- Plain Diff

Fixing conflict in triSurfaceMesh.C, committing failed automatic merge of master.

parents 25f0a4c0 08258250

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C 8 additions, 58 deletions

...lyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H 4 additions, 7 deletions

src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H
src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C 191 additions, 101 deletions

src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H 5 additions, 2 deletions

src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
src/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C 20 additions, 11 deletions

...xMesh/autoHexMeshDriver/layerParameters/layerParameters.C
src/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H 19 additions, 13 deletions

...xMesh/autoHexMeshDriver/layerParameters/layerParameters.H
src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H 3 additions, 2 deletions

...micMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
src/meshTools/searchableSurface/triSurfaceMesh.C 50 additions, 2 deletions

src/meshTools/searchableSurface/triSurfaceMesh.C
src/meshTools/searchableSurface/triSurfaceMesh.H 8 additions, 0 deletions

src/meshTools/searchableSurface/triSurfaceMesh.H

with 308 additions and 196 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment