Commit 33806ae8 authored by Douglas Serson's avatar Douglas Serson
Browse files

Merge branch 'fix/extra-utils' into 'master'

Fix for VTK and case statement in MeshGraph

Closes #90 and #87

See merge request !904
parents de64cde9 a3c6eabc
......@@ -34,7 +34,8 @@ v5.0.0
- Fix mac OSX on buildbots (!876)
- Fix error from (!826) (!876)
- Fix minor bug in ARPACK thirdparty build cmake (!874)
- Switch MeshGraph to use factory pattern and add HDF5 geometry support (!900)
- Switch MeshGraph to use factory pattern and add HDF5 geometry support (!900,
!904)
**NekMesh**:
- Add feature to read basic 2D geo files as CAD (!731)
......
......@@ -2053,6 +2053,7 @@ LibUtilities::BasisKeyVector MeshGraph::DefineBasisKeyFromExpansionType(
{
switch (shape)
{
case LibUtilities::eSegment:
{
const LibUtilities::PointsKey pkey(
nummodes, LibUtilities::eFourierSingleModeSpaced);
......
......@@ -14,7 +14,7 @@ namespace po = boost::program_options;
#include <LibUtilities/BasicUtils/FieldIO.h>
#include <LibUtilities/Communication/Comm.h>
#include <LibUtilities/BasicUtils/HashUtils.hpp>
#include <SpatialDomains/MeshGraph2D.h>
#include <SpatialDomains/MeshGraph.h>
#include <MultiRegions/ExpList2D.h>
#include <LocalRegions/Expansion2D.h>
......@@ -145,8 +145,7 @@ int main(int argc, char* argv[])
{
//----------------------------------------------
// Read in mesh from input file
graph2D = MemoryManager<SpatialDomains::MeshGraph2D>::
AllocateSharedPtr(vSession);
graph2D = SpatialDomains::MeshGraph::Read(vSession);
//----------------------------------------------
//----------------------------------------------
......
Markdown is supported
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