Merge branch 'tidy/utilities' into 'master'

Tidy/utilities

This MR reorganises the utilities directory to remove the intermediate PreProcessing and PostProcessing directories.

See merge request !479

Author: mdave

utilities/CMakeLists.txt

@@ -18,12 +18,24 @@ ENDMACRO(ADD_UTILITIES_EXECUTABLE name component source)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/library ${CMAKE_SOURCE_DIR}/utilities)
 
-SUBDIRS(PreProcessing PostProcessing FieldConvert)
+ADD_UTILITIES_EXECUTABLE(FldAddFld         util FldAddFld.cpp)
+ADD_UTILITIES_EXECUTABLE(FldAddScalGrad    util FldAddScalGrad.cpp)
+ADD_UTILITIES_EXECUTABLE(FldAddScalGrad_elmt util FldAddScalGrad_elmt.cpp)
+ADD_UTILITIES_EXECUTABLE(FldAddWSS         util FldAddWSS.cpp)
+ADD_UTILITIES_EXECUTABLE(FldAddMultiShear  util FldAddMultiShear.cpp)
+ADD_UTILITIES_EXECUTABLE(ProbeFld          util-extra ProbeFld.cpp)
+ADD_UTILITIES_EXECUTABLE(XmlToTecplot      util XmlToTecplot.cpp)
+ADD_UTILITIES_EXECUTABLE(XmlToTecplotWireFrame  util XmlToTecplotWireFrame.cpp)
+ADD_UTILITIES_EXECUTABLE(XmlToVtk          util XmlToVtk.cpp)
+
+#SUBDIRS(PostProcessing FieldConvert MeshConvert SimpleMeshGen Extras)
+
+# Generate list of available utilities
+FILE(GLOB dir_list "*")
+LIST(REMOVE_ITEM dir_list "${CMAKE_SOURCE_DIR}/.svn")
+FOREACH(dir ${dir_list})
+    IF(IS_DIRECTORY ${dir} AND EXISTS ${dir}/CMakeLists.txt)
+        ADD_SUBDIRECTORY(${dir})
+    ENDIF(IS_DIRECTORY ${dir} AND EXISTS ${dir}/CMakeLists.txt)
+ENDFOREACH(dir ${dir_list})
 
-SET(CPACK_COMPONENTS_ALL util)
-
-SET(CPACK_COMPONENT_UTIL_NAME "nektar++-util")
-SET(CPACK_COMPONENT_UTIL_DESCRIPTION "Utilities for Nektar++")
-#SET(CPACK_COMPONENT_SOLVERS_DEPENDS lib)
-
-INCLUDE(CPack)

utilities/PostProcessing/Extras/AddExprToField.cpp utilities/Extras/AddExprToField.cpp

@@ -1,15 +1,29 @@
+ADD_UTILITIES_EXECUTABLE(CheckXmlFile              util-extra CheckXmlFile.cpp)
 ADD_UTILITIES_EXECUTABLE(AddExprToField            util-extra AddExprToField.cpp)
 ADD_UTILITIES_EXECUTABLE(CalcDivergence            util-extra CalcDivergence.cpp)
 ADD_UTILITIES_EXECUTABLE(CalcGrad                  util-extra CalcGrad.cpp)
 ADD_UTILITIES_EXECUTABLE(CalcVorticity             util-extra CalcVorticity.cpp)
-ADD_UTILITIES_EXECUTABLE(ExtractMultiFldFileInfo   util-extra ExtractMultiFldFileInfo.cpp)
+ADD_UTILITIES_EXECUTABLE(ExtractMultiFldFileInfo   util-extra                   ExtractMultiFldFileInfo.cpp)
 ADD_UTILITIES_EXECUTABLE(L2                        util-extra L2.cpp)
 ADD_UTILITIES_EXECUTABLE(Linf                      util-extra Linf.cpp)
 ADD_UTILITIES_EXECUTABLE(SplitFld                  util-extra SplitFld.cpp)
 ADD_UTILITIES_EXECUTABLE(SplitModes                util-extra SplitModes.cpp)
 ADD_UTILITIES_EXECUTABLE(StreamFunction2D          util-extra StreamFunction2D.cpp)
 
 IF (NEKTAR_USE_VTK)
+    SET(VtkToFldSources VtkToFld.cpp)
+    SET(VtkStripsToPolysSources VtkStripsToPolys.cpp)
+    ADD_UTILITIES_EXECUTABLE(VtkToFld util-extra ${VtkToFldSources})
+    ADD_UTILITIES_EXECUTABLE(VtkStripsToPolys util-extra ${VtkStripsToPolysSources})
+    IF (VTK_MAJOR_VERSION LESS 6)
+        TARGET_LINK_LIBRARIES(VtkToFld vtkCommon vtkIO vtkGraphics)
+        TARGET_LINK_LIBRARIES(VtkStripsToPolys vtkCommon vtkIO vtkGraphics)
+    ELSE ()
+        TARGET_LINK_LIBRARIES(VtkToFld vtkCommonCore vtkIOLegacy
+                                       vtkFiltersGeometry)
+        TARGET_LINK_LIBRARIES(VtkStripsToPolys vtkCommonCore vtkIOLegacy)
+    ENDIF ()
+    
     ADD_UTILITIES_EXECUTABLE(VtkToPng util-extra VtkToPng.cpp)
     IF (VTK_MAJOR_VERSION LESS 6)
         TARGET_LINK_LIBRARIES(VtkToPng vtkCommon vtksys vtkViews vtkWidgets 
@@ -18,3 +32,4 @@ IF (NEKTAR_USE_VTK)
         TARGET_LINK_LIBRARIES(VtkToPng ${VTK_LIBRARIES})
     ENDIF ()
 ENDIF (NEKTAR_USE_VTK)
+

utilities/PostProcessing/Extras/CMakeLists.txt utilities/Extras/CMakeLists.txt

@@ -0,0 +1,95 @@
+SET(MeshConvertHeaders 
+    InputModules/InputGmsh.h
+    InputModules/InputNek.h
+    InputModules/InputNekpp.h
+    InputModules/InputPly.h
+    InputModules/InputSem.h
+    InputModules/InputSwan.h
+    InputModules/InputStarTec.h
+    MeshElements.h
+    Module.h
+    OutputModules/OutputGmsh.h
+    OutputModules/OutputNekpp.h
+    ProcessModules/ProcessBL.h
+    ProcessModules/ProcessCyl.h
+    ProcessModules/ProcessDetectSurf.h
+    ProcessModules/ProcessExtractSurf.h
+    ProcessModules/ProcessJac.h
+    ProcessModules/ProcessPerAlign.h
+    ProcessModules/ProcessScalar.h
+    ProcessModules/ProcessSpherigon.h
+    ProcessModules/ProcessTetSplit.h
+)
+
+SET(MeshConvertSources 
+    InputModules/InputGmsh.cpp
+    InputModules/InputNek.cpp
+    InputModules/InputNekpp.cpp
+    InputModules/InputPly.cpp
+    InputModules/InputSem.cpp
+    InputModules/InputSwan.cpp
+    InputModules/InputStarTec.cpp
+    MeshConvert.cpp
+    MeshElements.cpp
+    Module.cpp
+    OutputModules/OutputGmsh.cpp
+    OutputModules/OutputNekpp.cpp
+    ProcessModules/ProcessBL.cpp
+    ProcessModules/ProcessCyl.cpp
+    ProcessModules/ProcessDetectSurf.cpp
+    ProcessModules/ProcessExtractSurf.cpp
+    ProcessModules/ProcessJac.cpp
+    ProcessModules/ProcessPerAlign.cpp
+    ProcessModules/ProcessScalar.cpp
+    ProcessModules/ProcessSpherigon.cpp
+    ProcessModules/ProcessTetSplit.cpp
+)
+
+IF (NEKTAR_USE_CCM)
+    SET(MeshConvertHeaders ${MeshConvertHeaders} InputModules/InputStar.h)
+    SET(MeshConvertSources ${MeshConvertSources} InputModules/InputStar.cpp)
+ENDIF (NEKTAR_USE_CCM)
+
+
+IF (NEKTAR_USE_VTK)
+    SET(MeshConvertHeaders ${MeshConvertHeaders} InputModules/InputVtk.h OutputModules/OutputVtk.h)
+    SET(MeshConvertSources ${MeshConvertSources} InputModules/InputVtk.cpp OutputModules/OutputVtk.cpp)
+ENDIF (NEKTAR_USE_VTK)
+
+ADD_UTILITIES_EXECUTABLE(MeshConvert util ${MeshConvertSources} ${MeshConvertHeaders})
+
+IF (NEKTAR_USE_CCM)
+   TARGET_LINK_LIBRARIES(MeshConvert ccmio adf)
+   SET_TARGET_PROPERTIES(MeshConvert PROPERTIES
+    IMPORTED_LOCATION ${CCMIO_LIBRARY_PATH}/libccmio.a)
+   INCLUDE_DIRECTORIES(MeshConvert ${CCMIO_INCLUDE_DIR})
+   LINK_DIRECTORIES(${CCMIO_LIBRARY_PATH})        
+ENDIF (NEKTAR_USE_CCM)
+
+IF (NEKTAR_USE_VTK)
+    IF (VTK_MAJOR_VERSION LESS 6)
+        TARGET_LINK_LIBRARIES(MeshConvert vtkCommon vtkIO vtkGraphics)
+    ELSE ()
+        TARGET_LINK_LIBRARIES(MeshConvert vtkCommonCore vtkIOLegacy)
+    ENDIF ()
+ENDIF (NEKTAR_USE_VTK)
+
+
+# Gmsh tests
+ADD_NEKTAR_TEST        (Gmsh/CubeAllElements)
+ADD_NEKTAR_TEST        (Gmsh/CubeHex)
+ADD_NEKTAR_TEST        (Gmsh/CubePrism)
+ADD_NEKTAR_TEST        (Gmsh/CubeTet)
+IF (WIN32)
+    ADD_NEKTAR_TEST    (Gmsh/Scalar_Windows)
+ELSE ()
+    ADD_NEKTAR_TEST    (Gmsh/Scalar)
+ENDIF ()
+ADD_NEKTAR_TEST        (Gmsh/SquareQuad)
+ADD_NEKTAR_TEST        (Gmsh/SquareTri)
+# Nektar tests
+ADD_NEKTAR_TEST        (Nektar/HexLinear)
+ADD_NEKTAR_TEST        (Nektar/Tube45)
+# StarCCM tests
+ADD_NEKTAR_TEST        (StarTec/CubePer)
+ADD_NEKTAR_TEST_LENGTHY(StarTec/StraightRW)

utilities/PostProcessing/Extras/CalcDivergence.cpp utilities/Extras/CalcDivergence.cpp

@@ -37,7 +37,7 @@
 #include <iostream>
 using namespace std;
 
-#include "MeshElements.h"
+#include "../MeshElements.h"
 #include "InputGmsh.h"
 
 namespace Nektar

utilities/PostProcessing/Extras/CalcGrad.cpp utilities/Extras/CalcGrad.cpp

@@ -36,7 +36,7 @@
 #ifndef UTILITIES_PREPROCESSING_MESHCONVERT_INPUTGMSH
 #define UTILITIES_PREPROCESSING_MESHCONVERT_INPUTGMSH
 
-#include "Module.h"
+#include "../Module.h"
 
 namespace Nektar
 {

utilities/PostProcessing/Extras/CalcVorticity.cpp utilities/Extras/CalcVorticity.cpp

@@ -33,7 +33,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "MeshElements.h"
+#include "../MeshElements.h"
 #include "InputNek.h"
 
 #include <LibUtilities/Foundations/ManagerAccess.h>

utilities/PreProcessing/Extras/CheckXmlFile.cpp utilities/Extras/CheckXmlFile.cpp

@@ -36,7 +36,7 @@
 #ifndef UTILITIES_PREPROCESSING_MESHCONVERT_INPUTNEK
 #define UTILITIES_PREPROCESSING_MESHCONVERT_INPUTNEK
 
-#include "Module.h"
+#include "../Module.h"
 
 namespace Nektar
 {

utilities/PostProcessing/Extras/ExtractMultiFldFileInfo.cpp utilities/Extras/ExtractMultiFldFileInfo.cpp

@@ -39,7 +39,7 @@ using namespace std;
 
 #include <SpatialDomains/MeshGraph.h>
 
-#include "MeshElements.h"
+#include "../MeshElements.h"
 #include "InputNekpp.h"
 
 namespace Nektar

utilities/PostProcessing/Extras/FldCalcBCs.cpp utilities/Extras/FldCalcBCs.cpp

@@ -36,7 +36,7 @@
 #ifndef UTILITIES_PREPROCESSING_MESHCONVERT_INPUTNEKPP
 #define UTILITIES_PREPROCESSING_MESHCONVERT_INPUTNEKPP
 
-#include "Module.h"
+#include "../Module.h"
 
 namespace Nektar
 {

utilities/PostProcessing/Extras/L2.cpp utilities/Extras/L2.cpp

@@ -37,7 +37,7 @@
 #include <iostream>
 using namespace std;
 
-#include "MeshElements.h"
+#include "../MeshElements.h"
 #include "InputPly.h"
 
 namespace Nektar

utilities/PostProcessing/Extras/Linf.cpp utilities/Extras/Linf.cpp

@@ -36,7 +36,7 @@
 #ifndef UTILITIES_PREPROCESSING_MESHCONVERT_INPUTPLY
 #define UTILITIES_PREPROCESSING_MESHCONVERT_INPUTPLY
 
-#include "Module.h"
+#include "../Module.h"
 
 namespace Nektar
 {

utilities/PreProcessing/Extras/MeshSphericalshell.c utilities/Extras/MeshSphericalshell.c

@@ -37,7 +37,7 @@
 #include <iostream>
 using namespace std;
 
-#include "MeshElements.h"
+#include "../MeshElements.h"
 #include "InputSem.h"
 
 namespace Nektar

utilities/PostProcessing/Extras/SplitFld.cpp utilities/Extras/SplitFld.cpp

@@ -36,7 +36,7 @@
 #ifndef UTILITIES_PREPROCESSING_MESHCONVERT_INPUTSEM
 #define UTILITIES_PREPROCESSING_MESHCONVERT_INPUTSEM
 
-#include "Module.h"
+#include "../Module.h"
 
 namespace Nektar
 {

utilities/PostProcessing/Extras/SplitModes.cpp utilities/Extras/SplitModes.cpp

@@ -36,8 +36,8 @@
 #ifndef UTILITIES_PREPROCESSING_MESHCONVERT_INPUTSTAR
 #define UTILITIES_PREPROCESSING_MESHCONVERT_INPUTSTAR
 
-#include "Module.h"
-#include "MeshElements.h"
+#include "../Module.h"
+#include "../MeshElements.h"
 #include "ccmio.h"
 
 

utilities/PostProcessing/Extras/StreamFunction2D.cpp utilities/Extras/StreamFunction2D.cpp

@@ -36,8 +36,8 @@
 #ifndef UTILITIES_PREPROCESSING_MESHCONVERT_INPUTTEC
 #define UTILITIES_PREPROCESSING_MESHCONVERT_INPUTTEC
 
-#include "Module.h"
-#include "MeshElements.h"
+#include "../Module.h"
+#include "../MeshElements.h"
 
 namespace Nektar
 {

utilities/PreProcessing/Extras/VtkStripsToPolys.cpp utilities/Extras/VtkStripsToPolys.cpp

@@ -36,7 +36,7 @@
 #include <iostream>
 using namespace std;
 
-#include "MeshElements.h"
+#include "../MeshElements.h"
 #include "InputSwan.h"
 
 namespace Nektar

utilities/PreProcessing/Extras/VtkToFld.cpp utilities/Extras/VtkToFld.cpp

@@ -36,7 +36,7 @@
 #ifndef UTILITIES_PREPROCESSING_MESHCONVERT_INPUTSWAN
 #define UTILITIES_PREPROCESSING_MESHCONVERT_INPUTSWAN
 
-#include "Module.h"
+#include "../Module.h"
 
 namespace Nektar
 {

utilities/PostProcessing/Extras/VtkToPng.cpp utilities/Extras/VtkToPng.cpp

@@ -43,7 +43,7 @@ using namespace std;
 #include <vtkPoints.h>
 #include <vtkCellArray.h>
 
-#include "MeshElements.h"
+#include "../MeshElements.h"
 #include "InputVtk.h"
 
 namespace Nektar

utilities/PreProcessing/Extras/makeEllipsoidNektar.c utilities/Extras/makeEllipsoidNektar.c

@@ -36,7 +36,7 @@
 #ifndef UTILITIES_PREPROCESSING_MESHCONVERT_INPUTVTK
 #define UTILITIES_PREPROCESSING_MESHCONVERT_INPUTVTK
 
-#include "Module.h"
+#include "../Module.h"
 
 namespace Nektar
 {

utilities/PreProcessing/Extras/meshFiles/cube1D.msh utilities/Extras/meshFiles/cube1D.msh

@@ -33,9 +33,9 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "MeshElements.h"
+#include "../MeshElements.h"
 #include "OutputGmsh.h"
-#include "InputGmsh.h"
+#include "../InputModules/InputGmsh.h"
 
 #include <map>
 #include <vector>

utilities/PreProcessing/Extras/meshFiles/cube2D.msh utilities/Extras/meshFiles/cube2D.msh

@@ -36,7 +36,7 @@
 #ifndef UTILITIES_PREPROCESSING_MESHCONVERT_OUTPUTGMSH
 #define UTILITIES_PREPROCESSING_MESHCONVERT_OUTPUTGMSH
 
-#include "Module.h"
+#include "../Module.h"
 
 namespace Nektar
 {

utilities/PreProcessing/Extras/meshFiles/cube3D.msh utilities/Extras/meshFiles/cube3D.msh

@@ -46,7 +46,7 @@ namespace io = boost::iostreams;
 #include <LibUtilities/BasicUtils/SessionReader.h>
 #include <SpatialDomains/MeshGraph.h>
 
-#include "MeshElements.h"
+#include "../MeshElements.h"
 #include "OutputNekpp.h"
 
 namespace Nektar

utilities/PreProcessing/Extras/meshFiles/fields2D.msh utilities/Extras/meshFiles/fields2D.msh

@@ -37,7 +37,7 @@
 #define UTILITIES_PREPROCESSING_MESHCONVERT_OUTPUTNEKPP
 
 #include <tinyxml.h>
-#include "Module.h"
+#include "../Module.h"
 
 namespace Nektar
 {

utilities/PreProcessing/Extras/meshFiles/fields3D.msh utilities/Extras/meshFiles/fields3D.msh

@@ -42,7 +42,7 @@ using namespace std;
 #include <vtkPoints.h>
 #include <vtkCellArray.h>
 
-#include "MeshElements.h"
+#include "../MeshElements.h"
 #include "OutputVtk.h"
 
 namespace Nektar

utilities/PreProcessing/Extras/meshFiles/sphere-discrete.msh utilities/Extras/meshFiles/sphere-discrete.msh

@@ -37,7 +37,7 @@
 #define UTILITIES_PREPROCESSING_MESHCONVERT_OUTPUTVTK
 
 #include <tinyxml.h>
-#include "Module.h"
+#include "../Module.h"
 
 namespace Nektar
 {

utilities/PreProcessing/Extras/meshFiles/sphere-discrete2D.msh utilities/Extras/meshFiles/sphere-discrete2D.msh

@@ -36,7 +36,7 @@
 #include <string>
 using namespace std;
 
-#include "MeshElements.h"
+#include "../MeshElements.h"
 #include "ProcessBL.h"
 
 #include <LibUtilities/Foundations/ManagerAccess.h>

utilities/PreProcessing/Extras/smeshFile/hinge.smesh utilities/Extras/smeshFile/hinge.smesh

@@ -36,7 +36,7 @@
 #ifndef UTILITIES_PREPROCESSING_MESHCONVERT_PROCESSJAC
 #define UTILITIES_PREPROCESSING_MESHCONVERT_PROCESSJAC
 
-#include "Module.h"
+#include "../Module.h"
 
 namespace Nektar
 {

utilities/PreProcessing/Extras/smeshFile/sav.smesh utilities/Extras/smeshFile/sav.smesh

@@ -1,7 +1,7 @@
 #include <string>
 using namespace std;
 
-#include "MeshElements.h"
+#include "../MeshElements.h"
 #include "ProcessCyl.h"
 
 #include <LocalRegions/SegExp.h>