Commit c9041a1a authored by Dave Moxey's avatar Dave Moxey
Browse files

Merge branch 'master' into fix/namespace-pollution

parents 08ab74de 4446a1ad
......@@ -8,6 +8,8 @@ v4.3.1
is not compiled with SSL support. (!602)
- Fix Homogeneous transform when unshuffling is not used. (!599)
- Fix namespace pollution in library header files. (!601)
- Fix bug in modified Arnoldi algorithm causing convergence to be reported when
number of vectors is less than `nvec` (!608)
**NekMesh**:
- Fix incorrect link directory on CCMIO library.
......
......@@ -17,7 +17,7 @@ IF(NEKTAR_USE_MESHGEN)
EXTERNALPROJECT_ADD(
tetgen-1.5
PREFIX ${TPSRC}
URL http://ae-nektar.ae.ic.ac.uk/~mt4313/tetgen.zip
URL ${TPURL}/tetgen.zip
URL_MD5 6d62e63f9b1e7a8ce53d5bc87e6a0a09
STAMP_DIR ${TPBUILD}/stamp
DOWNLOAD_DIR ${TPSRC}
......
......@@ -17,7 +17,7 @@ IF(NEKTAR_USE_MESHGEN)
EXTERNALPROJECT_ADD(
triangle-1.6
PREFIX ${TPSRC}
URL http://ae-nektar.ae.ic.ac.uk/~mt4313/triangle.zip
URL ${TPURL}/triangle.zip
URL_MD5 357cb7107f51f3f89940c47435d4fa49
STAMP_DIR ${TPBUILD}/stamp
DOWNLOAD_DIR ${TPSRC}
......
......@@ -102,6 +102,8 @@ void DriverArnoldi::v_InitObject(ostream &out)
m_session->LoadParameter("nits", m_nits, 500);
m_session->LoadParameter("evtol", m_evtol, 1e-06);
ASSERTL0( m_kdim >= m_nvec, "nvec cannot be larger than kdim.");
m_session->LoadParameter("realShift", m_realShift, 0.0);
m_equ[0]->SetLambda(m_realShift);
......
......@@ -193,7 +193,14 @@ void DriverModifiedArnoldi::v_Execute(ostream &out)
// Test for convergence.
converged = EV_test(i, i, zvec, wr, wi, resnorm,
std::min(i, m_nvec), evlout, resid0);
converged = max (converged, 0);
if ( i >= m_nvec)
{
converged = max (converged, 0);
}
else
{
converged = 0;
}
if (m_comm->GetRank() == 0)
{
......
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