[ViewVC] Diff of: group/branches/new_design/OOPSE-4/src/UseTheForce/Shapes

Comparing trunk/OOPSE-4/src/UseTheForce/Shapes_FF.cpp (file contents):
Revision 1520 by gezelter, Mon Oct 4 15:27:35 2004 UTC vs.
Revision 1636 by chrisfen, Fri Oct 22 22:54:01 2004 UTC

#	Line 14 \| Line 14 \| using namespace std;
14		#include "utils/simError.h"
15
16		#include "UseTheForce/fortranWrappers.hpp"
17	+	#include "UseTheForce/DarkSide/shapes_interface.h"
18
19		#ifdef IS_MPI
20		#include "UseTheForce/mpiForceField.h"
#	Line 127 \| Line 128 \| void Shapes_FF::initForceField(int ljMixRule){
128		}
129
130
131	<	void Shapes_FF::initForceField(int ljMixRule){
132	<	initFortran(ljMixRule, 0);
131	>	void Shapes_FF::initForceField(){
132	>	initFortran(0);
133		}
134
135
#	Line 308 \| Line 309 \| void Shapes_FF::readParams( void ){
309		currentAtomType = currentAtomType->next;
310		}
311
312	<	entry_plug->useLJ = 0;
312	>	entry_plug->useLennardJones = 0;
313		entry_plug->useEAM = 1;
314		// Walk down again and send out EAM type
315		currentAtomType = headAtomType->next;

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