dfa wham and cluster corrections

[unres.git] / source / wham / src / readrtns.F

diff --git a/source/wham/src/readrtns.F b/source/wham/src/readrtns.F
index ad038e2..3d308b4 100644 (file)
--- a/source/wham/src/readrtns.F
+++ b/source/wham/src/readrtns.F
@@ -147,6 +147,11 @@ C
       endif
       replica(iparm)=index(controlcard,"REPLICA").gt.0
       umbrella(iparm)=index(controlcard,"UMBRELLA").gt.0
+      if (umbrella(iparm) .and. homol_nset.gt.1) then
+        umbrella(iparm) = .false.
+        write (iout,*) 
+     & "Replica in homology restraints weights UMBRELLA ignored,",iparm
+      endif
       read_iset(iparm)=index(controlcard,"READ_ISET").gt.0
       write (iout,*) "nQ",nQ," nT",nT_h(iparm)," replica ",
      &  replica(iparm)," umbrella ",umbrella(iparm),
@@ -189,6 +194,15 @@ C
         call flush(iout)
       enddo
 
+      write (iout,*) "HOMOL_NSET",homol_nset
+      if (homol_nset.gt.1) then
+        write (iout,*) "HOMOL_NSET: nT_h",nT_h(iparm)
+        do ib=1,nT_h(iparm)
+          nR(ib,iparm)=homol_nset
+          write (iout,*) "iparm",iparm," ib",ib," nR",nR(ib,iparm)
+        enddo
+      endif
+
       enddo
 
       if (hamil_rep) then
@@ -238,7 +252,7 @@ c-----------------------------------------------------------------------------
       include "COMMON.NAMES"
       include "COMMON.FREE"
       include "COMMON.OBCINKA"
-      character*64 nazwa
+      character*128 nazwa
       character*16000 controlcard
       integer i,ii,ib,iR,iparm,ilen,iroof,nthr,npars
       external ilen,iroof
@@ -341,7 +355,7 @@ c-------------------------------------------------------------------------------
       include "COMMON.PROTFILES"
       include "COMMON.PROT"
       include "COMMON.FREE"
-      character*64 bprotfile_temp
+      character*128 bprotfile_temp
       character*3 liczba,liczba2
       character*2 liczba1
       integer iunit,islice
@@ -401,7 +415,8 @@ c-------------------------------------------------------------------------------
       include "COMMON.SBRIDGE"
       include "COMMON.OBCINKA"
       real*4 csingle(3,maxres2)
-      character*64 nazwa,bprotfile_temp
+      character*64 nazwa
+      character*128 bprotfile_temp
       character*3 liczba
       character*2 liczba1
       integer i,j,ii,jj(maxslice),k,kk(maxslice),l,