Commit 36e8acb8 authored by Chris Cantwell's avatar Chris Cantwell

Fixed hybrid parallelism.

Fixed incorrect dependencies on ThirdParty libraries.


git-svn-id: https://gforge.sci.utah.edu/svn/nektar/trunk@3838 305cdda6-5ce1-45b3-a98d-dfc68c8b3305
parent f1448193
......@@ -209,7 +209,7 @@ MACRO(ADD_NEKTAR_LIBRARY name component type)
# NIST Sparse BLAS only static, so link into Nektar libraries directly.
TARGET_LINK_LIBRARIES( ${name} ${NIST_SPARSE_BLAS} ${METIS_LIB})
ADD_DEPENDENCIES(${name} sbtk modmetis boost tinyxml zlib)
ADD_DEPENDENCIES(${name} spblastk0.9b modmetis-4.0 boost tinyxml zlib)
IF (NEKTAR_USE_MPI)
TARGET_LINK_LIBRARIES( ${name} ${GSMPI_LIBRARY} )
......
......@@ -396,7 +396,7 @@ namespace Nektar
const std::string SessionReader::GetSessionNameRank() const
{
return m_sessionName + "_P"
+ boost::lexical_cast<std::string>(m_comm->GetRank());
+ boost::lexical_cast<std::string>(m_comm->GetRowComm()->GetRank());
}
......@@ -1072,6 +1072,7 @@ namespace Nektar
// Only do partitioning on the rank-0 proc in MPI_COMM_WORLD
if (m_comm->GetRank() == 0)
{
cout << "Partition mesh: " << vCommMesh->GetSize() << endl;
SessionReaderSharedPtr vSession = GetSharedThisPtr();
MeshPartitionSharedPtr vPartitioner = MemoryManager<MeshPartition>::AllocateSharedPtr(vSession);
vPartitioner->PartitionMesh(vCommMesh->GetSize());
......@@ -1127,6 +1128,7 @@ namespace Nektar
ASSERTL0(m_comm->GetSize() % nProcX == 0,
"Cannot exactly partition using PROC_X value.");
int nProcSem = m_comm->GetSize() / nProcX;
cout << "ProcX: " << nProcX << ", ProcSEM: " << nProcSem << endl;
m_comm->SplitComm(nProcX, nProcSem);
}
}
......
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