[ViewVC] Diff of: group/trunk/OOPSE-2.0/src/UseTheForce/WATER.cpp

Comparing trunk/OOPSE-2.0/src/UseTheForce/WATER.cpp (file contents):
Revision 1490 by gezelter, Fri Sep 24 04:16:43 2004 UTC vs.
Revision 1617 by chuckv, Wed Oct 20 20:46:20 2004 UTC

#	Line 9 \| Line 9 \| using namespace std;
9		#include <mpi.h>
10		#endif //is_mpi
11
12	<	#include "ForceFields.hpp"
13	<	#include "SRI.hpp"
14	<	#include "simError.h"
12	>	#include "UseTheForce/ForceFields.hpp"
13	>	#include "primitives/SRI.hpp"
14	>	#include "utils/simError.h"
15
16	–	#include "fortranWrappers.hpp"
16
17	+	#include "UseTheForce/DarkSide/atype_interface.h"
18	+	#include "UseTheForce/DarkSide/sticky_interface.h"
19	+
20		#ifdef IS_MPI
21	<	#include "mpiForceField.h"
21	>	#include "UseTheForce/mpiForceField.h"
22		#endif // is_mpi
23
24
#	Line 253 \| Line 255 \| WATER::WATER(){
255		headDirectionalType = NULL;
256		currentDirectionalType = NULL;
257
256	–	// do the funtion wrapping
257	–	wrapMeFF( this );
258	–
258		#ifdef IS_MPI
259		int i;
260

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