projects
/
unres.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c16c0dd
)
refsys
author
Adam Liwo
<adam@mmka.chem.univ.gda.pl>
Fri, 23 Jan 2015 20:34:54 +0000
(21:34 +0100)
committer
Adam Liwo
<adam@mmka.chem.univ.gda.pl>
Fri, 23 Jan 2015 20:34:54 +0000
(21:34 +0100)
source/unres/src_MD-M/refsys.f
patch
|
blob
|
history
diff --git
a/source/unres/src_MD-M/refsys.f
b/source/unres/src_MD-M/refsys.f
index
a6aa5e9
..
b57c201
100644
(file)
--- a/
source/unres/src_MD-M/refsys.f
+++ b/
source/unres/src_MD-M/refsys.f
@@
-1,13
+1,8
@@
subroutine refsys(i2,i3,i4,e1,e2,e3,fail)
subroutine refsys(i2,i3,i4,e1,e2,e3,fail)
-<<<<<<< HEAD
implicit real*8 (a-h,o-z)
include 'DIMENSIONS'
c this subroutine calculates unity vectors of a local reference system
c defined by atoms (i2), (i3), and (i4). the x axis is the axis from
implicit real*8 (a-h,o-z)
include 'DIMENSIONS'
c this subroutine calculates unity vectors of a local reference system
c defined by atoms (i2), (i3), and (i4). the x axis is the axis from
-=======
-c This subroutine calculates unit vectors of a local reference system
-c defined by atoms (i2), (i3), and (i4). The x axis is the axis from
->>>>>>> 9a082c1ab203120d8e865971546d473fb146fcdc
c atom (i3) to atom (i2), and the xy plane is the plane defined by atoms
c (i2), (i3), and (i4). z axis is directed according to the sign of the
c vector product (i3)-(i2) and (i3)-(i4). sets fail to .true. if atoms
c atom (i3) to atom (i2), and the xy plane is the plane defined by atoms
c (i2), (i3), and (i4). z axis is directed according to the sign of the
c vector product (i3)-(i2) and (i3)-(i4). sets fail to .true. if atoms