Merge branch 'lipid' of mmka.chem.univ.gda.pl:unres into lipid

diff --cc source/wham/src-M/enecalc1.F
index 8a52e49,9347cfa..36ef370
--- 1/source/wham/src-M/enecalc1.F
--- 2/source/wham/src-M/enecalc1.F
+++ b/source/wham/src-M/enecalc1.F
@@@ -166,11 -166,8 +166,11 @@@ C        write (iout,*) "tuz za energia
            write (iout,'(8f10.5)') ((c(l,k),l=1,3),k=1,nres)
            write (iout,'(8f10.5)') ((c(l,k+nres),l=1,3),k=nnt,nct)
          call enerprint(energia(0),fT)
 +#endif
 +#undef DEBUG
 +#ifdef DEBUG
          write (iout,'(2i5,21f8.2)') i,iparm,(energia(k),k=1,21)
-         write (iout,*) "ftors",ftors
+         write (iout,*) "ftors(1)",ftors(1)
          call briefout(i,energia(0))
          temp=1.0d0/(beta_h(ib,ipar)*1.987D-3)
          write (iout,*) "temp", temp