projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'prerelease-3.2.1'
[unres.git]
/
source
/
wham
/
src-M
/
enecalc1.F
diff --git
a/source/wham/src-M/enecalc1.F
b/source/wham/src-M/enecalc1.F
index
880664c
..
9d03cee
100644
(file)
--- a/
source/wham/src-M/enecalc1.F
+++ b/
source/wham/src-M/enecalc1.F
@@
-45,6
+45,7
@@
double precision fT(6),quot,quotl,kfacl,kfac /2.4d0/,T0 /3.0d2/
double precision tt
integer snk_p(MaxR,MaxT_h,Max_parm)
double precision fT(6),quot,quotl,kfacl,kfac /2.4d0/,T0 /3.0d2/
double precision tt
integer snk_p(MaxR,MaxT_h,Max_parm)
+ integer scount_(0:MaxProcs)
logical lerr
character*64 bprotfile_temp
call opentmp(islice,ientout,bprotfile_temp)
logical lerr
character*64 bprotfile_temp
call opentmp(islice,ientout,bprotfile_temp)
@@
-269,11
+270,11
@@
c & " snk",snk_p(iR,ib,ipar)
121 continue
enddo
#ifdef MPI
121 continue
enddo
#ifdef MPI
- scount(me)=iii
+ scount_(me)=iii
write (iout,*) "Me",me," scount",scount(me)
call flush(iout)
c Master gathers updated numbers of conformations written by all procs.
write (iout,*) "Me",me," scount",scount(me)
call flush(iout)
c Master gathers updated numbers of conformations written by all procs.
- call MPI_AllGather( scount(me), 1, MPI_INTEGER, scount(0), 1,
+ call MPI_AllGather( scount_(me), 1, MPI_INTEGER, scount(0), 1,
& MPI_INTEGER, WHAM_COMM, IERROR)
indstart(0)=1
indend(0)=scount(0)
& MPI_INTEGER, WHAM_COMM, IERROR)
indstart(0)=1
indend(0)=scount(0)