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 3 by tim, Fri Sep 24 16:27:58 2004 UTC vs.
branches/development/src/utils/simError.c (file contents), Revision 1600 by gezelter, Wed Aug 3 20:20:37 2011 UTC

#	Line 1 | Line 1
1	+	/*
2	+	* Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3	+	*
4	+	* The University of Notre Dame grants you ("Licensee") a
5	+	* non-exclusive, royalty free, license to use, modify and
6	+	* redistribute this software in source and binary code form, provided
7	+	* that the following conditions are met:
8	+	*
9	+	* 1. Redistributions of source code must retain the above copyright
10	+	*    notice, this list of conditions and the following disclaimer.
11	+	*
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.
16	+	*
17	+	* This software is provided "AS IS," without a warranty of any
18	+	* kind. All express or implied conditions, representations and
19	+	* warranties, including any implied warranty of merchantability,
20	+	* fitness for a particular purpose or non-infringement, are hereby
21	+	* excluded.  The University of Notre Dame and its licensors shall not
22	+	* be liable for any damages suffered by licensee as a result of
23	+	* using, modifying or distributing the software or its
24	+	* derivatives. In no event will the University of Notre Dame or its
25	+	* licensors be liable for any lost revenue, profit or data, or for
26	+	* direct, indirect, special, consequential, incidental or punitive
27	+	* damages, however caused and regardless of the theory of liability,
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]  Vardeman & Gezelter, in progress (2009).
40	+	*/
41	+
42		#include <stdlib.h>
43		#include <stdio.h>
44		#include <string.h>
45		#include "config.h"
5	–
46		#ifdef  IS_MPI
47		#include <mpi.h>
48	+	#endif
49
50		int nChecks;
10	–	#endif // IS_MPI
51
52		#include "utils/simError.h"
53
54		errorStruct painCave;
55
16	–	#ifdef IS_MPI
17	–
56		char checkPointMsg[MAX_SIM_ERROR_MSG_LENGTH];
57		int worldRank;
58
21	–	#endif
22	–
23	–
59		void initSimError( void ){
60		painCave.errMsg[0] = '\0';
61		painCave.isFatal = 0;
62	<	painCave.severity = OOPSE_ERROR;
28	<	#ifdef IS_MPI
62	>	painCave.severity = OPENMD_ERROR;
63		painCave.isEventLoop = 0;
64		nChecks = 0;
65	+	#ifdef IS_MPI
66		MPI_Comm_rank( MPI_COMM_WORLD, &worldRank );
67	+	#else
68	+	worldRank = 0;
69		#endif
70		}
71
#	Line 39 | Line 76 | int simError( void ) {
76		char errorMsg[MAX_SIM_ERROR_MSG_LENGTH];
77		char nodeMsg[MAX_SIM_ERROR_MSG_LENGTH];
78
79	<	strcpy(errorMsg, "OOPSE ");
79	>	strcpy(errorMsg, "OpenMD ");
80		switch( painCave.severity ) {
81	<	case OOPSE_WARNING:
82	<	strcat(errorMsg, "WARNING");
81	>	case OPENMD_WARNING:
82	>	strcat(errorMsg, "warning");
83		break;
84	<	case OOPSE_INFO:
85	<	strcat(errorMsg, "INFO");
84	>	case OPENMD_INFO:
85	>	strcat(errorMsg, "info");
86		break;
87		default:
88		if( painCave.isFatal ) {
#	Line 55 | Line 92 | int simError( void ) {
92		}
93
94		#ifdef IS_MPI
95	<	if ( painCave.isEventLoop ) {
96	<	sprintf( nodeMsg, " (reported by MPI node %d)", worldRank);
97	<	strncat(errorMsg, nodeMsg, strlen(nodeMsg));
98	<	}
95	>	if (worldRank == 0) {
96	>	if ( painCave.isEventLoop ) {
97	>	sprintf( nodeMsg, " (reported by MPI node %d)", worldRank);
98	>	strncat(errorMsg, nodeMsg, strlen(nodeMsg));
99	>	}
100		#endif
101	<
102	<	strcat(errorMsg, ":\n\t");
103	<
104	<	strncat(errorMsg, painCave.errMsg, strlen(painCave.errMsg));
105	<
106	<	strcat(errorMsg, "\n");
107	<	fprintf(stderr, errorMsg);
108	<
101	>
102	>	strcat(errorMsg, ":\n\t");
103	>
104	>	strncat(errorMsg, painCave.errMsg, strlen(painCave.errMsg));
105	>
106	>	strcat(errorMsg, "\n");
107	>	fprintf(stderr, "%s", errorMsg);
108	>
109		#ifdef IS_MPI
110	<	if (painCave.isEventLoop)
111	<	return 1;
110	>	if (painCave.isEventLoop)
111	>	return 1;
112	>	}
113		#endif
114
115		if (painCave.isFatal) {
#	Line 84 | Line 123 | int simError( void ) {
123		return 1;
124		}
125
87	–
88	–	#ifdef IS_MPI
126
127	<	void MPIcheckPoint( void ){
128	<
127	>	void errorCheckPoint( void ){
128	>
129		int myError = 0;
130	<	int isError;
130	>	int isError = 0;
131
132	+	#ifdef IS_MPI
133		MPI_Allreduce( &myError, &isError, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD );
134	+	#else
135	+	isError = myError;
136	+	#endif
137	+
138		if( isError ){
139	+
140	+	#ifdef IS_MPI
141		MPI_Finalize();
142	+	#endif
143	+
144		exit(0);
145		}
146
147		#ifdef CHECKPOINT_VERBOSE
148		nChecks++;
149	+
150	+	#ifdef IS_MPI
151		if( worldRank == 0 ){
152	+	#endif
153	+
154		fprintf(stderr,
155		"Checkpoint #%d reached: %s\n",
156		nChecks,
157		checkPointMsg );
158	+	#ifdef IS_MPI
159		}
160	<	#endif // CHECKPOINT_VERBOSE
160	>	#endif
161
162	+	#endif
163		}
164
165	<	#endif // IS_MPI
165	>

Comparing:
trunk/src/utils/simError.c (property svn:keywords), Revision 3 by tim, Fri Sep 24 16:27:58 2004 UTC vs.
branches/development/src/utils/simError.c (property svn:keywords), Revision 1600 by gezelter, Wed Aug 3 20:20:37 2011 UTC

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

Diff Legend

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