Removed unused flag PCA_CAN_READ_NODE

Change-Id: Ie3f5fca1208991688179c9acba698bda419a056e

diff --git a/src/gromacs/commandline/pargs.cpp b/src/gromacs/commandline/pargs.cpp
index 66d049a155416f6baf5da29db06e9679706507ab..311cfbbc30286ae3fb323239f7e20ac68affea1c 100644 (file)
--- a/src/gromacs/commandline/pargs.cpp
+++ b/src/gromacs/commandline/pargs.cpp
@@ -266,7 +266,7 @@ class OptionsAdapter
         /*! \brief
          * Copies values back from options to t_pargs/t_filenm.
          */
-        void copyValues(bool bReadNode);
+        void copyValues();
 
     private:
         struct FileNameData
@@ -419,15 +419,11 @@ void OptionsAdapter::pargsToOptions(Options *options, t_pargs *pa)
     GMX_THROW(NotImplementedError("Argument type not implemented"));
 }
 
-void OptionsAdapter::copyValues(bool bReadNode)
+void OptionsAdapter::copyValues()
 {
     std::list<FileNameData>::const_iterator file;
     for (file = fileNameOptions_.begin(); file != fileNameOptions_.end(); ++file)
     {
-        if (!bReadNode && (file->fnm->flag & ffREAD))
-        {
-            continue;
-        }
         if (file->optionInfo->isSet())
         {
             file->fnm->flag |= ffSET;
@@ -500,7 +496,7 @@ gmx_bool parse_common_args(int *argc, char *argv[], unsigned long Flags,
         gmx::FileNameOptionManager      fileOptManager;
 
         fileOptManager.disableInputOptionChecking(
-                isFlagSet(PCA_NOT_READ_NODE) || isFlagSet(PCA_DISABLE_INPUT_FILE_CHECKING));
+                isFlagSet(PCA_DISABLE_INPUT_FILE_CHECKING));
         options.addManager(&fileOptManager);
 
         if (isFlagSet(PCA_CAN_SET_DEFFNM))
@@ -611,7 +607,7 @@ gmx_bool parse_common_args(int *argc, char *argv[], unsigned long Flags,
             setTimeValue(TDELTA, tdelta);
         }
 
-        adapter.copyValues(!isFlagSet(PCA_NOT_READ_NODE));
+        adapter.copyValues();
 
         return TRUE;
     }

diff --git a/src/gromacs/commandline/pargs.h b/src/gromacs/commandline/pargs.h
index 915f21cf4226d2421be1ef551c386205de3b7157..b09454ff87ede63372277928c8d4579ec5cb53a2 100644 (file)
--- a/src/gromacs/commandline/pargs.h
+++ b/src/gromacs/commandline/pargs.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013,2014,2015,2017, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2015,2017,2018, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -232,8 +232,6 @@ gmx_bool opt2parg_bSet(const char *option, int nparg, const t_pargs *pa);
 #define PCA_CAN_SET_DEFFNM (1<<10)
 /** Do not raise a fatal error when invalid options are encountered. */
 #define PCA_NOEXIT_ON_ARGS (1<<11)
-/** Is this node not reading: for parallel all nodes but the master */
-#define PCA_NOT_READ_NODE  (1<<16)
 /** Don't do any special processing for ffREAD files */
 #define PCA_DISABLE_INPUT_FILE_CHECKING (1<<17)
 

diff --git a/src/gromacs/commandline/tests/pargs.cpp b/src/gromacs/commandline/tests/pargs.cpp
index 0eb9a17a3e7ae76f08e18494607d917e7a746119..1d8a7b47e33d4aca1723050ef754862298b260ae 100644 (file)
--- a/src/gromacs/commandline/tests/pargs.cpp
+++ b/src/gromacs/commandline/tests/pargs.cpp
@@ -536,44 +536,6 @@ TEST_F(ParseCommonArgsTest, CompletesExtensionFromExistingFileWithDefaultFileNam
     done_filenms(nfile(), fnm);
 }
 
-/********************************************************************
- * Tests for general behavior
- */
-
-TEST_F(ParseCommonArgsTest, HandlesNonReadNode)
-{
-    t_filenm          fnm[] = {
-        { efTPS, "-s",  nullptr,  ffREAD },
-        { efTRX, "-f",  nullptr,  ffREAD },
-        { efTRX, "-f2", nullptr,  ffREAD }
-    };
-    const char *const cmdline[] = {
-        "test", "-f", "-f2", "other"
-    };
-    parseFromArray(cmdline, PCA_NOT_READ_NODE, fnm, gmx::EmptyArrayRef());
-    EXPECT_EQ(nullptr, fnm[0].fns);
-    EXPECT_EQ(nullptr, fnm[1].fns);
-    EXPECT_EQ(nullptr, fnm[2].fns);
-    done_filenms(nfile(), fnm);
-}
-
-TEST_F(ParseCommonArgsTest, HandlesNonReadNodeWithDefaultFileName)
-{
-    t_filenm          fnm[] = {
-        { efTPS, "-s",  nullptr,  ffREAD },
-        { efTRX, "-f",  nullptr,  ffREAD },
-        { efTRX, "-f2", nullptr,  ffREAD }
-    };
-    const char *const cmdline[] = {
-        "test", "-deffnm", "def", "-f", "-f2", "other"
-    };
-    parseFromArray(cmdline, PCA_CAN_SET_DEFFNM | PCA_NOT_READ_NODE, fnm, gmx::EmptyArrayRef());
-    EXPECT_EQ(nullptr, fnm[0].fns);
-    EXPECT_EQ(nullptr, fnm[1].fns);
-    EXPECT_EQ(nullptr, fnm[2].fns);
-    done_filenms(nfile(), fnm);
-}
-
 // This is needed e.g. for tune_pme, which passes unknown arguments on
 // to child mdrun processes that it spawns.
 TEST_F(ParseCommonArgsTest, CanKeepUnknownArgs)