Commit 304add83 authored by Dave Moxey's avatar Dave Moxey

Merge remote-tracking branch 'upstream/master' into feature/hdf5-mesh-4

Conflicts:
	library/NekMeshUtils/MeshElements/Mesh.h
	library/SpatialDomains/Geometry3D.cpp
	utilities/NekMesh/OutputModules/OutputNekpp.cpp
parents 885e20e6 e1c397fa
......@@ -22,7 +22,7 @@ v5.0.0
- Simplify RawType typedefs (!840)
- Remove unused files from BasicUtils (!841)
- Remove checks for old boost versions which are no longer supported (!841)
- Refactor ParseUtils to be more consistent (!843)
- Refactor ParseUtils to be more consistent (!843, !896)
- Added support for using the distance to a specific region (e.g. outlet) in the
function definitions for the Absorption Forcing (!769)
- Improve performance of DisContField2D::v_ExtractTracePhys (!824)
......@@ -48,6 +48,16 @@ v5.0.0
- Additional curve types in GEO reader: BSpline, Circle, Ellipse (!800)
- Fix default command line argument value (!823)
- Add projection meshing module which can curve linear meshes with CAD (!826)
- XML meshes now write with provenance information, including information about
their source, for debugging purposes (!872)
- Force 3-node loops to avoid degenerate 1-triangle faces (!875)
- Smooth BL normals in 2D when normals intersect or cause invalid macro BL
elements (!877)
- Revert triangle code to ThirdParty library (!883)
- Fix coinciding nodes issue with very fine meshes (!883)
- Skip CFI groups of bodies and non-numbered nodes (!891)
- Add ability to space out 2D BL nodes to better fit local target Delta (!890)
- Fix automatic peralign call in 2D periodic meshing (!888)
**FieldConvert**:
- Add input module for Semtex field files (!777)
......@@ -58,10 +68,13 @@ v5.0.0
- Enable output to multiple files (!844)
- Allow using xml file without expansion tag in FieldConvert (!849)
- Add Lambda 2 vortex detection criteria (!882)
- Add module for calculating new field from existing ones (!889)
- Add module for evaluating the mean of variables on the domain (!894)
**IncNavierStokesSolver**
- Replace steady-state check based on difference of norms by check based on
norm of the difference, to be consistent with the compressible solver (!832)
- Updated SVV to allow for the DGKernel extension (!851)
**CompressibleFlowSolver**
- Add 3D regression tests (!567)
......@@ -79,16 +92,22 @@ v4.4.2
- Fix evaluation of points (e.g. HistoryPoints, Interpolation to pts) close to
the interface of two elements (!836)
- Fix deadlock in Hdf5 with homogeneous expansions (!858)
- Fix a crash when Interpolator is called on an empty field (!869)
- Fix petsc compile without MPI (!873)
- Fix uninitialised coefficients in DirectFull solver (!898)
**NekMesh**
- Fix missing periodic boundary meshing and boundary layer mesh adjustment
configurations in 2D (!859)
- Fix 2D BL splitting where out-of-plane nodes would be created (!887)
**Documentation**:
- Fix sign of the viscous term in the velocity correction scheme equations in
the user guide (!856)
**FieldConvert**
- Allow passing input name with trailing separator (!879)
v4.4.1
------
**Library**
......
......@@ -245,6 +245,7 @@ INCLUDE (ThirdPartyArpack)
INCLUDE (ThirdPartyMPI)
INCLUDE (ThirdPartyVTK)
INCLUDE (ThirdPartyOCE)
INCLUDE (ThirdPartyTriangle)
INCLUDE (ThirdPartyTetGen)
INCLUDE (ThirdPartyCCM)
INCLUDE (FindCFI)
......
########################################################################
#
# ThirdParty configuration for Nektar++
#
# TRIANGLE
#
########################################################################
IF(NEKTAR_USE_MESHGEN)
SET(BUILD_TRIANGLE ON)
OPTION(THIRDPARTY_BUILD_TRIANGLE
"Build Triangle library from ThirdParty." ${BUILD_TRIANGLE})
IF (THIRDPARTY_BUILD_TRIANGLE)
INCLUDE(ExternalProject)
EXTERNALPROJECT_ADD(
triangle-1.6
PREFIX ${TPSRC}
URL ${TPURL}/triangle.zip
URL_MD5 357cb7107f51f3f89940c47435d4fa49
STAMP_DIR ${TPBUILD}/stamp
DOWNLOAD_DIR ${TPSRC}
SOURCE_DIR ${TPSRC}/triangle-1.6
BINARY_DIR ${TPBUILD}/triangle-1.6
TMP_DIR ${TPBUILD}/triangle-1.6-tmp
INSTALL_DIR ${TPDIST}
CONFIGURE_COMMAND ${CMAKE_COMMAND}
-G ${CMAKE_GENERATOR}
-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
-DCMAKE_INSTALL_PREFIX:PATH=${TPDIST}
${TPSRC}/triangle-1.6
)
THIRDPARTY_LIBRARY(TRIANGLE_LIBRARY STATIC triangle
DESCRIPTION "Triangle library")
SET(TRIANGLE_INCLUDE_DIR ${TPDIST}/include CACHE FILEPATH
"Triangle include" FORCE)
MESSAGE(STATUS "Build Triangle: ${TRIANGLE_LIBRARY}")
SET(TRIANGLE_CONFIG_INCLUDE_DIR ${TPINC})
ELSE()
ADD_CUSTOM_TARGET(triangle-1.6 ALL)
MESSAGE(STATUS "Found Triangle: ${TRIANGLE_LIBRARY}")
SET(TRIANGLE_CONFIG_INCLUDE_DIR ${TRIANGLE_INCLUDE_DIR})
ENDIF (THIRDPARTY_BUILD_TRIANGLE)
MARK_AS_ADVANCED(TRIANGLE_LIBRARY)
MARK_AS_ADVANCED(TRIANGLE_INCLUDE_DIR)
INCLUDE_DIRECTORIES(${TRIANGLE_INCLUDE_DIR})
ENDIF(NEKTAR_USE_MESHGEN)
......@@ -157,6 +157,7 @@ Specifically, FieldConvert has these additional functionalities
\item \inltt{QCriterion}: Computes the Q-Criterion for a given output file;
\item \inltt{L2Criterion}: Computes the Lambda 2 Criterion for a given output file;
\item \inltt{addcompositeid}: Adds the composite ID of an element as an additional field;
\item \inltt{addfieldfromstring}: Adds a new field from an expression involving the existing fields;
\item \inltt{addFld}: Sum two .fld files;
\item \inltt{combineAvg}: Combine two \nekpp binary output (.chk or .fld) field file containing averages of fields (and
possibly also Reynolds stresses) into single file;
......@@ -174,6 +175,7 @@ possibly also Reynolds stresses) into single file;
\item \inltt{isocontour}: Extract an isocontour of ``fieldid'' variable and at value ``fieldvalue''. Optionally ``fieldstr'' can be specified for a string definition or ``smooth'' for smoothing;
\item \inltt{jacobianenergy}: Shows high frequency energy of Jacobian;
\item \inltt{qualitymetric}: Evaluate a quality metric of the underlying mesh to show mesh quality;
\item \inltt{mean}: Evaluate the mean of variables on the domain;
\item \inltt{meanmode}: Extract mean mode (plane zero) of 3DH1D expansions;
\item \inltt{pointdatatofld}: Given discrete data at quadrature points
project them onto an expansion basis and output fld file;
......@@ -281,7 +283,28 @@ variable that contains the composite ID. To assist in boundary identification,
the input file \inlsh{mesh.xml} should be a surface XML file that can be
obtained through the \nm \inltt{extract} module (see section
\ref{s:utilities:nekmesh:extract}).
%
%
%
\subsection{Add new field: \textit{addfieldfromstring} module}
To create a new field using an expression involving the existing fields, one can
use the \inltt{addfieldfromstring} module of FieldConvert
%
\begin{lstlisting}[style=BashInputStyle]
FieldConvert -m addfieldfromstring:fieldstr="x+y+u":fieldname="result" \
file1.xml file2.fld file3.fld
\end{lstlisting}
%
In this case \inltt{fieldstr} is a required parameter describing a function of
the coordinates and the existing variables, and \inltt{fieldname} is an optional
parameter defining the name of the new field (the default is newfield).
\inltt{file3.fld} is the output containing both the original and the new fields,
and can be processed in a similar way as described
in section \ref{s:utilities:fieldconvert:sub:convert} to visualise
the result either in Tecplot, Paraview or VisIt.
%
%
%
\subsection{Sum two .fld files: \textit{addFld} module}
To sum two .fld files one can use the \inltt{addFld} module of FieldConvert
%
......@@ -784,7 +807,20 @@ Two quality metrics are implemented that produce scalar fields $Q$:
%
%
%
\subsection{Evaluate the mean of variables on the domain: \textit{mean} module}
To evaluate the mean of variables on the domain one can use the
\inltt{mean} module of FieldConvert
%
\begin{lstlisting}[style=BashInputStyle]
FieldConvert -m mean file1.xml file2.fld out.stdout
\end{lstlisting}
%
This module does not create an output file which is reinforced by the
out.stdout option. The integral and mean for each field variable are
then printed to the stdout.
%
%
%
\subsection{Extract mean mode of 3DH1D expansion: \textit{meanmode} module}
To obtain a 2D expansion containing the mean mode (plane zero in Fourier space) of a
......
......@@ -17,6 +17,7 @@ SET(FieldUtilsHeaders
OutputModules/OutputPts.h
OutputModules/OutputXml.h
ProcessModules/ProcessAddCompositeID.h
ProcessModules/ProcessAddFieldFromString.h
ProcessModules/ProcessAddFld.h
ProcessModules/ProcessBoundaryExtract.h
ProcessModules/ProcessCombineAvg.h
......@@ -38,6 +39,7 @@ SET(FieldUtilsHeaders
ProcessModules/ProcessL2Criterion.h
ProcessModules/ProcessMapping.h
ProcessModules/ProcessNumModes.h
ProcessModules/ProcessMean.h
ProcessModules/ProcessMeanMode.h
ProcessModules/ProcessPointDataToFld.h
ProcessModules/ProcessPrintFldNorms.h
......@@ -71,6 +73,7 @@ SET(FieldUtilsSources
OutputModules/OutputPts.cpp
OutputModules/OutputXml.cpp
ProcessModules/ProcessAddCompositeID.cpp
ProcessModules/ProcessAddFieldFromString.cpp
ProcessModules/ProcessAddFld.cpp
ProcessModules/ProcessBoundaryExtract.cpp
ProcessModules/ProcessCombineAvg.cpp
......@@ -92,6 +95,7 @@ SET(FieldUtilsSources
ProcessModules/ProcessL2Criterion.cpp
ProcessModules/ProcessMapping.cpp
ProcessModules/ProcessNumModes.cpp
ProcessModules/ProcessMean.cpp
ProcessModules/ProcessMeanMode.cpp
ProcessModules/ProcessPointDataToFld.cpp
ProcessModules/ProcessPrintFldNorms.cpp
......
......@@ -600,8 +600,11 @@ void Interpolator::PrintStatistics()
}
cout << "Number of points: " << m_neighInds.GetRows() << endl;
cout << "mean Number of Neighbours per point: "
<< meanN / m_neighInds.GetRows() << endl;
if (m_neighInds.GetRows() > 0)
{
cout << "mean Number of Neighbours per point: "
<< meanN / m_neighInds.GetRows() << endl;
}
}
/**
......
///////////////////////////////////////////////////////////////////////////////
//
// File: ProcessAddFieldFromString.cpp
//
// For more information, please see: http://www.nektar.info/
//
// The MIT License
//
// Copyright (c) 2006 Division of Applied Mathematics, Brown University (USA),
// Department of Aeronautics, Imperial College London (UK), and Scientific
// Computing and Imaging Institute, University of Utah (USA).
//
// License for the specific language governing rights and limitations under
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
// Description: Add a new field from a string based on existing variable
//
///////////////////////////////////////////////////////////////////////////////
#include <iostream>
#include <string>
using namespace std;
#include "ProcessAddFieldFromString.h"
#include <LibUtilities/BasicUtils/ParseUtils.h>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
namespace Nektar
{
namespace FieldUtils
{
ModuleKey ProcessAddFieldFromString::className =
GetModuleFactory().RegisterCreatorFunction(
ModuleKey(eProcessModule, "addfieldfromstring"),
ProcessAddFieldFromString::create,
"Create a new field from the existing fields as specified by a string"
" using a required argument of the form fieldstr=\"x + y + u\" ");
ProcessAddFieldFromString::ProcessAddFieldFromString(FieldSharedPtr f)
: ProcessModule(f)
{
m_config["fieldstr"] = ConfigOption(
false, "NotSet", "string of new field to be added (required)");
m_config["fieldname"] =
ConfigOption(false, "newfield",
"name for new field, default is newfield (optional)");
}
ProcessAddFieldFromString::~ProcessAddFieldFromString(void)
{
}
void ProcessAddFieldFromString::Process(po::variables_map &vm)
{
// Check if required parameter fieldstr was provided
ASSERTL0(m_config["fieldstr"].m_beenSet, "fieldstr must be specified");
// Get number of fields (before adding new entry)
int nfields = m_f->m_variables.size();
// Set up new field name
string fieldName = m_config["fieldname"].as<string>();
m_f->m_variables.push_back(fieldName);
// Skip in case of empty partition
if (m_f->m_exp[0]->GetNumElmts() == 0)
{
return;
}
// Check if using strips
int nstrips;
m_f->m_session->LoadParameter("Strip_Z", nstrips, 1);
ASSERTL0(nstrips == 1,
"Routine is currently only setup for non-strip files");
// Create new expansion
m_f->m_exp.resize(nfields + 1);
m_f->m_exp[nfields] = m_f->AppendExpList(m_f->m_numHomogeneousDir);
// Variables for storing names and values for evaluating the function
string varstr;
vector<Array<OneD, const NekDouble>> interpfields;
// Add the coordinate values
varstr += "x y z";
int npoints = m_f->m_exp[0]->GetTotPoints();
Array<OneD, NekDouble> x(npoints, 0.0);
Array<OneD, NekDouble> y(npoints, 0.0);
Array<OneD, NekDouble> z(npoints, 0.0);
m_f->m_exp[0]->GetCoords(x, y, z);
interpfields.push_back(x);
interpfields.push_back(y);
interpfields.push_back(z);
// Add the field values
for (int i = 0; i < nfields; ++i)
{
varstr += " " + m_f->m_variables[i];
interpfields.push_back(m_f->m_exp[i]->GetPhys());
}
// Create new function
LibUtilities::AnalyticExpressionEvaluator strEval;
int exprId = -1;
string fieldstr = m_config["fieldstr"].as<string>();
exprId = strEval.DefineFunction(varstr.c_str(), fieldstr);
// Evaluate function
strEval.Evaluate(exprId, interpfields, m_f->m_exp[nfields]->UpdatePhys());
// Update coeffs
m_f->m_exp[nfields]->FwdTrans_IterPerExp(
m_f->m_exp[nfields]->GetPhys(), m_f->m_exp[nfields]->UpdateCoeffs());
}
}
}
///////////////////////////////////////////////////////////////////////////////
//
// File: ProcessAddFieldFromString.h
//
// For more information, please see: http://www.nektar.info/
//
// The MIT License
//
// Copyright (c) 2006 Division of Applied Mathematics, Brown University (USA),
// Department of Aeronautics, Imperial College London (UK), and Scientific
// Computing and Imaging Institute, University of Utah (USA).
//
// License for the specific language governing rights and limitations under
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
// Description: Generate new field from string based on existing fields
//
////////////////////////////////////////////////////////////////////////////////
#ifndef FIELDUTILS_PROCESSADDNEWFIELDFROMSTR
#define FIELDUTILS_PROCESSADDNEWFIELDFROMSTR
#include "../Module.h"
namespace Nektar
{
namespace FieldUtils
{
/**
* @brief This processing module adds a new field from a string definition
*/
class ProcessAddFieldFromString : public ProcessModule
{
public:
/// Creates an instance of this class
static std::shared_ptr<Module> create(FieldSharedPtr f)
{
return MemoryManager<ProcessAddFieldFromString>::AllocateSharedPtr(f);
}
static ModuleKey className;
ProcessAddFieldFromString(FieldSharedPtr f);
virtual ~ProcessAddFieldFromString();
virtual void Process(po::variables_map &vm);
virtual std::string GetModuleName()
{
return "ProcessAddFieldFromString";
}
virtual std::string GetModuleDescription()
{
return "Calculating new field";
}
virtual ModulePriority GetModulePriority()
{
return eModifyExp;
}
};
}
}
#endif
////////////////////////////////////////////////////////////////////////////////
//
// File: ProcessMean.cpp
//
// For more information, please see: http://www.nektar.info/
//
// The MIT License
//
// Copyright (c) 2006 Division of Applied Mathematics, Brown University (USA),
// Department of Aeronautics, Imperial College London (UK), and Scientific
// Computing and Imaging Institute, University of Utah (USA).
//
// License for the specific language governing rights and limitations under
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
// Description: Compute the mean of each field.
//
////////////////////////////////////////////////////////////////////////////////
#include <iostream>
#include <string>
using namespace std;
#include "ProcessMean.h"
#include <LibUtilities/BasicUtils/SharedArray.hpp>
namespace Nektar
{
namespace FieldUtils
{
ModuleKey ProcessMean::className =
GetModuleFactory().RegisterCreatorFunction(
ModuleKey(eProcessModule, "mean"), ProcessMean::create,
"compute the mean of each field over the domain.");
ProcessMean::ProcessMean(FieldSharedPtr f) : ProcessModule(f)
{
}
ProcessMean::~ProcessMean()
{
}
void ProcessMean::Process(po::variables_map &vm)
{
int nfields = m_f->m_variables.size();
int spacedim = m_f->m_graph->GetMeshDimension() + m_f->m_numHomogeneousDir;
int npoints = m_f->m_exp[0]->GetNpoints();
// Calculate volume (or area)
Array<OneD, NekDouble> ones(npoints, 1.0);
NekDouble scale = m_f->m_exp[0]->Integral(ones);
// Output volume
string name[3] = {"length", "area", "volume"};
cout << "Domain " << name[spacedim - 1] << " : " << scale << endl;
// Calculate integral and mean of each field
for (int i = 0; i < nfields; ++i)
{
NekDouble integral = m_f->m_exp[0]->Integral(m_f->m_exp[i]->GetPhys());
if (m_f->m_comm->GetRank() == 0)
{
cout << "Integral (variable " << m_f->m_variables[i]
<< ") : " << integral << endl;
cout << "Mean (variable " << m_f->m_variables[i]
<< ") : " << integral / scale << endl;
}
}
}
}
}
////////////////////////////////////////////////////////////////////////////////
//
// File: ProcessMean.h
//
// For more information, please see: http://www.nektar.info/
//
// The MIT License
//
// Copyright (c) 2006 Division of Applied Mathematics, Brown University (USA),
// Department of Aeronautics, Imperial College London (UK), and Scientific
// Computing and Imaging Institute, University of Utah (USA).
//
// License for the specific language governing rights and limitations under
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
// Description: Compute the mean of each field.
//
////////////////////////////////////////////////////////////////////////////////
#ifndef FIELDUTILS_PROCESSMEAN
#define FIELDUTILS_PROCESSMEAN
#include "../Module.h"
namespace Nektar
{
namespace FieldUtils
{
/**
* @brief This processing module computes the mean of each field.
*
*/
class ProcessMean : public ProcessModule
{
public:
/// Creates an instance of this class
static std::shared_ptr<Module> create(FieldSharedPtr f)
{
return MemoryManager<ProcessMean>::AllocateSharedPtr(f);
}
static ModuleKey className;
ProcessMean(FieldSharedPtr f);
virtual ~ProcessMean();
/// Write mesh to output file.
virtual void Process(po::variables_map &vm);
virtual std::string GetModuleName()
{
return "ProcessMean";
}
virtual std::string GetModuleDescription()
{
return "Evaluating mean";
}
virtual ModulePriority GetModulePriority()
{
return eModifyExp;
}
};
}
}
#endif
......@@ -46,6 +46,22 @@ namespace Nektar
LIB_UTILITIES_EXPORT extern const std::string kGitSha1;
LIB_UTILITIES_EXPORT extern const std::string kGitBranch;
}
//This class is a workaround for a windows quirk which means that it cant
//figure out how the extern works when a library other than LibUtilities
//wants accsess to the information. This class wraps the consts with a class
//so that they can be used elsewhere (such as nekmesh)
namespace LibUtilities
{
class GitConsts
{
public:
LIB_UTILITIES_EXPORT GitConsts(){}
LIB_UTILITIES_EXPORT ~GitConsts(){}
LIB_UTILITIES_EXPORT std::string GetSha1(){return NekConstants::kGitSha1;}
LIB_UTILITIES_EXPORT std::string GetBranch(){return NekConstants::kGitBranch;}