Commit bf1b8dc8 authored by Julian Marcon's avatar Julian Marcon

Merge branch 'master' into fix/periodic-2D-peralign

Conflicts:
	CHANGELOG.md
	utilities/NekMesh/InputModules/InputMCF.cpp
parents de566f74 627e37fc
......@@ -48,9 +48,15 @@ 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**:
......@@ -62,10 +68,12 @@ 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)
**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)
......@@ -83,11 +91,13 @@ 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)
**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
......
......@@ -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;
......@@ -281,7 +282,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
%
......
......@@ -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
......@@ -71,6 +72,7 @@ SET(FieldUtilsSources
OutputModules/OutputPts.cpp
OutputModules/OutputXml.cpp
ProcessModules/ProcessAddCompositeID.cpp
ProcessModules/ProcessAddFieldFromString.cpp
ProcessModules/ProcessAddFld.cpp
ProcessModules/ProcessBoundaryExtract.cpp
ProcessModules/ProcessCombineAvg.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
......@@ -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;}
};
}
}
#endif
......@@ -542,6 +542,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing)
{
......@@ -573,7 +574,7 @@ namespace Nektar
// Solve the system
GlobalLinSysKey key(StdRegions::eHelmholtz,
m_locToGloMap,factors,varcoeff);
m_locToGloMap,factors,varcoeff,varfactors);
if(flags.isSet(eUseGlobal))
{
......
......@@ -208,6 +208,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing);
......
......@@ -874,6 +874,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing)
......@@ -923,7 +924,7 @@ namespace Nektar
// Add weak boundary conditions to forcing
Vmath::Vadd(contNcoeffs, wsp, 1, gamma, 1, wsp, 1);
GlobalLinSysKey key(StdRegions::eHelmholtz,m_locToGloMap,factors,varcoeff);
GlobalLinSysKey key(StdRegions::eHelmholtz,m_locToGloMap,factors,varcoeff,varfactors);
if(flags.isSet(eUseGlobal))
{
......
......@@ -247,6 +247,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing);
......
......@@ -580,6 +580,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing)
{
......@@ -626,7 +627,7 @@ namespace Nektar
Vmath::Vadd(contNcoeffs, wsp, 1, gamma, 1, wsp, 1);
// Solve the system
GlobalLinSysKey key(StdRegions::eHelmholtz, m_locToGloMap, factors,varcoeff);
GlobalLinSysKey key(StdRegions::eHelmholtz, m_locToGloMap, factors,varcoeff,varfactors);
if(flags.isSet(eUseGlobal))
{
......
......@@ -184,6 +184,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing);
virtual void v_GeneralMatrixOp(
......
......@@ -254,6 +254,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing)
{
......@@ -304,7 +305,7 @@ namespace Nektar
m_planes[n]->HelmSolve(wfce,
e_out = outarray + cnt1,
flags, new_factors, varcoeff,
dirForcing,
varfactors, dirForcing,
PhysSpaceForcing);
}
......
......@@ -97,6 +97,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing);
......
......@@ -161,6 +161,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing)
{
......@@ -202,7 +203,8 @@ namespace Nektar
wfce = (PhysSpaceForcing)? fce+cnt:fce+cnt1;
m_lines[l]->HelmSolve(wfce,
e_out = outarray + cnt1,
flags, new_factors, varcoeff, dirForcing,
flags, new_factors, varcoeff, varfactors,
dirForcing,
PhysSpaceForcing);
cnt += m_lines[l]->GetTotPoints();
......
......@@ -92,6 +92,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing);
......
......@@ -1184,6 +1184,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing)
{
......
......@@ -263,6 +263,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing);
......
......@@ -1859,6 +1859,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing)
......
......@@ -232,6 +232,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing);
virtual void v_GeneralMatrixOp(
......
......@@ -2003,6 +2003,7 @@ using namespace boost::assign;
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing)
{
......
......@@ -191,6 +191,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing);
......
......@@ -266,6 +266,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing)
{
......@@ -303,7 +304,8 @@ namespace Nektar
m_planes[n]->HelmSolve(
wfce,
e_out = outarray + cnt1,
flags, new_factors, varcoeff, dirForcing,
flags, new_factors, varcoeff, varfactors,
dirForcing,
PhysSpaceForcing);
}
......
......@@ -278,6 +278,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing);
......
......@@ -215,6 +215,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing)
{
......@@ -255,7 +256,7 @@ namespace Nektar
m_lines[n]->HelmSolve(wfce,
e_out = outarray + cnt1,
flags, new_factors,
varcoeff, dirForcing,
varcoeff, varfactors,dirForcing,
PhysSpaceForcing);
cnt += m_lines[n]->GetTotPoints();
......
......@@ -140,6 +140,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing);
......
......@@ -2537,6 +2537,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing)
{
......@@ -2926,8 +2927,8 @@ namespace Nektar
Array<OneD, NekDouble> &bnd)
{
int n, cnt;
Array<OneD, NekDouble> tmp1, tmp2;
LocalRegions::ExpansionSharedPtr elmt;
Array<OneD, NekDouble> tmp1;
StdRegions::StdExpansionSharedPtr elmt;
Array<OneD, int> ElmtID,EdgeID;
GetBoundaryToElmtMap(ElmtID,EdgeID);
......@@ -2952,8 +2953,8 @@ namespace Nektar
elmt = GetExp(ElmtID[cnt+n]);
elmt->GetTracePhysVals(EdgeID[cnt+n],
GetBndCondExpansions()[i]->GetExp(n),
tmp1 = phys + offsetPhys,
tmp2 = bnd + offsetBnd);
phys + offsetPhys,
tmp1 = bnd + offsetBnd);
}
}
......
......@@ -46,6 +46,7 @@
#include <MultiRegions/MultiRegions.hpp>
#include <MultiRegions/GlobalMatrix.h>
#include <MultiRegions/GlobalMatrixKey.h>
#include <MultiRegions/GlobalLinSysKey.h>
#include <MultiRegions/GlobalOptimizationParameters.h>
#include <MultiRegions/AssemblyMap/AssemblyMap.h>
#include <tinyxml.h>
......@@ -283,6 +284,8 @@ namespace Nektar
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff =
StdRegions::NullVarCoeffMap,
const MultiRegions::VarFactorsMap &varfactors =
MultiRegions::NullVarFactorsMap,
const Array<OneD, const NekDouble> &dirForcing =
NullNekDouble1DArray,
const bool PhysSpaceForcing = true);
......@@ -1193,6 +1196,7 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,
const MultiRegions::VarFactorsMap &varfactors,
const Array<OneD, const NekDouble> &dirForcing,
const bool PhysSpaceForcing);
......@@ -1740,12 +1744,13 @@ namespace Nektar
const FlagList &flags,
const StdRegions::ConstFactorMap &factors,
const StdRegions::VarCoeffMap &varcoeff,