X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fwham%2Fsrc%2Fenecalc1.F;h=397e0f3b697599683c05a423571de906f2cd2301;hb=5303919700c65ffc77d1e57d865fdc3262d17130;hp=0f7d34ca3870f5c1b26e97d8bf7f26b8f27df972;hpb=aa4540154949fdfc9ab63442eb6fea09d6c589ad;p=unres.git

diff --git a/source/wham/src/enecalc1.F b/source/wham/src/enecalc1.F
index 0f7d34c..397e0f3 100644
--- a/source/wham/src/enecalc1.F
+++ b/source/wham/src/enecalc1.F
@@ -46,7 +46,7 @@
       double precision tt
       integer snk_p(MaxR,MaxT_h,Max_parm)
       logical lerr
-      character*64 bprotfile_temp
+      character*128 bprotfile_temp
       integer scount_t(0:maxprocs-1)
       call opentmp(islice,ientout,bprotfile_temp)
       iii=0
@@ -165,8 +165,10 @@ c     &   " kfac",kfac,"quot",quot," fT",fT
      &      wtor_d,wsccor,wbond
 #endif
         call etotal(energia(0),fT)
-        if (constr_homology) energia(0)=energia(0)+
+        if (constr_homology.gt.0) energia(0)=energia(0)+
      &   waga_homology(iset)*energia(22)
+c        write (iout,*) "constr_homology",constr_homology," iset",iset,
+c     &   " waga_homology",waga_homology(iset)
 #ifdef DEBUG
         write (iout,*) "Conformation",i
         call enerprint(energia(0),fT)
@@ -181,7 +183,7 @@ c     &    (c(j,ires+nres),j=1,3)
 c      enddo
         call intout
 #endif
-        if (energia(0).ge.1.0d20) then
+        if (energia(0).ge.1.0d6) then
           write (iout,*) "NaNs detected in some of the energy",
      &     " components for conformation",ii+1
           write (iout,*) "The Cartesian geometry is:"
@@ -215,8 +217,12 @@ c        call pdbout(ii+1,beta_h(ib,ipar),efree,energia(0),0.0d0,rmsdev)
      &         " the value read in: ",energia(0),eini," point",
      &         iii+1,indstart(me1)+iii," T",
      &         1.0d0/(1.987D-3*beta_h(ib,ipar))
+#define DEBUG
 #ifdef DEBUG
              call enerprint(energia(0),fT)
+#endif
+#undef DEBUG
+#ifdef DEBUG
              write (iout,'(4f10.5,2i5)') 0.0,energia(0),0.0,
      &       1.0d0/(beta_h(ib,ipar)*1.987D-3),
      &       0,0
@@ -382,7 +388,7 @@ c------------------------------------------------------------------------------
       include "COMMON.PROT"
       character*64 nazwa
       character*80 bxname,cxname
-      character*64 bprotfile_temp
+      character*128 bprotfile_temp
       character*3 liczba,licz
       character*2 licz2
       integer i,itj,ii,iii,j,k,l