Skip to content
Snippets Groups Projects
Commit 3825e47b authored by Lars Bilke's avatar Lars Bilke
Browse files

Merge branch 'master' of github.com:ufz/ogs

* 'master' of github.com:ufz/ogs: (24 commits)
  added two options - one for output file name of the new mesh - another for the maximal collapse distance
  reset the mesh node ids correctly put information output within debug preprocessor instructions modified name of returned mesh
  write material number (the value) to the file
  inserted protected method setID() to class Node made class MeshCoarsener a friend of class Node
  delete the not used elem pointer variable
  made return value of virtual method Element::getEdgeNode() const this leads to the other changes of this commit in the inheritance hierarchy introduced a const_cast in Element::addNeighbor()
  added some documentation
  add _value of origin element to the new element created with reviseElement()
  made the behaviour of Edge::reviseElement() the same as other classes
  made ascci art consistent with other element documentation
  implemented Tri::reviseElement()
  fixed a bug creating Tri elements
  changed edge numbering in Quad::_edge_nodes implemented Quad::reviseElement() added more documentation to Quad::reviseElement()
  implemented reviseElement for class Tet documentation: - added edge numbering to prism sketch - added some docu to getEdgeNode()
  implemented reviseElement for class Pyramid documentation: added edge numbering to pyramid sketch
  implemented reviseElement for class Prism documentation: added edge numbering to prism sketch
  implemented Hex::ReviseElement() added more documentation to Hex::ReviseElement()
  documentation: added edge numbering to the sketch
  fixed a bug within documentation in doxygen (/latex) format
  using new method Element::reviseElement()
  ...

Conflicts:
	FileIO/Legacy/MeshIO.cpp
parents 1dcc813b 900b9876
No related branches found
No related tags found
No related merge requests found
Showing
with 406 additions and 106 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 to comment