Merge branch '412-cleanup-remove-ippl_comm_alarms' into 'master'

Resolve "cleanup: remove IPPL_COMM_ALARMS"

Closes #412

See merge request !223

ippl/src/Utility/IpplInfo.cpp

@@ -132,16 +132,6 @@ bool IpplInfo::offsetStorage = false;
 bool IpplInfo::extraCompressChecks = false;
 bool IpplInfo::useDirectIO = false;
 
-
-#ifdef IPPL_COMM_ALARMS
-// A timeout quantity, in seconds, to allow us to wait a certain number
-// of seconds before we signal a timeout when we're trying to rece
-// a message.  By default, this will be zero; change it with the
-// --msgtimeout <seconds> flag
-unsigned int IpplInfo::CommTimeoutSeconds = 0;
-#endif
-
-
 /////////////////////////////////////////////////////////////////////
 // print out current state to the given output stream
 std::ostream& operator<<(std::ostream& o, const IpplInfo&) {
@@ -174,13 +164,6 @@ std::ostream& operator<<(std::ostream& o, const IpplInfo&) {
     o << "  Use Direct-IO? " << IpplInfo::useDirectIO << "\n";
 #endif
 
-#ifdef IPPL_COMM_ALARMS
-    if (IpplInfo::getCommTimeout() > 0) {
-        o << "  Allowed message receive timeout length (in seconds): ";
-        o << IpplInfo::getCommTimeout() << "\n";
-    }
-#endif
-
     o << "  Elapsed wall-clock time (in seconds): ";
     o << IpplInfo::Stats->getTime().clock_time() << "\n";
     o << "  Elapsed CPU-clock time (in seconds) : ";
@@ -495,16 +478,6 @@ IpplInfo::IpplInfo(int& argc, char**& argv, int removeargs, MPI_Comm mpicomm) {
                     param_error(argv[i],
                             "Please specify a timeout value (in seconds)", 0);
                 }
-#ifdef IPPL_COMM_ALARMS
-            } else if ( ( strcmp(argv[i], "--msgtimeout") == 0 ) ) {
-                // Set the timeout period for receiving messages
-                if ( (i + 1) < argc && argv[i+1][0] != '-' && atoi(argv[i+1]) >= 0 )
-                    CommTimeoutSeconds = atoi(argv[++i]);
-                else
-                    param_error(argv[i],
-                            "Please specify a timeout value (in seconds)", 0);
-#endif
-
             } else if ( ( strcmp(argv[i], "--defergcfill") == 0 ) ) {
                 // Turn on the defer guard cell fill optimization
                 deferGuardCellFills = true;
@@ -878,9 +851,6 @@ void IpplInfo::printHelp(char** argv) {
     INFOMSG("   --nofieldcompression: Turn off compression in the Field classes.\n");
     INFOMSG("   --offsetstorage     : Turn on random LField storage offsets.\n");
     INFOMSG("   --extracompcheck    : Turn on extra compression checks in evaluator.\n");
-#ifdef IPPL_COMM_ALARMS
-    INFOMSG("   --msgtimeout <n>    : Set receive timeout time, in secs.\n");
-#endif
     INFOMSG("   --checksums         : Turn on CRC checksums for messages.\n");
     INFOMSG("   --retransmit        : Resent messages if a CRC error occurs.\n");
     INFOMSG("   --maxfftnodes <n>   : Limit the nodes that work on FFT's.\n");
@@ -1133,10 +1103,6 @@ void IpplInfo::stash() {
     obj.ChunkSize =           ChunkSize;
     obj.PerSMPParallelIO =    PerSMPParallelIO;
 
-#ifdef IPPL_COMM_ALARMS
-    obj.CommTimeoutSeconds = CommTimeoutSeconds;
-#endif
-
     stashedStaticMembers.push(obj);
 
     Comm = 0;
@@ -1215,10 +1181,6 @@ void IpplInfo::pop() {
     MaxFFTNodes =         obj.MaxFFTNodes;
     ChunkSize =           obj.ChunkSize;
     PerSMPParallelIO =    obj.PerSMPParallelIO;
-
-#ifdef IPPL_COMM_ALARMS
-    CommTimeoutSeconds = obj.CommTimeoutSeconds;
-#endif
 }
 
 #ifdef IPPL_RUNTIME_ERRCHECK
@@ -1249,4 +1211,4 @@ void __C_runtime_error ( int trap_code, char *name, int line_no, ... ) {
  * $RCSfile: IpplInfo.cpp,v $   $Author: adelmann $
  * $Revision: 1.1.1.1 $   $Date: 2003/01/23 07:40:33 $
  * IPPL_VERSION_ID: $Id: IpplInfo.cpp,v 1.1.1.1 2003/01/23 07:40:33 adelmann Exp $
- ***************************************************************************/
\ No newline at end of file
+ ***************************************************************************/

ippl/src/Utility/IpplInfo.h

@@ -220,13 +220,6 @@ public:
   // return true if we should try to retransmit messages on error
   static bool retransmit() { return (UseChecksums && Retransmit); }
 
-#ifdef IPPL_COMM_ALARMS
-  // A timeout quantity, in seconds, to allow us to wait a certain number
-  // of seconds before we signal a timeout when we're trying to receive
-  // a message.
-  static unsigned int getCommTimeout() { return CommTimeoutSeconds; }
-#endif
-
   // Static data about a limit to the number of nodes that should be used
   // in FFT operations.  If this is <= 0 or > number of nodes, it is ignored.
   static int maxFFTNodes() { return MaxFFTNodes; }
@@ -371,14 +364,6 @@ private:
   // try to read from a single file (vs just having one node do it).
   static bool PerSMPParallelIO;
 
-#ifdef IPPL_COMM_ALARMS
-  // A timeout quantity, in seconds, to allow us to wait a certain number
-  // of seconds before we signal a timeout when we're trying to receive
-  // a message.  By default, this will be zero; change it with the
-  // --msgtimeout <seconds> flag
-  static unsigned int CommTimeoutSeconds;
-#endif
-
   static std::stack<StaticIpplInfo> stashedStaticMembers;
 
   // Indicate an error occurred while trying to parse the given command-line
@@ -416,4 +401,4 @@ typedef IpplInfo Ippl;
  * $RCSfile: IpplInfo.h,v $   $Author: adelmann $
  * $Revision: 1.1.1.1 $   $Date: 2003/01/23 07:40:33 $
  * IPPL_VERSION_ID: $Id: IpplInfo.h,v 1.1.1.1 2003/01/23 07:40:33 adelmann Exp $
- ***************************************************************************/
\ No newline at end of file
+ ***************************************************************************/

ippl/src/Utility/StaticIpplInfo.h

@@ -106,14 +106,6 @@ public:
     // try to read from a single file (vs just having one node do it).
     bool PerSMPParallelIO;
 
-#ifdef IPPL_COMM_ALARMS
-    // A timeout quantity, in seconds, to allow us to wait a certain number
-    // of seconds before we signal a timeout when we're trying to receive
-    // a message.  By default, this will be zero; change it with the
-    // --msgtimeout <seconds> flag
-    unsigned int CommTimeoutSeconds;
-#endif
-
 };
 
-#endif
\ No newline at end of file
+#endif