Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / mdlib / pme_pp.c

diff --git a/src/gromacs/mdlib/pme_pp.c b/src/gromacs/mdlib/pme_pp.c
index 4721349a7d02edc621efdf72f2446d71059e7aaf..ffc50ba8b1d1f10c1db2b2c8920fdd206061eaab 100644 (file)
--- a/src/gromacs/mdlib/pme_pp.c
+++ b/src/gromacs/mdlib/pme_pp.c
@@ -190,7 +190,7 @@ static void gmx_pme_send_coeffs_coords(t_commrec *cr, int flags,
 
     if (debug)
     {
-        fprintf(debug, "PP node %d sending to PME node %d: %d%s%s\n",
+        fprintf(debug, "PP rank %d sending to PME rank %d: %d%s%s\n",
                 cr->sim_nodeid, dd->pme_nodeid, n,
                 flags & PP_PME_CHARGE ? " charges" : "",
                 flags & PP_PME_COORD  ? " coordinates" : "");
@@ -444,7 +444,7 @@ int gmx_pme_recv_coeffs_coords(struct gmx_pme_pp          *pme_pp,
 
         if (debug)
         {
-            fprintf(debug, "PME only node receiving:%s%s%s%s%s\n",
+            fprintf(debug, "PME only rank receiving:%s%s%s%s%s\n",
                     (cnb.flags & PP_PME_CHARGE)        ? " charges" : "",
                     (cnb.flags & PP_PME_COORD )        ? " coordinates" : "",
                     (cnb.flags & PP_PME_FINISH)        ? " finish" : "",
@@ -561,7 +561,7 @@ int gmx_pme_recv_coeffs_coords(struct gmx_pme_pp          *pme_pp,
                         nat += pme_pp->nat[sender];
                         if (debug)
                         {
-                            fprintf(debug, "Received from PP node %d: %d "
+                            fprintf(debug, "Received from PP rank %d: %d "
                                     "charges\n",
                                     pme_pp->node[sender], pme_pp->nat[sender]);
                         }
@@ -576,7 +576,7 @@ int gmx_pme_recv_coeffs_coords(struct gmx_pme_pp          *pme_pp,
         {
             if (!(pme_pp->flags_charge & (PP_PME_CHARGE | PP_PME_SQRTC6)))
             {
-                gmx_incons("PME-only node received coordinates before charges and/or C6-values"
+                gmx_incons("PME-only rank received coordinates before charges and/or C6-values"
                            );
             }
 
@@ -594,13 +594,13 @@ int gmx_pme_recv_coeffs_coords(struct gmx_pme_pp          *pme_pp,
 
             if (*bFreeEnergy_q && !(pme_pp->flags_charge & PP_PME_CHARGEB))
             {
-                gmx_incons("PME-only node received free energy request, but "
+                gmx_incons("PME-only rank received free energy request, but "
                            "did not receive B-state charges");
             }
 
             if (*bFreeEnergy_lj && !(pme_pp->flags_charge & PP_PME_SQRTC6B))
             {
-                gmx_incons("PME-only node received free energy request, but "
+                gmx_incons("PME-only rank received free energy request, but "
                            "did not receive B-state C6-values");
             }
 
@@ -617,7 +617,7 @@ int gmx_pme_recv_coeffs_coords(struct gmx_pme_pp          *pme_pp,
                     nat += pme_pp->nat[sender];
                     if (debug)
                     {
-                        fprintf(debug, "Received from PP node %d: %d "
+                        fprintf(debug, "Received from PP rank %d: %d "
                                 "coordinates\n",
                                 pme_pp->node[sender], pme_pp->nat[sender]);
                     }
@@ -660,7 +660,7 @@ static void receive_virial_energy(t_commrec *cr,
         if (debug)
         {
             fprintf(debug,
-                    "PP node %d receiving from PME node %d: virial and energy\n",
+                    "PP rank %d receiving from PME rank %d: virial and energy\n",
                     cr->sim_nodeid, cr->dd->pme_nodeid);
         }
 #ifdef GMX_MPI
@@ -771,7 +771,7 @@ void gmx_pme_send_force_vir_ener(struct gmx_pme_pp *pme_pp,
 
     if (debug)
     {
-        fprintf(debug, "PME node sending to PP node %d: virial and energy\n",
+        fprintf(debug, "PME rank sending to PP rank %d: virial and energy\n",
                 pme_pp->node_peer);
     }
 #ifdef GMX_MPI