projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ctest added ene tests with FGPROCS=1
[unres.git]
/
source
/
unres
/
src_MD-M
/
stochfric.F
diff --git
a/source/unres/src_MD-M/stochfric.F
b/source/unres/src_MD-M/stochfric.F
index
8d1cf2c
..
76aa40a
100644
(file)
--- a/
source/unres/src_MD-M/stochfric.F
+++ b/
source/unres/src_MD-M/stochfric.F
@@
-39,11
+39,7
@@
ind=ind+3
enddo
do i=nnt,nct
ind=ind+3
enddo
do i=nnt,nct
-<<<<<<< HEAD
if (itype(i).ne.10 .and. itype(i).ne.21) then
if (itype(i).ne.10 .and. itype(i).ne.21) then
-=======
- if (itype(i).ne.10) then
->>>>>>> 2acc991... Wprowadznie potencjalow SC-COR do multichain oraz ich pseudosymetrii dla
do j=1,3
d_t_work(ind+j)=d_t(j,i+nres)
enddo
do j=1,3
d_t_work(ind+j)=d_t(j,i+nres)
enddo
@@
-72,11
+68,7
@@
ind=ind+3
enddo
do i=nnt,nct
ind=ind+3
enddo
do i=nnt,nct
-<<<<<<< HEAD
if (itype(i).ne.10 .and. itype(i).ne.21) then
if (itype(i).ne.10 .and. itype(i).ne.21) then
-=======
- if (itype(i).ne.10) then
->>>>>>> 2acc991... Wprowadznie potencjalow SC-COR do multichain oraz ich pseudosymetrii dla
do j=1,3
friction(j,i+nres)=fric_work(ind+j)
enddo
do j=1,3
friction(j,i+nres)=fric_work(ind+j)
enddo
@@
-242,11
+234,7
@@
c Compute the stochastic forces acting on virtual-bond vectors.
stochforc(j,0)=ff(j)+force(j,nnt+nres)
enddo
do i=nnt,nct
stochforc(j,0)=ff(j)+force(j,nnt+nres)
enddo
do i=nnt,nct
-<<<<<<< HEAD
if (itype(i).ne.10 .and. itype(i).ne.21) then
if (itype(i).ne.10 .and. itype(i).ne.21) then
-=======
- if (itype(i).ne.10) then
->>>>>>> 2acc991... Wprowadznie potencjalow SC-COR do multichain oraz ich pseudosymetrii dla
do j=1,3
stochforc(j,i+nres)=force(j,i+nres)
enddo
do j=1,3
stochforc(j,i+nres)=force(j,i+nres)
enddo
@@
-264,11
+252,7
@@
c Compute the stochastic forces acting on virtual-bond vectors.
ind=ind+3
enddo
do i=nnt,nct
ind=ind+3
enddo
do i=nnt,nct
-<<<<<<< HEAD
if (itype(i).ne.10 .and. itype(i).ne.21) then
if (itype(i).ne.10 .and. itype(i).ne.21) then
-=======
- if (itype(i).ne.10) then
->>>>>>> 2acc991... Wprowadznie potencjalow SC-COR do multichain oraz ich pseudosymetrii dla
do j=1,3
stochforcvec(ind+j)=stochforc(j,i+nres)
enddo
do j=1,3
stochforcvec(ind+j)=stochforc(j,i+nres)
enddo