CarpetLib: Use "process" instead of "processor" in comments and output

15 files changed, 43 insertions, 43 deletions

diff --git a/Carpet/CarpetLib/src/commstate.cc b/Carpet/CarpetLib/src/commstate.cc
index 19095864f..25a7a7f29 100644
--- a/Carpet/CarpetLib/src/commstate.cc
+++ b/Carpet/CarpetLib/src/commstate.cc
@@ -161,7 +161,7 @@ void comm_state::step ()
             int const tag = type;
             if (commstate_verbose) {
               CCTK_VInfo (CCTK_THORNSTRING,
-                          "About to MPI_Irecv from processor %d for type %s",
+                          "About to MPI_Irecv from process %d for type %s",
                           proc, dist::c_datatype_name(type));
             }
             MPI_Irecv (&procbuf.recvbufbase.front(),
@@ -233,7 +233,7 @@ void comm_state::step ()
                 timer.start ();
                 if (commstate_verbose) {
                   CCTK_VInfo (CCTK_THORNSTRING,
-                              "About to MPI_Send to processor %d for type %s",
+                              "About to MPI_Send to process %d for type %s",
                               proc, dist::c_datatype_name(type));
                 }
                 MPI_Send (const_cast<char*>(&procbuf.sendbufbase.front()),
@@ -252,7 +252,7 @@ void comm_state::step ()
                 timer.start ();
                 if (commstate_verbose) {
                   CCTK_VInfo (CCTK_THORNSTRING,
-                              "About to MPI_Ssend to processor %d for type %s",
+                              "About to MPI_Ssend to process %d for type %s",
                               proc, dist::c_datatype_name(type));
                 }
                 MPI_Ssend (const_cast<char*>(&procbuf.sendbufbase.front()),
@@ -271,7 +271,7 @@ void comm_state::step ()
                 timer.start ();
                 if (commstate_verbose) {
                   CCTK_VInfo (CCTK_THORNSTRING,
-                              "About to MPI_Isend to processor %d for type %s",
+                              "About to MPI_Isend to process %d for type %s",
                               proc, dist::c_datatype_name(type));
                 }
                 MPI_Isend (const_cast<char*>(&procbuf.sendbufbase.front()),
@@ -366,7 +366,7 @@ void comm_state::step ()
               int const tag = type;
               if (commstate_verbose) {
                 CCTK_VInfo (CCTK_THORNSTRING,
-                            "About to MPI_Irecv from processor %d for type %s",
+                            "About to MPI_Irecv from process %d for type %s",
                             proc, dist::c_datatype_name(type));
               }
               MPI_Irecv (&procbuf.recvbufbase.front(),
@@ -404,7 +404,7 @@ void comm_state::step ()
               timer.start ();
               if (commstate_verbose) {
                 CCTK_VInfo (CCTK_THORNSTRING,
-                            "About to MPI_Isend to processor %d for type %s",
+                            "About to MPI_Isend to process %d for type %s",
                             proc, dist::c_datatype_name(type));
               }
               MPI_Isend (const_cast<char*>(&procbuf.sendbufbase.front()),
@@ -609,7 +609,7 @@ commit_send_space (unsigned const type,
       timer.start ();
       if (commstate_verbose) {
         CCTK_VInfo (CCTK_THORNSTRING,
-                    "About to MPI_Isend to processor %d for type %s",
+                    "About to MPI_Isend to process %d for type %s",
                     proc, dist::c_datatype_name(type));
       }
       int const tag = type;
diff --git a/Carpet/CarpetLib/src/commstate.hh b/Carpet/CarpetLib/src/commstate.hh
index 773949356..b5f0c55b1 100644
--- a/Carpet/CarpetLib/src/commstate.hh
+++ b/Carpet/CarpetLib/src/commstate.hh
@@ -58,7 +58,7 @@ private:
   
   
   
-  // structure describing a per-processor buffer
+  // structure describing a per-process buffer
   struct procbufdesc {
     // allocated communication buffers
     vector<char> sendbufbase;
@@ -98,7 +98,7 @@ private:
     // the size of this datatype (in bytes)
     int datatypesize;
     
-    // per-processor buffers
+    // per-process buffers
     vector<procbufdesc> procbufs; // [dist::size()]
     
     // constructor for an instance of this structure
diff --git a/Carpet/CarpetLib/src/data.hh b/Carpet/CarpetLib/src/data.hh
index 9a40f9bfa..e64899ae0 100644
--- a/Carpet/CarpetLib/src/data.hh
+++ b/Carpet/CarpetLib/src/data.hh
@@ -26,7 +26,7 @@ class data: public gdata
 {
   
   // Fields
-  mem<T> * _memory;             // the data (if located on this processor)
+  mem<T> * _memory;             // the data (if located on this process)
   
   // For vector groups with contiguous storage
   int vectorlength;             // number of vector elements
diff --git a/Carpet/CarpetLib/src/dh.cc b/Carpet/CarpetLib/src/dh.cc
index f569252d1..55158ab93 100644
--- a/Carpet/CarpetLib/src/dh.cc
+++ b/Carpet/CarpetLib/src/dh.cc
@@ -157,7 +157,7 @@ prolongation_stencil_size (int const rl)
 
 // Modifiers
 
-// Calculate this quantity on this processor?  It does not need to be
+// Calculate this quantity on this process? It does not need to be
 // calculated if it won't be used later on.
 inline
 int
diff --git a/Carpet/CarpetLib/src/dist.cc b/Carpet/CarpetLib/src/dist.cc
index 66b84c9c3..de46bf74a 100644
--- a/Carpet/CarpetLib/src/dist.cc
+++ b/Carpet/CarpetLib/src/dist.cc
@@ -439,7 +439,7 @@ namespace dist {
     if (verbose) {
       int rank;
       MPI_Comm_rank (comm(), &rank);
-      printf ("CHECKPOINT: processor %d, file %s, line %d\n",
+      printf ("CHECKPOINT: process %d, file %s, line %d\n",
 	      rank, file, line);
     }
     if (barriers) {
diff --git a/Carpet/CarpetLib/src/dist.hh b/Carpet/CarpetLib/src/dist.hh
index 8634ed0ae..f28474ec0 100644
--- a/Carpet/CarpetLib/src/dist.hh
+++ b/Carpet/CarpetLib/src/dist.hh
@@ -158,7 +158,7 @@ namespace dist {
     return comm_ != MPI_COMM_NULL ? comm_ : MPI_COMM_WORLD;
   }
   
-  // Rank in the communicator (this processor's number, 0 .. size-1)
+  // Rank in the communicator (this process's number, 0 .. size-1)
   inline int rank ()
   {
     static int rank_ = -1;
diff --git a/Carpet/CarpetLib/src/gdata.cc b/Carpet/CarpetLib/src/gdata.cc
index 67acbe453..0a3d81803 100644
--- a/Carpet/CarpetLib/src/gdata.cc
+++ b/Carpet/CarpetLib/src/gdata.cc
@@ -259,7 +259,7 @@ transfer_from (comm_state & state,
   assert (my_transport_operator != op_none); // why should we be here?
   if (my_transport_operator == op_none) return;
   
-  // Interpolate either on the source or on the destination processor,
+  // Interpolate either on the source or on the destination process,
   // depending on whether this increases or reduces the amount of data
   int timelevel0, ntimelevels;
   find_source_timelevel
@@ -273,7 +273,7 @@ transfer_from (comm_state & state,
   switch (state.thestate) {
     
   case state_get_buffer_sizes:
-    // don't count processor-local copies
+    // don't count process-local copies
     if (not (is_dst and is_src)) {
       if (is_dst) {
         // increment the recv buffer size
@@ -327,7 +327,7 @@ transfer_from (comm_state & state,
     break;
     
   case state_do_some_work:
-    // handle the processor-local case
+    // handle the process-local case
     if (is_dst and is_src) {
       transfer_from_innerloop
         (srcs, times, dstbox, srcbox, slabinfo, time, order_space, order_time);
diff --git a/Carpet/CarpetLib/src/gdata.hh b/Carpet/CarpetLib/src/gdata.hh
index 129fccc1c..230a6583c 100644
--- a/Carpet/CarpetLib/src/gdata.hh
+++ b/Carpet/CarpetLib/src/gdata.hh
@@ -66,10 +66,10 @@ protected:
   centering cent;
   operator_type transport_operator;
   
-  bool _has_storage;		// has storage associated (on some processor)
+  bool _has_storage;		// has storage associated (on some process)
   int _size;			// size
 
-  int _proc;			// stored on processor
+  int _proc;			// stored on process
   
   ivect _shape;                 // shape
   ivect _padded_shape, _stride; // allocated shape and index order
diff --git a/Carpet/CarpetLib/src/gh.cc b/Carpet/CarpetLib/src/gh.cc
index e78786107..545d5fc33 100644
--- a/Carpet/CarpetLib/src/gh.cc
+++ b/Carpet/CarpetLib/src/gh.cc
@@ -476,7 +476,7 @@ locate_position (rvect const & rpos,
     
     // Search all superregions linearly. Each superregion corresponds
     // to a "refined region", and the number of superregions is thus
-    // presumably independent of the number of processors.
+    // presumably independent of the number of processes.
     for (size_t r = 0; r < regs.size(); ++r) {
       region_t const & reg = regs.AT(r);
       if (reg.extent.contains(aligned_ipos)) {
@@ -537,7 +537,7 @@ locate_position (ivect const & ipos,
     
     // Search all superregions linearly. Each superregion corresponds
     // to a "refined region", and the number of superregions is thus
-    // presumably independent of the number of processors.
+    // presumably independent of the number of processes.
     for (size_t r = 0; r < regs.size(); ++r) {
       region_t const & reg = regs.AT(r);
       if (reg.extent.contains(aligned_ipos)) {
diff --git a/Carpet/CarpetLib/src/gh.hh b/Carpet/CarpetLib/src/gh.hh
index 2a12a5c91..ef6198e0f 100644
--- a/Carpet/CarpetLib/src/gh.hh
+++ b/Carpet/CarpetLib/src/gh.hh
@@ -58,7 +58,7 @@ private:
 public:
   
   // Extents of the regions before distributing them over the
-  // processors
+  // processes
   rregs superregions;
   
   mregs regions;                // extents and properties of all grids
diff --git a/Carpet/CarpetLib/src/memstat.cc b/Carpet/CarpetLib/src/memstat.cc
index 3d03efe77..25a19d95c 100644
--- a/Carpet/CarpetLib/src/memstat.cc
+++ b/Carpet/CarpetLib/src/memstat.cc
@@ -164,7 +164,7 @@ void CarpetLib_printmemstats (CCTK_ARGUMENTS)
               = static_cast<char const *> (UniqueSimulationID (cctkGH));
             file << "# Simulation ID: " << job_id << eol;
           }
-          file << "# Running on " << dist::size() << " processors" << eol;
+          file << "# Running on " << dist::size() << " processes" << eol;
           file << "#" << eol;
           file << "# iteration   maxtotalbytes avgtotalbytes   maxmaxbytes avgm avgfreebytes" << eol;
         } else {
@@ -181,7 +181,7 @@ void CarpetLib_printmemstats (CCTK_ARGUMENTS)
         
         file.close ();
         
-      } // if on root processor
+      } // if on root process
     } // if output to file
     
   }
diff --git a/Carpet/CarpetLib/src/mpi_string.cc b/Carpet/CarpetLib/src/mpi_string.cc
index 14131022e..a83dcaa1a 100644
--- a/Carpet/CarpetLib/src/mpi_string.cc
+++ b/Carpet/CarpetLib/src/mpi_string.cc
@@ -36,7 +36,7 @@ namespace CarpetLib
     
     if (rank == root) {
       
-      // Get the total number of processors
+      // Get the total number of processes
       int num_procs;
       MPI_Comm_size (comm, & num_procs);
       
@@ -104,7 +104,7 @@ namespace CarpetLib
   allgather_string (MPI_Comm const comm,
                     string const & data)
   {
-    // Get the total number of processors
+    // Get the total number of processes
     int num_procs;
     MPI_Comm_size (comm, & num_procs);
     
@@ -151,7 +151,7 @@ namespace CarpetLib
   alltoallv_string (MPI_Comm const comm,
                     vector<string> const & data)
   {
-    // Get the total number of processors
+    // Get the total number of processes
     int num_procs;
     MPI_Comm_size (comm, & num_procs);
     
diff --git a/Carpet/CarpetLib/src/mpi_string.hh b/Carpet/CarpetLib/src/mpi_string.hh
index 12cfbacd8..980df5c47 100644
--- a/Carpet/CarpetLib/src/mpi_string.hh
+++ b/Carpet/CarpetLib/src/mpi_string.hh
@@ -79,7 +79,7 @@ namespace CarpetLib
               vector <T> const & data)
   {
     // cerr << "QQQ: allgatherv[0]" << endl;
-    // Get the total number of processors
+    // Get the total number of processes
     int num_procs;
     MPI_Comm_size (comm, & num_procs);
     
@@ -162,7 +162,7 @@ namespace CarpetLib
                vector <T> const & data)
   {
     // cerr << "QQQ: allgatherv[0]" << endl;
-    // Get the total number of processors
+    // Get the total number of processes
     int num_procs;
     MPI_Comm_size (comm, & num_procs);
     
@@ -231,7 +231,7 @@ namespace CarpetLib
   alltoall (MPI_Comm const comm,
             vector <T> const & data)
   {
-    // Get the total number of processors
+    // Get the total number of processes
     int num_procs;
     MPI_Comm_size (comm, & num_procs);
     
@@ -255,7 +255,7 @@ namespace CarpetLib
   alltoallv (MPI_Comm const comm,
              vector <vector <T> > const & data)
   {
-    // Get the total number of processors
+    // Get the total number of processes
     int num_procs;
     MPI_Comm_size (comm, & num_procs);
     
@@ -327,7 +327,7 @@ namespace CarpetLib
   alltoallv1 (MPI_Comm const comm,
               vector <vector <T> > const & data)
   {
-    // Get the total number of processors
+    // Get the total number of processes
     int num_procs;
     MPI_Comm_size (comm, & num_procs);
     
diff --git a/Carpet/CarpetLib/src/region.cc b/Carpet/CarpetLib/src/region.cc
index 548b24fc2..99d8c1697 100644
--- a/Carpet/CarpetLib/src/region.cc
+++ b/Carpet/CarpetLib/src/region.cc
@@ -137,9 +137,9 @@ region_t::split (CCTK_REAL const ratio_new_over_old)
 
 
 
-// Combine a collection of regions.  Regions can be combined if they
+// Combine a collection of regions. Regions can be combined if they
 // abutt on boundaries which are not outer boundaries, ignoring the
-// processor distribution.  This should lead to a canonical
+// process distribution. This should lead to a canonical
 // representations of collections of regions.
 //
 // We use vectors to represent the collection, but we could also use
@@ -294,14 +294,14 @@ bool region_t::check_region(bool const is_superregion) const
   assert(map >= 0);
   
   if (is_superregion) {
-    // Checking a superregion: a tree without processor assignments
+    // Checking a superregion: a tree without process assignments
     
     if (processor != -1) {
-      CCTK_WARN(CCTK_WARN_PICKY, "processor number is defined");
+      CCTK_WARN(CCTK_WARN_PICKY, "process number is defined");
       return false;
     }
     if (not processors) {
-      CCTK_WARN(CCTK_WARN_PICKY, "processor tree not defined");
+      CCTK_WARN(CCTK_WARN_PICKY, "process tree not defined");
       return false;
     }
     
@@ -314,15 +314,15 @@ bool region_t::check_region(bool const is_superregion) const
     }
     
   } else {
-    // Checking a regular region: no tree structure, but has a
-    // processor assignment
+    // Checking a regular region: no tree structure, but has a process
+    // assignment
     
     if (processor < 0 or processor >= dist::size()) {
-      CCTK_WARN(CCTK_WARN_PICKY, "processor number not defined");
+      CCTK_WARN(CCTK_WARN_PICKY, "process number not defined");
       return false;
     }
     if (processors) {
-      CCTK_WARN(CCTK_WARN_PICKY, "processor tree is defined");
+      CCTK_WARN(CCTK_WARN_PICKY, "process tree is defined");
       return false;
     }
     
diff --git a/Carpet/CarpetLib/src/region.hh b/Carpet/CarpetLib/src/region.hh
index e5f36011c..f28fe2d81 100644
--- a/Carpet/CarpetLib/src/region.hh
+++ b/Carpet/CarpetLib/src/region.hh
@@ -17,8 +17,8 @@ struct region_t {
   ibbox        extent;           // extent
   b2vect       outer_boundaries; // outer boundaries
   int          map;              // map to which this region belongs
-  int          processor;        // processor number
-  ipfulltree * processors;       // processor decomposition
+  int          processor;        // process number
+  ipfulltree * processors;       // process decomposition
   
   region_t ();
   region_t (region_t const & a);
@@ -38,7 +38,7 @@ private:
                       ibset& child_extents) const;
 public:
   
-  // Output processor decomposition? (Off by default.)
+  // Output process decomposition? (Off by default.)
   static bool full_output;
 };