call enerprint(energia(0),fT)
endif
#endif
- if (homol_nset.le.1) then
+#ifdef DEBUG
+ write (iout,*) "homol_nset",homol_nset,nR(ib,iparm)
+#endif
+ if (homol_nset.gt.1) then
do kk=1,nR(ib,iparm)
Econstr=waga_homology(kk)*ehomology_constr
& -beta_h(ib,iparm)*(etot+Econstr)
#ifdef DEBUG
write (iout,'(4i5,4e15.5)') i,kk,ib,iparm,
- & etot,v(i,kk,ib,iparm)
+ & etot,Econstr,v(i,kk,ib,iparm)
#endif
enddo ! kk
esccor=enetb(19,i,iparm)
edihcnstr=enetb(20,i,iparm)
ehomology_constr=enetb(22,i,iparm)
+ if (homol_nset.gt.1)
+ & ehomology_constr=waga_homology(homol_nset)*ehomology_constr
edfadis=enetb(23,i,iparm)
edfator=enetb(24,i,iparm)
edfanei=enetb(25,i,iparm)
esccor=enetb(19,t,iparm)
edihcnstr=enetb(20,t,iparm)
ehomology_constr=enetb(22,t,iparm)
+ if (homol_nset.gt.1)
+ & ehomology_constr=waga_homology(homol_nset)*ehomology_constr
edfadis=enetb(23,t,iparm)
edfator=enetb(24,t,iparm)
edfanei=enetb(25,t,iparm)