MRG: Merged develop branch and resolved conflicts (4408d470) · 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
4408d470

Commit 4408d470 authored 8 years ago by

Andrew Heather

Downloads
- Plain Diff

MRG: Merged develop branch and resolved conflicts

parents 9d21d5b5 e24917a7

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C 20 additions, 7 deletions

...cations/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
bin/foamCleanPath 2 additions, 2 deletions

bin/foamCleanPath
bin/tools/doxyFilter 3 additions, 3 deletions

bin/tools/doxyFilter
src/OpenFOAM/global/foamDoc.H 1 addition, 1 deletion

src/OpenFOAM/global/foamDoc.H
src/OpenFOAM/meshes/meshTools/mergePoints.C 11 additions, 14 deletions

src/OpenFOAM/meshes/meshTools/mergePoints.C
src/OpenFOAM/primitives/strings/word/word.H 2 additions, 1 deletion

src/OpenFOAM/primitives/strings/word/word.H
src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C 5 additions, 2 deletions

...mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
src/meshTools/searchableSurface/subTriSurfaceMesh.H 2 additions, 2 deletions

src/meshTools/searchableSurface/subTriSurfaceMesh.H
src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C 1 addition, 1 deletion

...randomProcesses/noise/noiseModels/noiseModel/noiseModel.C
src/thermophysicalModels/doc/thermophysicalModels.dox 1 addition, 1 deletion

src/thermophysicalModels/doc/thermophysicalModels.dox

with 48 additions and 34 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