Commit c13b5842 authored by Dave Moxey's avatar Dave Moxey

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
parents a14e06fa 94ffe49b
......@@ -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)
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)
......@@ -10,6 +11,19 @@ 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)
SET(MeshConvertHeaders
InputGmsh.h
InputNek.h
InputNekpp.h
InputPly.h
InputSem.h
InputSwan.h
InputStarTec.h
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
OutputGmsh.h
OutputNekpp.h
ProcessBL.h
ProcessCyl.h
ProcessDetectSurf.h
ProcessExtractSurf.h
ProcessJac.h
ProcessPerAlign.h
ProcessScalar.h
ProcessSpherigon.h
ProcessTetSplit.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
InputGmsh.cpp
InputNek.cpp
InputNekpp.cpp
InputPly.cpp
InputSem.cpp
InputSwan.cpp
InputStarTec.cpp
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
OutputGmsh.cpp
OutputNekpp.cpp
ProcessBL.cpp
ProcessCyl.cpp
ProcessDetectSurf.cpp
ProcessExtractSurf.cpp
ProcessJac.cpp
ProcessPerAlign.cpp
ProcessScalar.cpp
ProcessSpherigon.cpp
ProcessTetSplit.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} InputStar.h)
SET(MeshConvertSources ${MeshConvertSources} InputStar.cpp)
SET(MeshConvertHeaders ${MeshConvertHeaders} InputModules/InputStar.h)
SET(MeshConvertSources ${MeshConvertSources} InputModules/InputStar.cpp)
ENDIF (NEKTAR_USE_CCM)
IF (NEKTAR_USE_VTK)
SET(MeshConvertHeaders ${MeshConvertHeaders} InputVtk.h OutputVtk.h)
SET(MeshConvertSources ${MeshConvertSources} InputVtk.cpp OutputVtk.cpp)
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})
......
......@@ -37,7 +37,7 @@
#include <iostream>
using namespace std;
#include "MeshElements.h"
#include "../MeshElements.h"
#include "InputGmsh.h"
namespace Nektar
......
......@@ -36,7 +36,7 @@
#ifndef UTILITIES_PREPROCESSING_MESHCONVERT_INPUTGMSH
#define UTILITIES_PREPROCESSING_MESHCONVERT_INPUTGMSH
#include "Module.h"
#include "../Module.h"
namespace Nektar
{
......
......@@ -33,7 +33,7 @@
//
////////////////////////////////////////////////////////////////////////////////
#include "MeshElements.h"
#include "../MeshElements.h"
#include "InputNek.h"
#include <LibUtilities/Foundations/ManagerAccess.h>
......
......@@ -36,7 +36,7 @@
#ifndef UTILITIES_PREPROCESSING_MESHCONVERT_INPUTNEK
#define UTILITIES_PREPROCESSING_MESHCONVERT_INPUTNEK
#include "Module.h"
#include "../Module.h"
namespace Nektar
{
......
......@@ -39,7 +39,7 @@ using namespace std;
#include <SpatialDomains/MeshGraph.h>
#include "MeshElements.h"
#include "../MeshElements.h"
#include "InputNekpp.h"
namespace Nektar
......
......@@ -36,7 +36,7 @@
#ifndef UTILITIES_PREPROCESSING_MESHCONVERT_INPUTNEKPP
#define UTILITIES_PREPROCESSING_MESHCONVERT_INPUTNEKPP
#include "Module.h"
#include "../Module.h"
namespace Nektar
{
......
......@@ -37,7 +37,7 @@
#include <iostream>
using namespace std;
#include "MeshElements.h"
#include "../MeshElements.h"
#include "InputPly.h"
namespace Nektar
......
......@@ -36,7 +36,7 @@
#ifndef UTILITIES_PREPROCESSING_MESHCONVERT_INPUTPLY
#define UTILITIES_PREPROCESSING_MESHCONVERT_INPUTPLY
#include "Module.h"
#include "../Module.h"
namespace Nektar
{
......
......@@ -37,7 +37,7 @@
#include <iostream>
using namespace std;
#include "MeshElements.h"
#include "../MeshElements.h"
#include "InputSem.h"
namespace Nektar
......
......@@ -36,7 +36,7 @@
#ifndef UTILITIES_PREPROCESSING_MESHCONVERT_INPUTSEM
#define UTILITIES_PREPROCESSING_MESHCONVERT_INPUTSEM
#include "Module.h"
#include "../Module.h"
namespace Nektar
{
......
......@@ -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"
......
......@@ -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
{
......
......@@ -36,7 +36,7 @@
#include <iostream>
using namespace std;
#include "MeshElements.h"
#include "../MeshElements.h"
#include "InputSwan.h"
namespace Nektar
......
......@@ -36,7 +36,7 @@
#ifndef UTILITIES_PREPROCESSING_MESHCONVERT_INPUTSWAN
#define UTILITIES_PREPROCESSING_MESHCONVERT_INPUTSWAN
#include "Module.h"
#include "../Module.h"
namespace Nektar
{
......
......@@ -43,7 +43,7 @@ using namespace std;
#include <vtkPoints.h>
#include <vtkCellArray.h>
#include "MeshElements.h"
#include "../MeshElements.h"
#include "InputVtk.h"
namespace Nektar
......
......@@ -36,7 +36,7 @@
#ifndef UTILITIES_PREPROCESSING_MESHCONVERT_INPUTVTK
#define UTILITIES_PREPROCESSING_MESHCONVERT_INPUTVTK
#include "Module.h"
#include "../Module.h"
namespace Nektar
{
......
......@@ -33,9 +33,9 @@
//
////////////////////////////////////////////////////////////////////////////////
#include "MeshElements.h"
#include "../MeshElements.h"
#include "OutputGmsh.h"
#include "InputGmsh.h"
#include "../InputModules/InputGmsh.h"
#include <map>
#include <vector>
......
......@@ -36,7 +36,7 @@
#ifndef UTILITIES_PREPROCESSING_MESHCONVERT_OUTPUTGMSH
#define UTILITIES_PREPROCESSING_MESHCONVERT_OUTPUTGMSH
#include "Module.h"
#include "../Module.h"
namespace Nektar
{
......
......@@ -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
......
......@@ -37,7 +37,7 @@
#define UTILITIES_PREPROCESSING_MESHCONVERT_OUTPUTNEKPP
#include <tinyxml.h>
#include "Module.h"
#include "../Module.h"
namespace Nektar
{
......
......@@ -42,7 +42,7 @@ using namespace std;
#include <vtkPoints.h>
#include <vtkCellArray.h>
#include "MeshElements.h"
#include "../MeshElements.h"
#include "OutputVtk.h"
namespace Nektar
......
......@@ -37,7 +37,7 @@
#define UTILITIES_PREPROCESSING_MESHCONVERT_OUTPUTVTK
#include <tinyxml.h>
#include "Module.h"
#include "../Module.h"
namespace Nektar
{
......
......@@ -36,7 +36,7 @@
#include <string>
using namespace std;
#include "MeshElements.h"
#include "../MeshElements.h"
#include "ProcessBL.h"
#include <LibUtilities/Foundations/ManagerAccess.h>
......
......@@ -36,7 +36,7 @@
#ifndef UTILITIES_PREPROCESSING_MESHCONVERT_PROCESSJAC
#define UTILITIES_PREPROCESSING_MESHCONVERT_PROCESSJAC
#include "Module.h"
#include "../Module.h"
namespace Nektar
{
......
#include <string>
using namespace std;
#include "MeshElements.h"
#include "../MeshElements.h"
#include "ProcessCyl.h"
#include <LocalRegions/SegExp.h>
......
......@@ -36,7 +36,7 @@
#ifndef UTILITIES_PREPROCESSING_MESHCONVERT_PROCESSCHECK
#define UTILITIES_PREPROCESSING_MESHCONVERT_PROCESSCHECK
#include "Module.h"
#include "../Module.h"
namespace Nektar
{
......
......@@ -33,7 +33,7 @@
//
////////////////////////////////////////////////////////////////////////////////
#include "MeshElements.h"
#include "../MeshElements.h"
#include "ProcessDetectSurf.h"
#include <SpatialDomains/MeshGraph.h>
......
......@@ -36,7 +36,7 @@
#ifndef UTILITIES_PREPROCESSING_MESHCONVERT_PROCESSEXTRACTSURF
#define UTILITIES_PREPROCESSING_MESHCONVERT_PROCESSEXTRACTSURF
#include "Module.h"
#include "../Module.h"
namespace Nektar
{
......
......@@ -33,7 +33,7 @@
//
////////////////////////////////////////////////////////////////////////////////
#include "MeshElements.h"
#include "../MeshElements.h"
#include "ProcessExtractSurf.h"
#include <SpatialDomains/MeshGraph.h>
......
......@@ -36,7 +36,7 @@
#ifndef UTILITIES_PREPROCESSING_MESHCONVERT_PROCESSEXTRACTSURF
#define UTILITIES_PREPROCESSING_MESHCONVERT_PROCESSEXTRACTSURF
#include "Module.h"
#include "../Module.h"
namespace Nektar
{
......
......@@ -33,7 +33,7 @@
//
////////////////////////////////////////////////////////////////////////////////
#include "MeshElements.h"
#include "../MeshElements.h"
#include "ProcessJac.h"
#include <SpatialDomains/MeshGraph.h>
......
......@@ -36,7 +36,7 @@
#ifndef UTILITIES_PREPROCESSING_MESHCONVERT_PROCESSJAC
#define UTILITIES_PREPROCESSING_MESHCONVERT_PROCESSJAC
#include "Module.h"
#include "../Module.h"
namespace Nektar
{
......
......@@ -36,7 +36,7 @@
#include <string>
using namespace std;
#include "MeshElements.h"
#include "../MeshElements.h"
#include "ProcessPerAlign.h"
#include <LocalRegions/SegExp.h>
......
......@@ -36,7 +36,7 @@
#ifndef UTILITIES_PREPROCESSING_MESHCONVERT_PROCESSPERALIGN
#define UTILITIES_PREPROCESSING_MESHCONVERT_PROCESSPERALIGN
#include "Module.h"
#include "../Module.h"
namespace Nektar
{
......
......@@ -33,7 +33,7 @@
//
////////////////////////////////////////////////////////////////////////////////
#include "MeshElements.h"
#include "../MeshElements.h"
#include "ProcessScalar.h"
#include <SpatialDomains/MeshGraph.h>
......
......@@ -36,7 +36,7 @@
#ifndef UTILITIES_PREPROCESSING_MESHCONVERT_PROCESSSCALAR
#define UTILITIES_PREPROCESSING_MESHCONVERT_PROCESSSCALAR
#include "Module.h"
#include "../Module.h"
namespace Nektar
{
......
......@@ -36,7 +36,7 @@
#include <string>
using namespace std;
#include "MeshElements.h"
#include "../MeshElements.h"
#include "ProcessSpherigon.h"
#include <LocalRegions/SegExp.h>
......
......@@ -37,8 +37,8 @@
#define UTILITIES_PREPROCESSING_MESHCONVERT_PROCESSJAC
#include "Module.h"
#include "InputPly.h"
#include "../Module.h"
#include "../InputModules/InputPly.h"
namespace Nektar
{
......
......@@ -36,8 +36,8 @@
#include <string>
using namespace std;
#include "MeshElements.h"
#include "InputNek.h"
#include "../MeshElements.h"
#include "../InputModules/InputNek.h"
#include "ProcessTetSplit.h"