X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fwham%2Fsrc-M%2Fwham_calc1.F;h=ff78e8d118af83c4c5eb8177e0b91383ca4f953c;hb=7baaf36efbc265e029ec93a4bb1adfadfd55d7bf;hp=6768dcf874912c54ce35db5d0464817159b978ee;hpb=7bdee2e1c32891f6ac8f163ccecda78bd643d01e;p=unres.git

diff --git a/source/wham/src-M/wham_calc1.F b/source/wham/src-M/wham_calc1.F
index 6768dcf..ff78e8d 100644
--- a/source/wham/src-M/wham_calc1.F
+++ b/source/wham/src-M/wham_calc1.F
@@ -531,7 +531,7 @@ c              write (iout,*) 1.0d0/(beta_h(ib,iparm)*1.987D-3),ft
           sumE_p(i,iparm)=0.0d0
           sumEbis_p(i,iparm)=0.0d0
           sumEsq_p(i,iparm)=0.0d0
-          do j=1,nQ+2
+          do j=1,nQ+3
             sumQ_p(j,i,iparm)=0.0d0
             sumQsq_p(j,i,iparm)=0.0d0
             sumEQ_p(j,i,iparm)=0.0d0
@@ -546,7 +546,7 @@ c              write (iout,*) 1.0d0/(beta_h(ib,iparm)*1.987D-3),ft
           sumE(i,iparm)=0.0d0
           sumEbis(i,iparm)=0.0d0
           sumEsq(i,iparm)=0.0d0
-          do j=1,nQ+2
+          do j=1,nQ+3
             sumQ(j,i,iparm)=0.0d0
             sumQsq(j,i,iparm)=0.0d0
             sumEQ(j,i,iparm)=0.0d0
@@ -826,7 +826,7 @@ c            write (iout,*) "ftbis",ftbis
             sumE_p(k,iparm)=sumE_p(k,iparm)+etot*weight
             sumEbis_p(k,iparm)=sumEbis_p(k,iparm)+ebis*weight
             sumEsq_p(k,iparm)=sumEsq_p(k,iparm)+etot**2*weight
-            do j=1,nQ+2
+            do j=1,nQ+3
               sumQ_p(j,k,iparm)=sumQ_p(j,k,iparm)+q(j,t)*weight
               sumQsq_p(j,k,iparm)=sumQsq_p(j,k,iparm)+q(j,t)**2*weight
               sumEQ_p(j,k,iparm)=sumEQ_p(j,k,iparm)
@@ -837,7 +837,7 @@ c            write (iout,*) "ftbis",ftbis
             sumE(k,iparm)=sumE(k,iparm)+etot*weight
             sumEbis(k,iparm)=sumEbis(k,iparm)+ebis*weight
             sumEsq(k,iparm)=sumEsq(k,iparm)+etot**2*weight
-            do j=1,nQ+2
+            do j=1,nQ+3
               sumQ(j,k,iparm)=sumQ(j,k,iparm)+q(j,t)*weight
               sumQsq(j,k,iparm)=sumQsq(j,k,iparm)+q(j,t)**2*weight
               sumEQ(j,k,iparm)=sumEQ(j,k,iparm)
@@ -1087,7 +1087,7 @@ c            write (iout,*) "ftbis",ftbis
      &    sumW(i,iparm)
         sumEsq(i,iparm)=(sumEsq(i,iparm)/sumW(i,iparm)
      &    -sumE(i,iparm)**2)/(1.987D-3*(startGridT+i*delta_T)**2)
-        do j=1,nQ+2
+        do j=1,nQ+3
           sumQ(j,i,iparm)=sumQ(j,i,iparm)/sumW(i,iparm)
           sumQsq(j,i,iparm)=sumQsq(j,i,iparm)/sumW(i,iparm)
      &     -sumQ(j,i,iparm)**2
@@ -1098,15 +1098,15 @@ c            write (iout,*) "ftbis",ftbis
      &   (startGridT+i*delta_T))+potEmin
         write (iout,'(f7.1,2f15.5,$)') startGridT+i*delta_T,
      &   sumW(i,iparm),sumE(i,iparm)
-        write (iout,'(f10.5,$)') (sumQ(j,i,iparm),j=1,nQ+2)
+        write (iout,'(f10.5,$)') (sumQ(j,i,iparm),j=1,nQ+3)
         write (iout,'(e15.5,$)') sumEsq(i,iparm)-sumEbis(i,iparm),
-     &   (sumQsq(j,i,iparm),j=1,nQ+2),(sumEQ(j,i,iparm),j=1,nQ+2)
+     &   (sumQsq(j,i,iparm),j=1,nQ+3),(sumEQ(j,i,iparm),j=1,nQ+3)
         write (iout,*) 
         write (34,'(f7.1,2f15.5,$)') startGridT+i*delta_T,
      &   sumW(i,iparm),sumE(i,iparm)
-        write (34,'(f10.5,$)') (sumQ(j,i,iparm),j=1,nQ+2)
+        write (34,'(f10.5,$)') (sumQ(j,i,iparm),j=1,nQ+3)
         write (34,'(e15.5,$)') sumEsq(i,iparm)-sumEbis(i,iparm),
-     &   (sumQsq(j,i,iparm),j=1,nQ+2),(sumEQ(j,i,iparm),j=1,nQ+2)
+     &   (sumQsq(j,i,iparm),j=1,nQ+3),(sumEQ(j,i,iparm),j=1,nQ+3)
         write (34,*) 
         call flush(34)
       enddo