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

Comparing:
trunk/src/utils/simError.c (file contents), Revision 1313 by gezelter, Wed Oct 22 20:01:49 2008 UTC vs.
branches/development/src/utils/simError.cpp (file contents), Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC

# Line 6 | Line 6
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
35 + *                                                                      
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]  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 59 | Line 60 | void initSimError( void ){
60   void initSimError( void ){
61    painCave.errMsg[0] = '\0';
62    painCave.isFatal = 0;
63 <  painCave.severity = OOPSE_ERROR;
63 >  painCave.severity = OPENMD_ERROR;
64    painCave.isEventLoop = 0;
65    nChecks = 0;
66   #ifdef IS_MPI
# 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, "OOPSE ");
83 >  strcpy(errorMsg, "OpenMD ");
84    switch( painCave.severity ) {
85 <  case OOPSE_WARNING:
86 <    strcat(errorMsg, "WARNING");
85 >  case OPENMD_WARNING:
86 >    strcat(errorMsg, "warning");
87      break;
88 <  case OOPSE_INFO:
89 <    strcat(errorMsg, "INFO");
88 >  case OPENMD_INFO:
89 >    strcat(errorMsg, "info");
90      break;
91    default:
92      if( painCave.isFatal ) {
# 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) {

Comparing:
trunk/src/utils/simError.c (property svn:keywords), Revision 1313 by gezelter, Wed Oct 22 20:01:49 2008 UTC vs.
branches/development/src/utils/simError.cpp (property svn:keywords), Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

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