ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/trunk/src/utils/simError.cpp

Comparing:
trunk/src/utils/simError.c (file contents), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/utils/simError.cpp (file contents), Revision 1668 by gezelter, Fri Jan 6 19:03:05 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 92 | Line 93 | int simError( void ) {
93		}
94
95		#ifdef IS_MPI
96	<	if ( painCave.isEventLoop ) {
97	<	sprintf( nodeMsg, " (reported by MPI node %d)", worldRank);
98	<	strncat(errorMsg, nodeMsg, strlen(nodeMsg));
99	<	}
96	>	if (worldRank == 0) {
97	>	if ( painCave.isEventLoop ) {
98	>	sprintf( nodeMsg, " (reported by MPI node %d)", worldRank);
99	>	strncat(errorMsg, nodeMsg, strlen(nodeMsg));
100	>	}
101		#endif
102	<
103	<	strcat(errorMsg, ":\n\t");
104	<
105	<	strncat(errorMsg, painCave.errMsg, strlen(painCave.errMsg));
106	<
107	<	strcat(errorMsg, "\n");
108	<	fprintf(stderr, errorMsg);
109	<
102	>
103	>	strcat(errorMsg, ":\n\t");
104	>
105	>	strncat(errorMsg, painCave.errMsg, strlen(painCave.errMsg));
106	>
107	>	strcat(errorMsg, "\n");
108	>	fprintf(stderr, "%s", errorMsg);
109	>
110		#ifdef IS_MPI
111	<	if (painCave.isEventLoop)
112	<	return 1;
111	>	if (painCave.isEventLoop)
112	>	return 1;
113	>	}
114		#endif
115
116		if (painCave.isFatal) {

Comparing:
trunk/src/utils/simError.c (property svn:keywords), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/utils/simError.cpp (property svn:keywords), Revision 1668 by gezelter, Fri Jan 6 19:03:05 2012 UTC

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

Diff Legend

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