[ViewVC] Diff of: group/trunk/OOPSE-4/src/UseTheForce/DarkSide/atype

Comparing trunk/OOPSE-4/src/UseTheForce/DarkSide/atype_interface.F90 (file contents):
Revision 2428 by chuckv, Mon Nov 14 22:03:11 2005 UTC vs.
Revision 3153 by chuckv, Fri Jul 6 18:15:03 2007 UTC

#	Line 15 \| Line 15 \| subroutine makeatype(atp, status)
15		logical :: is_Charge, is_Dipole, is_Quadrupole
16		logical :: is_Sticky, is_StickyPower, is_GayBerne, is_EAM
17		logical :: is_Shape, is_FLARB
18	<	logical :: is_MEAM,is_SC
18	>	logical :: is_Spohr,is_SC
19
20		ident = atp%ident
21		is_Directional = (atp%is_Directional .ne. 0)
#	Line 33 \| Line 33 \| subroutine makeatype(atp, status)
33		is_Shape = (atp%is_Shape .ne. 0)
34		is_FLARB = (atp%is_FLARB .ne. 0)
35		is_SC = (atp%is_SC .ne. 0)
36	<	is_MEAM = (atp%is_MEAM .ne. 0)
36	>	is_Spohr = (atp%is_MEAM .ne. 0)
37
38		call new_atype(ident, is_Directional, is_LennardJones, is_Electrostatic, &
39		is_Charge, is_Dipole, is_Quadrupole, is_Sticky, is_StickyPower, &
40	<	is_GayBerne, is_EAM, is_Shape, is_FLARB, is_SC, is_MEAM,status)
40	>	is_GayBerne, is_EAM, is_Shape, is_FLARB, is_SC, is_Spohr,status)
41
42		end subroutine makeatype
43

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