Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Nektar
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

73f2ee84

Commit 73f2ee84 authored 7 years ago by Dave Moxey

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into fix/xml-output

parents d9424102 6dafcf98

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 11 additions, 1 deletion

CHANGELOG.md
library/NekMeshUtils/CADSystem/OCE/CADSurfOCE.cpp 3 additions, 5 deletions

library/NekMeshUtils/CADSystem/OCE/CADSurfOCE.cpp
library/NekMeshUtils/MeshElements/Mesh.cpp 46 additions, 45 deletions

library/NekMeshUtils/MeshElements/Mesh.cpp
library/NekMeshUtils/Octree/Octree.cpp 2 additions, 2 deletions

library/NekMeshUtils/Octree/Octree.cpp
utilities/NekMesh/InputModules/InputMCF.cpp 180 additions, 84 deletions

utilities/NekMesh/InputModules/InputMCF.cpp
utilities/NekMesh/InputModules/InputMCF.h 1 addition, 1 deletion

utilities/NekMesh/InputModules/InputMCF.h
utilities/NekMesh/Tests/MeshGen/cylinder.mcf 2 additions, 2 deletions

utilities/NekMesh/Tests/MeshGen/cylinder.mcf
utilities/NekMesh/Tests/MeshGen/rev.mcf 2 additions, 2 deletions

utilities/NekMesh/Tests/MeshGen/rev.mcf
utilities/NekMesh/Tests/MeshGen/sphere.mcf 2 additions, 2 deletions

utilities/NekMesh/Tests/MeshGen/sphere.mcf

with 249 additions and 144 deletions

Loading

0% Loading 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