portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2026-07-18 08:03:27 +01:00
Code Releases Activity

Changing definition of Nm and Nk in BlockKrylovSchur

Browse Source
This commit is contained in:
Chulwoo Jung
2026-04-02 15:22:21 -04:00
parent 88ea24687f
commit 84707cc3a8
4 changed files with 62 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/lanczos/Test_blocked_krylov_schur.cc
+5 -5
View File
@@ -68,7 +68,7 @@ int main(int argc, char** argv)
int maxIter, int Nstop) {
std::cout << GridLogMessage << "===== " << label << " =====" << std::endl;
BlockedKrylovSchur<Field> bks(op, grid, 1e-6, EvalReSmall);
BlockKrylovSchur<Field> bks(op, grid, 1e-6, EvalReSmall);
std::vector<Field> v0(Nblock, Field(grid));
for (int t = 0; t < Nblock; t++) random(RNG, v0[t]);
@@ -79,17 +79,17 @@ int main(int argc, char** argv)
std::cout << GridLogMessage << label << " done." << std::endl;
};
// Test 1: Nblock=1 — scalar case, regression
// Test 1: Nblock=1 — scalar case, regression (Nm,Nk now total vectors)
runTest("Nblock=1 Nm=10 Nk=5 maxIter=3", 1, 10, 5, 3, 5);
// Test 2: Nblock=2 — exercises the B^H fix for off-diagonal elements
runTest("Nblock=2 Nm=8 Nk=4 maxIter=3", 2, 8, 4, 3, 4);
runTest("Nblock=2 Nm=16 Nk=8 maxIter=3", 2, 16, 8, 3, 4);
// Test 3: Nblock=3 — further stress-test the B^H fix
runTest("Nblock=3 Nm=9 Nk=3 maxIter=3", 3, 9, 3, 3, 3);
runTest("Nblock=3 Nm=27 Nk=9 maxIter=3", 3, 27, 9, 3, 3);
// Test 4: Nblock=2, larger cycle — more restarts
runTest("Nblock=2 Nm=12 Nk=6 maxIter=5", 2, 12, 6, 5, 6);
runTest("Nblock=2 Nm=24 Nk=12 maxIter=5", 2, 24, 12, 5, 6);
if (nFail == 0)
std::cout << GridLogMessage << "All BlockedKrylovSchur tests completed." << std::endl;
tests/lanczos/Test_harmonic_vs_krylov_schur.cc
+6 -6
View File
@@ -62,8 +62,8 @@ int main(int argc, char** argv)
// Parameters (kept small so output is readable)
//----------------------------------------------------------------------
const int Nblock = 2;
const int Nm = 6;
const int Nk = 3;
const int Nm = 12; // total vectors (= 6 blocks * Nblock=2)
const int Nk = 6; // total kept (= 3 blocks * Nblock=2)
const int Nstop = 2;
const int maxIter = 4;
const RealD tol = 1e-6;
@@ -82,12 +82,12 @@ int main(int argc, char** argv)
std::cout << GridLogMessage
<< "\n========================================" << std::endl;
std::cout << GridLogMessage
<< " BlockedKrylovSchur (Nblock=" << Nblock
<< " BlockKrylovSchur (Nblock=" << Nblock
<< " Nm=" << Nm << " Nk=" << Nk << ")" << std::endl;
std::cout << GridLogMessage
<< "========================================\n" << std::endl;
BlockedKrylovSchur<Field> bks(op, grid, tol, EvalReSmall);
BlockKrylovSchur<Field> bks(op, grid, tol, EvalReSmall);
bks(v0, maxIter, Nm, Nk, Nstop, Nblock,
/*doubleOrthog=*/true, /*doVerify=*/true);
@@ -103,12 +103,12 @@ int main(int argc, char** argv)
std::cout << GridLogMessage
<< "\n========================================" << std::endl;
std::cout << GridLogMessage
<< " HarmonicBlockedKrylovSchur (Nblock=" << Nblock
<< " HarmonicBlockKrylovSchur (Nblock=" << Nblock
<< " Nm=" << Nm << " Nk=" << Nk << " shift=0)" << std::endl;
std::cout << GridLogMessage
<< "========================================\n" << std::endl;
HarmonicBlockedKrylovSchur<Field> hbks(op, grid, tol, 0.0, EvalNormSmall);
HarmonicBlockKrylovSchur<Field> hbks(op, grid, tol, 0.0, EvalNormSmall);
hbks(v0b, maxIter, Nm, Nk, Nstop, Nblock,
/*doubleOrthog=*/true, /*doVerify=*/true);