diff --git a/Applications/DataExplorer/VtkVis/VtkMeshSource.cpp b/Applications/DataExplorer/VtkVis/VtkMeshSource.cpp index 0a4b46865dc0573df58bc34c5e13c79ceb9f9657..fd9aceddf340c42804777d43ea0cc4da730de18c 100644 --- a/Applications/DataExplorer/VtkVis/VtkMeshSource.cpp +++ b/Applications/DataExplorer/VtkVis/VtkMeshSource.cpp @@ -45,7 +45,7 @@ #include <vtkTriangle.h> #include <vtkWedge.h> // == Prism -#include "InSituLib/VtkOGSEnum.h" +#include "MeshLib/VtkOGSEnum.h" vtkStandardNewMacro(VtkMeshSource); @@ -146,7 +146,7 @@ int VtkMeshSource::RequestData( vtkInformation* request, for (unsigned j = 0; j < nElemNodes; ++j) point_ids->SetId(j, elem->getNode(j)->getID()); - type = InSituLib::OGSToVtkCellType(elem->getCellType()); + type = OGSToVtkCellType(elem->getCellType()); if (type==0) { ERR("VtkMeshSource::RequestData(): Unknown element type \"%s\".", CellType2String(elem->getCellType()).c_str()); diff --git a/InSituLib/VtkMappedMesh.cpp b/InSituLib/VtkMappedMesh.cpp index 9672d07626fb37556516fe9dc09afdff190eb467..2dcb4d37a2d8139460b510570ddb6dc90bcede61 100644 --- a/InSituLib/VtkMappedMesh.cpp +++ b/InSituLib/VtkMappedMesh.cpp @@ -28,7 +28,6 @@ #include "Element.h" #include "MeshLib/Node.h" #include "MeshEnums.h" - #include "VtkOGSEnum.h" namespace InSituLib { diff --git a/InSituLib/VtkOGSEnum.cpp b/MeshLib/VtkOGSEnum.cpp similarity index 98% rename from InSituLib/VtkOGSEnum.cpp rename to MeshLib/VtkOGSEnum.cpp index c74cf456d01b20bc1634941efcd507bc3d31e5e9..bf5df21beb65be9b9097b642ce7827cbae2ea79c 100644 --- a/InSituLib/VtkOGSEnum.cpp +++ b/MeshLib/VtkOGSEnum.cpp @@ -11,9 +11,6 @@ #include <vtkCellType.h> -namespace InSituLib -{ - CellType VtkCellTypeToOGS(int type) { CellType ogs; @@ -139,5 +136,4 @@ int OGSToVtkCellType(CellType ogs) return type; } -} // end namespace diff --git a/InSituLib/VtkOGSEnum.h b/MeshLib/VtkOGSEnum.h similarity index 91% rename from InSituLib/VtkOGSEnum.h rename to MeshLib/VtkOGSEnum.h index c8f86db385ebaa35c4f3c7fd2c1294e454febc31..571aee26bf987c2e112392d5d20eec2b60f578ba 100644 --- a/InSituLib/VtkOGSEnum.h +++ b/MeshLib/VtkOGSEnum.h @@ -12,13 +12,8 @@ #include "MeshEnums.h" -namespace InSituLib -{ - CellType VtkCellTypeToOGS(int type); int OGSToVtkCellType(CellType ogs); -} // end namespace - #endif // VTKOGSENUM_H_