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
No related branches found
No related tags found
Showing
- FileIO/Legacy/MeshIO.cpp 5 additions, 8 deletionsFileIO/Legacy/MeshIO.cpp
- MathLib/MathTools.h 1 addition, 1 deletionMathLib/MathTools.h
- MeshLib/CMakeLists.txt 2 additions, 0 deletionsMeshLib/CMakeLists.txt
- MeshLib/Elements/Edge.cpp 9 additions, 0 deletionsMeshLib/Elements/Edge.cpp
- MeshLib/Elements/Edge.h 8 additions, 5 deletionsMeshLib/Elements/Edge.h
- MeshLib/Elements/Element.cpp 3 additions, 3 deletionsMeshLib/Elements/Element.cpp
- MeshLib/Elements/Element.h 30 additions, 5 deletionsMeshLib/Elements/Element.h
- MeshLib/Elements/Hex.cpp 47 additions, 0 deletionsMeshLib/Elements/Hex.cpp
- MeshLib/Elements/Hex.h 25 additions, 13 deletionsMeshLib/Elements/Hex.h
- MeshLib/Elements/Prism.cpp 19 additions, 0 deletionsMeshLib/Elements/Prism.cpp
- MeshLib/Elements/Prism.h 30 additions, 13 deletionsMeshLib/Elements/Prism.h
- MeshLib/Elements/Pyramid.cpp 17 additions, 0 deletionsMeshLib/Elements/Pyramid.cpp
- MeshLib/Elements/Pyramid.h 28 additions, 13 deletionsMeshLib/Elements/Pyramid.h
- MeshLib/Elements/Quad.cpp 15 additions, 1 deletionMeshLib/Elements/Quad.cpp
- MeshLib/Elements/Quad.h 19 additions, 9 deletionsMeshLib/Elements/Quad.h
- MeshLib/Elements/Tet.cpp 17 additions, 0 deletionsMeshLib/Elements/Tet.cpp
- MeshLib/Elements/Tet.h 31 additions, 15 deletionsMeshLib/Elements/Tet.h
- MeshLib/Elements/Tri.cpp 15 additions, 0 deletionsMeshLib/Elements/Tri.cpp
- MeshLib/Elements/Tri.h 17 additions, 6 deletionsMeshLib/Elements/Tri.h
- MeshLib/MeshCoarsener.cpp 68 additions, 14 deletionsMeshLib/MeshCoarsener.cpp
Loading
Please register or sign in to comment