[ViewVC] Diff of: group/trunk/OOPSE-2.0/src/UseTheForce/EAM

Comparing trunk/OOPSE-2.0/src/UseTheForce/EAM_FF.cpp (file contents):
Revision 1490 by gezelter, Fri Sep 24 04:16:43 2004 UTC vs.
Revision 1628 by gezelter, Thu Oct 21 20:15:31 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	>	#include "UseTheForce/DarkSide/eam_interface.h"
17	>	#include "UseTheForce/DarkSide/atype_interface.h"
18	>	//#include "UseTheForce/fortranWrappers.hpp"
19
20		#ifdef IS_MPI
21	<	#include "mpiForceField.h"
21	>	#include "UseTheForce/mpiForceField.h"
22		#endif // is_mpi
23
24
#	Line 172 \| Line 174 \| *EAM_FF::EAM_FF(char the_variant){**
174		// Set eamRcut to 0.0
175		eamRcut = 0.0;
176
175	–	// do the funtion wrapping
176	–	wrapMeFF( this );
177	–
177		#ifdef IS_MPI
178		int i;
179
#	Line 298 \| Line 297 \| void EAM_FF::initForceField( int ljMixRule ){
297		}
298
299
300	<	void EAM_FF::initForceField( int ljMixRule ){
301	<	initFortran( ljMixRule, 0 );
300	>	void EAM_FF::initForceField( ){
301	>	initFortran(0);
302		}
303
304		void EAM_FF::cleanMe( void ){

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