Commit 732efe19 authored by Michael Turner's avatar Michael Turner
Browse files

file clean up and face node reinstated, needs optimisation

parent 340cbe7a
......@@ -183,7 +183,6 @@ INCLUDE (ThirdPartyVTK)
INCLUDE (ThirdPartyQT4)
INCLUDE (ThirdPartySMV)
INCLUDE (ThirdPartyTriangle)
INCLUDE (ThirdPartyASA047)
INCLUDE (ThirdPartyTetGen)
INCLUDE (ThirdPartyCCM)
......
########################################################################
#
# ThirdParty configuration for Nektar++
#
# ASA047
#
########################################################################
IF(NEKTAR_USE_MESH)
SET(BUILD_ASA ON)
OPTION(THIRDPARTY_BUILD_ASA
"Build Asa047 library from ThirdParty." ${BUILD_ASA})
IF (THIRDPARTY_BUILD_ASA)
INCLUDE(ExternalProject)
EXTERNALPROJECT_ADD(
asa047-1.0
PREFIX ${TPSRC}
URL http://ae-nektar.ae.ic.ac.uk/~mt4313/asa.zip
URL_MD5 e5b120d1b8759cc265788a12aef0b0b9
STAMP_DIR ${TPBUILD}/stamp
DOWNLOAD_DIR ${TPSRC}
SOURCE_DIR ${TPSRC}/asa047-1.0
BINARY_DIR ${TPBUILD}/asa047-1.0
TMP_DIR ${TPBUILD}/asa047-1.0-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}/asa047-1.0
)
SET(ASA_LIBRARY asa047 CACHE FILEPATH
"Asa047 library" FORCE)
SET(ASA_INCLUDE_DIR ${TPDIST}/include CACHE FILEPATH
"Asa047 include" FORCE)
LINK_DIRECTORIES(${TPDIST}/lib)
IF (WIN32)
MESSAGE(STATUS
"Build Asa047: ${TPDIST}/${LIB_DIR}/${ASA_LIBRARY}.dll")
ELSE ()
MESSAGE(STATUS
"Build Asa047: ${TPDIST}/${LIB_DIR}/lib${ASA_LIBRARY}.a")
ENDIF ()
SET(ASA_CONFIG_INCLUDE_DIR ${TPINC})
ELSE()
ADD_CUSTOM_TARGET(asa047-1.0 ALL)
MESSAGE(STATUS "Found asa: ${ASA_LIBRARY}")
SET(TRIANGLE_CONFIG_INCLUDE_DIR ${ASA_INCLUDE_DIR})
ENDIF (THIRDPARTY_BUILD_ASA)
INCLUDE_DIRECTORIES(SYSTEM ${ASA_INCLUDE_DIR})
ENDIF(NEKTAR_USE_MESH)
......@@ -27,7 +27,6 @@ ADD_NEKTAR_LIBRARY(MeshUtils lib ${NEKTAR_LIBRARY_TYPE}
TARGET_LINK_LIBRARIES(MeshUtils LINK_PUBLIC LibUtilities)
TARGET_LINK_LIBRARIES(MeshUtils LINK_PRIVATE ${TRIANGLE_LIBRARY})
TARGET_LINK_LIBRARIES(MeshUtils LINK_PRIVATE ${TETGEN_LIBRARY})
TARGET_LINK_LIBRARIES(MeshUtils LINK_PRIVATE ${ASA_LIBRARY})
INSTALL(DIRECTORY ./
DESTINATION ${NEKTAR_INCLUDE_DIR}/MeshUtils
......
......@@ -586,7 +586,6 @@ namespace MeshUtils {
uvi[0]+=xmin*df[0]; uvi[1]+=xmin*df[1];
Array<OneD, NekDouble> loc = s->P(uvi);
Nodes[honodes[i]]->Move(loc,uvi);
cout << "moved" << endl;
}
}
if(converged == honodes.size())
......
......@@ -215,10 +215,10 @@ namespace Utilities
vector<int> hon = trit->second->GetHONodes();
for(int j = 0; j < hon.size(); j++)
{
//localnode.push_back(allnodes[hon[j]]);
localnode.push_back(allnodes[hon[j]]);
}
ElmtConfig conf(LibUtilities::eTriangle,m_order,false,false,false);
ElmtConfig conf(LibUtilities::eTriangle,m_order,true,false,false);
vector<int> tags;
tags.push_back(trit->second->Getcid());
ElementSharedPtr E = GetElementFactory().
......@@ -265,7 +265,15 @@ namespace Utilities
egs[j]->m_edgeNodes = localhonode;
}
/*int t = m_mesh->m_element[m_mesh->m_expDim-1][i]->GetTriID();
int t = m_mesh->m_element[m_mesh->m_expDim-1][i]->GetTriID();
vector<int> honode = Tris[t]->GetHONodes();
vector<NodeSharedPtr> localhonode;
for(int j = 0; j < honode.size(); j++)
{
localhonode.push_back(allnodes[honode[j]]);
}
f->m_faceNodes = localhonode;
Array<OneD, int> n = Tris[t]->GetN();
vector<int> trivert(3);
......@@ -278,9 +286,9 @@ namespace Utilities
vector<NodeSharedPtr> hon = f->m_faceNodes;
HOTriangle<NodeSharedPtr> hoTri(facevert,hon);
hoTri.Align(trivert);*/
hoTri.Align(trivert);
//f->m_faceNodes = hoTri.surfVerts;
f->m_faceNodes = hoTri.surfVerts;
}
if(m_mesh->m_verbose)
......
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