[ViewVC] Diff of: OpenMD/trunk/src/UseTheForce/LJFF.cpp

Comparing trunk/src/UseTheForce/LJFF.cpp (file contents):
Revision 3 by tim, Fri Sep 24 16:27:58 2004 UTC vs.
Revision 135 by gezelter, Thu Oct 21 20:15:31 2004 UTC

#	Line 12 \| Line 12 \| using namespace std;
12		#include "UseTheForce/ForceFields.hpp"
13		#include "primitives/SRI.hpp"
14		#include "utils/simError.h"
15	+	#include "UseTheForce/DarkSide/atype_interface.h"
16
17	<	#include "UseTheForce/fortranWrappers.hpp"
17	>	//#include "UseTheForce/fortranWrappers.hpp"
18
19		#ifdef IS_MPI
20		#include "UseTheForce/mpiForceField.h"
#	Line 128 \| Line 129 \| LJFF::LJFF(){
129		currentAtomType = NULL;
130
131		// do the funtion wrapping
132	<	wrapMeFF( this );
132	>	// wrapMeFF( this );
133
134		#ifdef IS_MPI
135		int i;
#	Line 224 \| Line 225 \| LJFF::~LJFF(){
225		#endif // is_mpi
226		}
227
228	<	void LJFF::initForceField( int ljMixRule ){
228	>	void LJFF::initForceField(){
229
230	<	initFortran( ljMixRule, 0 );
230	>	initFortran(0);
231		}
232
233		void LJFF::cleanMe( void ){

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