Commit dd68aea7 authored by Dave Moxey's avatar Dave Moxey Committed by Spencer Sherwin
Browse files

Fix more compiler errors

parent 45f4f88e
......@@ -45,6 +45,8 @@
namespace Nektar
{
using SpatialDomains::BoundaryConditionShPtr;
/**
* @brief Take an existing assembly map and create a coupled version suitable
* for use in the linear elasticity solver.
......@@ -56,11 +58,12 @@ namespace Nektar
* [ D E F ] [ v ] [ f_v ]
* [ G H I ] [ w ] [ f_w ]
*/
CoupledAssemblyMap::CoupledAssemblyMap(
const LibUtilities::SessionReaderSharedPtr &pSession,
const SpatialDomains::MeshGraphSharedPtr &graph,
const MultiRegions::AssemblyMapCGSharedPtr &cgMap,
const Array<OneD, const SpatialDomains::BoundaryConditionShPtr> &boundaryConditions,
const Array<OneD, const BoundaryConditionShPtr> &boundaryConditions,
const Array<OneD, MultiRegions::ExpListSharedPtr> &fields) :
AssemblyMapCG(pSession)
{
......
......@@ -50,11 +50,13 @@ namespace Nektar
class CoupledAssemblyMap : public MultiRegions::AssemblyMapCG
{
public:
using SpatialDomains::BoundaryConditionShPtr;
CoupledAssemblyMap(
const LibUtilities::SessionReaderSharedPtr &pSession,
const SpatialDomains::MeshGraphSharedPtr &graph,
const MultiRegions::AssemblyMapCGSharedPtr &cgMap,
const Array<OneD, const SpatialDomains::BoundaryConditionShPtr> &boundaryConditions,
const Array<OneD, const BoundaryConditionShPtr> &boundaryConditions,
const Array<OneD, MultiRegions::ExpListSharedPtr> &fields);
};
......
......@@ -43,12 +43,15 @@
#include <MultiRegions/ContField3D.h>
#include <MultiRegions/GlobalLinSysDirectStaticCond.h>
#include <MultiRegions/GlobalLinSysIterativeStaticCond.h>
#include <MultiRegions/GlobalLinSysXxtStaticCond.h>
#include <MultiRegions/Preconditioner.h>
#include <LinearElasticSolver/EquationSystems/LinearElasticSystem.h>
#include <StdRegions/StdNodalTriExp.h>
#include <StdRegions/StdNodalTriExp.h>
#ifdef NEKTAR_USE_MPI
#include <MultiRegions/GlobalLinSysXxtStaticCond.h>
#endif
#ifdef NEKTAR_USE_PETSC
#include <MultiRegions/GlobalLinSysPETScStaticCond.h>
#endif
......@@ -426,6 +429,7 @@ void LinearElasticSystem::v_DoSolve()
m_assemblyMap);
}
#endif
#ifdef NEKTAR_USE_MPI
else if (m_assemblyMap->GetGlobalSysSolnType() ==
MultiRegions::eXxtStaticCond)
{
......@@ -434,6 +438,7 @@ void LinearElasticSystem::v_DoSolve()
key, m_fields[0], m_schurCompl, m_BinvD, m_C, m_Dinv,
m_assemblyMap);
}
#endif
linSys->Initialise(m_assemblyMap);
......@@ -634,7 +639,6 @@ void LinearElasticSystem::v_DoSolve()
Array<OneD, NekDouble> inout (nGlobDofs, 0.0);
Array<OneD, NekDouble> rhs (nGlobDofs, 0.0);
/*
for (nv = 0; nv < nVel; ++nv)
{
// Take the inner product of the forcing function.
......@@ -661,7 +665,6 @@ void LinearElasticSystem::v_DoSolve()
}
}
}
*/
// -- Impose Dirichlet boundary conditions.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment