From 306e4d49264e03bbb46be49b598fa68800593ea7 Mon Sep 17 00:00:00 2001 From: Mark Abraham Date: Fri, 20 Sep 2019 17:50:08 +0200 Subject: [PATCH] Fix 1D-1pulse support Passed the correct rank count to the new checking function Change-Id: Ib27ba5112a50894dbb0f1a2eb68bba53204270e3 --- src/gromacs/domdec/domdec.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gromacs/domdec/domdec.cpp b/src/gromacs/domdec/domdec.cpp index 71a40d40fc..80180c8113 100644 --- a/src/gromacs/domdec/domdec.cpp +++ b/src/gromacs/domdec/domdec.cpp @@ -3015,8 +3015,6 @@ canMake1DAnd1PulseDomainDecomposition(const DDSettings &ddSettingsO DDSystemInfo systemInfo = getSystemInfo(dummyLogger, cr, options, &mtop, &ir, box, xGlobal); - int numPPRanksRequested = numRanksRequested - (EEL_PME(ir.coulombtype) ? options.numPmeRanks : 0); - DDSettings ddSettings = ddSettingsOriginal; ddSettings.request1DAnd1Pulse = true; const real gridSetupCellsizeLimit = getDDGridSetupCellSizeLimit(dummyLogger, ddSettings.request1DAnd1Pulse, @@ -3024,7 +3022,7 @@ canMake1DAnd1PulseDomainDecomposition(const DDSettings &ddSettingsO options.dlbScaling, ir, systemInfo.cellsizeLimit); gmx_ddbox_t ddbox = {0}; - DDGridSetup ddGridSetup = getDDGridSetup(dummyLogger, cr, numPPRanksRequested, options, + DDGridSetup ddGridSetup = getDDGridSetup(dummyLogger, cr, numRanksRequested, options, ddSettings, systemInfo, gridSetupCellsizeLimit, mtop, ir, box, xGlobal, &ddbox); -- 2.11.4.GIT