Merge branch release-4-6

[alexxy/gromacs.git] / src / gromacs / gmxana / gmx_tune_pme.c

diff --git a/src/gromacs/gmxana/gmx_tune_pme.c b/src/gromacs/gmxana/gmx_tune_pme.c
index 9231655c1ef4f5e85c0933008b59ca009fa01ec7..d611bca21e028091c991459837a64fc5b936eab7 100644 (file)
--- a/src/gromacs/gmxana/gmx_tune_pme.c
+++ b/src/gromacs/gmxana/gmx_tune_pme.c
@@ -73,6 +73,7 @@ enum {
     eParselogNoDDGrid,
     eParselogTPXVersion,
     eParselogNotParallel,
+    eParselogLargePrimeFactor,
     eParselogFatal,
     eParselogNr
 };
@@ -285,6 +286,11 @@ static int parse_logfile(const char *logfile, const char *errfile,
                     fclose(fp);
                     return eParselogNoDDGrid;
                 }
+                else if (str_starts(line, "The number of nodes you selected"))
+                {
+                    fclose(fp);
+                    return eParselogLargePrimeFactor;
+                }
                 else if (str_starts(line, "reading tpx file"))
                 {
                     fclose(fp);
@@ -1380,6 +1386,7 @@ static void do_the_tests(
         "No DD grid found for these settings.",
         "TPX version conflict!",
         "mdrun was not started in parallel!",
+        "Number of PP nodes has a prime factor that is too large.",
         "An error occured."
     };
     char        str_PME_f_load[13];