Remove unused fields of t_commrec

Change-Id: I7704117ca1c51c5e5ad50514d53c0bb0c508de43

diff --git a/src/gromacs/gmxlib/network.cpp b/src/gromacs/gmxlib/network.cpp
index d35662d81e9b7d52d9a73fce8ac5a8bada007134..fee02fe3f7b0bd0ab20357c50105150bb5ad097e 100644 (file)
--- a/src/gromacs/gmxlib/network.cpp
+++ b/src/gromacs/gmxlib/network.cpp
@@ -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,2016,2017, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2015,2016,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.
@@ -271,7 +271,6 @@ void gmx_init_intranode_counters(t_commrec *cr)
 {
     /* counters for PP+PME and PP-only processes on my physical node */
     int nrank_intranode, rank_intranode;
-    int nrank_pp_intranode, rank_pp_intranode;
     /* thread-MPI is not initialized when not running in parallel */
 #if GMX_MPI && !GMX_THREAD_MPI
     int nrank_world, rank_world;
@@ -297,8 +296,6 @@ void gmx_init_intranode_counters(t_commrec *cr)
 
     nrank_intranode    = 0;
     rank_intranode     = 0;
-    nrank_pp_intranode = 0;
-    rank_pp_intranode  = 0;
     for (i = 0; i < nrank_world; i++)
     {
         if (hash[i] == myhash)
@@ -309,14 +306,6 @@ void gmx_init_intranode_counters(t_commrec *cr)
                 rank_intranode++;
             }
         }
-        if (hash_pp[i] == myhash)
-        {
-            nrank_pp_intranode++;
-            if (thisRankHasDuty(cr, DUTY_PP) && i < rank_world)
-            {
-                rank_pp_intranode++;
-            }
-        }
     }
     sfree(hash);
     sfree(hash_s);
@@ -326,8 +315,6 @@ void gmx_init_intranode_counters(t_commrec *cr)
     /* Serial or thread-MPI code: we run within a single physical node */
     nrank_intranode    = cr->nnodes;
     rank_intranode     = cr->sim_nodeid;
-    nrank_pp_intranode = cr->nnodes - cr->npmenodes;
-    rank_pp_intranode  = cr->nodeid;
 #endif
 
     if (debug)
@@ -341,17 +328,13 @@ void gmx_init_intranode_counters(t_commrec *cr)
         {
             sprintf(sbuf, "%s", thisRankHasDuty(cr, DUTY_PP) ? "PP" : "PME");
         }
-        fprintf(debug, "On %3s rank %d: nrank_intranode=%d, rank_intranode=%d, "
-                "nrank_pp_intranode=%d, rank_pp_intranode=%d\n",
+        fprintf(debug, "On %3s rank %d: nrank_intranode=%d, rank_intranode=%d\n",
                 sbuf, cr->sim_nodeid,
-                nrank_intranode, rank_intranode,
-                nrank_pp_intranode, rank_pp_intranode);
+                nrank_intranode, rank_intranode);
     }
 
     cr->nrank_intranode    = nrank_intranode;
     cr->rank_intranode     = rank_intranode;
-    cr->nrank_pp_intranode = nrank_pp_intranode;
-    cr->rank_pp_intranode  = rank_pp_intranode;
 }
 
 

diff --git a/src/gromacs/mdtypes/commrec.h b/src/gromacs/mdtypes/commrec.h
index 0345f1edd33a67a330fc5d0645811f23b8d466ff..667d99386599646b5c35cf39dfa175df5ef9a0d0 100644 (file)
--- a/src/gromacs/mdtypes/commrec.h
+++ b/src/gromacs/mdtypes/commrec.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.
@@ -110,8 +110,6 @@ struct t_commrec {
                                            */
     int            nrank_intranode;       /* nr of ranks on this physical node */
     int            rank_intranode;        /* our rank on this physical node */
-    int            nrank_pp_intranode;    /* as nrank_intranode, for particle-particle only */
-    int            rank_pp_intranode;     /* as rank_intranode, for particle-particle only */
 
     gmx_nodecomm_t nc;