ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/utils/simError.cpp
(Generate patch)

Comparing:
branches/development/src/utils/simError.c (file contents), Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC vs.
branches/development/src/utils/simError.cpp (file contents), Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC

# Line 36 | Line 36
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38   * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #include <stdlib.h>
# Line 72 | Line 73 | int simError( void ) {
73   int simError( void ) {
74    
75    int myError = 1;
75 –  int isError;
76    char errorMsg[MAX_SIM_ERROR_MSG_LENGTH];
77 +
78 + #ifdef IS_MPI
79 +  int isError;
80    char nodeMsg[MAX_SIM_ERROR_MSG_LENGTH];
81 + #endif
82    
83    strcpy(errorMsg, "OpenMD ");
84    switch( painCave.severity ) {
# Line 92 | Line 96 | int simError( void ) {
96    }
97    
98   #ifdef IS_MPI
99 <  if ( painCave.isEventLoop ) {
100 <    sprintf( nodeMsg, " (reported by MPI node %d)", worldRank);
101 <    strncat(errorMsg, nodeMsg, strlen(nodeMsg));
102 <  }
99 >  if (worldRank == 0) {
100 >    if ( painCave.isEventLoop ) {
101 >      sprintf( nodeMsg, " (reported by MPI node %d)", worldRank);
102 >      strncat(errorMsg, nodeMsg, strlen(nodeMsg));
103 >    }
104   #endif
105 <
106 <  strcat(errorMsg, ":\n\t");
107 <
108 <  strncat(errorMsg, painCave.errMsg, strlen(painCave.errMsg));
109 <
110 <  strcat(errorMsg, "\n");
111 <  fprintf(stderr, errorMsg);
112 <
105 >    
106 >    strcat(errorMsg, ":\n\t");
107 >    
108 >    strncat(errorMsg, painCave.errMsg, strlen(painCave.errMsg));
109 >    
110 >    strcat(errorMsg, "\n");
111 >    fprintf(stderr, "%s", errorMsg);
112 >    
113   #ifdef IS_MPI
114 <  if (painCave.isEventLoop)
115 <    return 1;
114 >    if (painCave.isEventLoop)
115 >      return 1;
116 >  }
117   #endif  
118  
119    if (painCave.isFatal) {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines