projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of mmka:unres into devel
[unres.git]
/
source
/
unres
/
src_MD
/
energy_p_new_barrier.F
diff --git
a/source/unres/src_MD/energy_p_new_barrier.F
b/source/unres/src_MD/energy_p_new_barrier.F
index
8a9a3eb
..
a2eb0f9
100644
(file)
--- a/
source/unres/src_MD/energy_p_new_barrier.F
+++ b/
source/unres/src_MD/energy_p_new_barrier.F
@@
-134,7
+134,7
@@
C
cmc
cmc Sep-06: egb takes care of dynamic ss bonds too
cmc
cmc
cmc Sep-06: egb takes care of dynamic ss bonds too
cmc
- if (dyn_ss) call dyn_set_nss
+c if (dyn_ss) call dyn_set_nss
c print *,"Processor",myrank," computed USCSC"
#ifdef TIMING
c print *,"Processor",myrank," computed USCSC"
#ifdef TIMING
@@
-331,6
+331,7
@@
C
energia(23)=evdw_m
c print *," Processor",myrank," calls SUM_ENERGY"
call sum_energy(energia,.true.)
energia(23)=evdw_m
c print *," Processor",myrank," calls SUM_ENERGY"
call sum_energy(energia,.true.)
+ if (dyn_ss) call dyn_set_nss
c print *," Processor",myrank," left SUM_ENERGY"
#ifdef TIMING
#ifdef MPI
c print *," Processor",myrank," left SUM_ENERGY"
#ifdef TIMING
#ifdef MPI
@@
-1589,6
+1590,8
@@
C
IF (dyn_ss_mask(i).and.dyn_ss_mask(j)) THEN
call dyn_ssbond_ene(i,j,evdwij)
evdw=evdw+evdwij
IF (dyn_ss_mask(i).and.dyn_ss_mask(j)) THEN
call dyn_ssbond_ene(i,j,evdwij)
evdw=evdw+evdwij
+ if (energy_dec) write (iout,'(a6,2i5,0pf7.3,a3)')
+ & 'evdw',i,j,evdwij,' ss'
ELSE
ind=ind+1
itypj=itype(j)
ELSE
ind=ind+1
itypj=itype(j)