Commit 0e8be6b0 authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Merge branch 'master' into fix/FFTWcompiler

parents 4f56734a c0b23102
......@@ -4,8 +4,12 @@ Changelog
v4.3.2
------
**Library**:
- Add small optimisation for DriverAdaptive (!618)
- Updated FFTW build to use the compiler used for building Nektar++ (!629)
**Packaging**:
- Fixes for DEB package dependencies (!630)
v4.3.1
------
**Library**:
......
......@@ -258,6 +258,19 @@ namespace Nektar
}
}
static bool PoolCreated(std::string whichPool)
{
bool value = false;
typename ValueContainerPool::iterator x;
x = m_ValueContainerPool.find(whichPool);
if (x != m_ValueContainerPool.end())
{
value = true;
}
return value;
}
static void EnableManagement(std::string whichPool = "")
{
typename FlagContainerPool::iterator x;
......
......@@ -293,9 +293,14 @@ void DriverAdaptive::v_Execute(ostream &out)
//
// @todo This could be made better by replacing individual matrices
// within the linear system.
LibUtilities::NekManager<MultiRegions::GlobalLinSysKey,
MultiRegions::GlobalLinSys>::
ClearManager(std::string("GlobalLinSys"));
if (LibUtilities::NekManager<MultiRegions::GlobalLinSysKey,
MultiRegions::GlobalLinSys>::
PoolCreated(std::string("GlobalLinSys")))
{
LibUtilities::NekManager<MultiRegions::GlobalLinSysKey,
MultiRegions::GlobalLinSys>::
ClearManager(std::string("GlobalLinSys"));
}
int chkNumber = m_equ[0]->GetCheckpointNumber();
int chkSteps = m_equ[0]->GetCheckpointSteps();
......
......@@ -54,6 +54,8 @@ if (NEKTAR_BUILD_UTILITIES)
endif()
if (NEKTAR_BUILD_LIBRARY AND DPKG)
set(NEK_DEP "openmpi-bin")
### DEBIAN PACKAGES ############################################
# Note that the formatting of the DESCRIPTION field is VERY specific. It
# must start with a new line, each line must start with a space, and there
......@@ -65,8 +67,9 @@ if (NEKTAR_BUILD_LIBRARY AND DPKG)
DESCRIPTION "
This library provides core routines including linear algebra and integration
with ThirdParty libraries."
DEPENDS "${NEK_DEP}"
INSTALL_LIBS "${libnektar++-utilities_LIBS}")
set(NEK_DEP "libnektar++-utilities (= ${NEKTAR_VERSION})")
set(NEK_DEP "${NEK_DEP}, libnektar++-utilities (= ${NEKTAR_VERSION})")
add_nektar_package(
NAME libnektar++-stdregions
......
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