clean fix revert to previous vestion

[unres.git] / source / wham / src-M / parmread.F

diff --git a/source/wham/src-M/parmread.F b/source/wham/src-M/parmread.F
index 097e1f7..ce1bf31 100644 (file)
--- a/source/wham/src-M/parmread.F
+++ b/source/wham/src-M/parmread.F
@@ -28,10 +28,10 @@ C
       character*1 toronelet(-2:2) /"p","a","G","A","P"/
       logical lprint
       dimension blower(3,3,maxlob)
-      character*800 controlcard
+      character*900 controlcard
       character*256 bondname_t,thetname_t,rotname_t,torname_t,
      & tordname_t,fouriername_t,elename_t,sidename_t,scpname_t,
-     & sccorname_t
+     & sccorname_t,tubename_t
       integer ilen
       external ilen
       character*16 key
@@ -71,6 +71,7 @@ c If reading not own parameters, skip assignment
       call reada(controlcard,"ATRISS",atriss,0.3D0)
       call reada(controlcard,"BTRISS",btriss,0.02D0)
       call reada(controlcard,"CTRISS",ctriss,1.0D0)
+      call reada(controlcard,"LIPSCALE",lipscale,1.3D0)
       dyn_ss=(index(controlcard,'DYN_SS').gt.0)
       write(iout,*) "ATRISS",atriss
       write(iout,*) "BTRISS",btriss
@@ -146,6 +147,7 @@ c
       wstrain=ww(15)
       wliptran=ww(22)
       wshield=ww(25)
+      wtube=ww(26)
       endif
 
       call card_concat(controlcard,.false.)
@@ -184,6 +186,12 @@ c Return if not own parameters
       call reads(controlcard,"SCPPAR",scpname_t,scpname)
       open (iscpp,file=scpname_t,status='old')
       rewind(iscpp)
+      call reads(controlcard,"TUBEPAR",tubename_t,tubename)
+      write(iout,*) tubename_t
+      write(iout,*) tubename
+      open (itube,file=tubename_t,status='old')
+      rewind(itube)
+
       write (iout,*) "Parameter set:",iparm
       write (iout,*) "Energy-term weights:"
       do i=1,n_ene
@@ -1112,7 +1120,8 @@ C---------------------- GB or BP potential -----------------------------
       read (isidep,*)(alp(i),i=1,ntyp)
       do i=1,ntyp
        read (isidep,*)(epslip(i,j),j=i,ntyp)
-C       print *,"WARNING!!"
+C       write(iout,*) "WARNING!!",i,ntyp
+       write(iout,*) "epslip", i, (epslip(i,j),j=i,ntyp)
 C       do j=1,ntyp
 C       epslip(i,j)=epslip(i,j)+0.05d0
 C       enddo
@@ -1227,11 +1236,31 @@ c           augm(i,j)=0.5D0**(2*expon)*aa(i,j)
           endif
          if (lprint) then
             write (iout,'(2(a3,2x),3(1pe10.3),5(0pf8.3))') 
-     &      restyp(i),restyp(j),aa(i,j),bb(i,j),augm(i,j),
+     &      restyp(i),restyp(j),aa_aq(i,j),bb_aq(i,j),augm(i,j),
      &      sigma(i,j),r0(i,j),chi(i,j),chi(j,i)
          endif
         enddo
       enddo
+      write(iout,*) "tube param"
+      read(itube,*) epspeptube,sigmapeptube,acavtubpep,bcavtubpep,
+     & ccavtubpep,dcavtubpep,tubetranenepep
+      sigmapeptube=sigmapeptube**6
+      sigeps=dsign(1.0D0,epspeptube)
+      epspeptube=dabs(epspeptube)
+      pep_aa_tube=4.0d0*epspeptube*sigmapeptube**2
+      pep_bb_tube=-sigeps*4.0d0*epspeptube*sigmapeptube
+      write(iout,*) pep_aa_tube,pep_bb_tube,tubetranenepep
+      do i=1,ntyp
+       read(itube,*) epssctube,sigmasctube,acavtub(i),bcavtub(i),
+     & ccavtub(i),dcavtub(i),tubetranene(i)
+       sigmasctube=sigmasctube**6
+       sigeps=dsign(1.0D0,epssctube)
+       epssctube=dabs(epssctube)
+       sc_aa_tube_par(i)=4.0d0*epssctube*sigmasctube**2
+       sc_bb_tube_par(i)=-sigeps*4.0d0*epssctube*sigmasctube
+      write(iout,*) sc_aa_tube_par(i), sc_bb_tube_par(i),tubetranene(i)
+      enddo
+
 C
 C Define the SC-p interaction constants
 C