X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fwham%2Fsrc-M%2Finitialize_p.F;h=9b03d11bd3fca8e3bfd17422551118b5f57fb26e;hb=25618f9f83673a7063414fe1e17415d138f58da8;hp=d1cc94b93b39c139fca2b3fe42f2e9eddc46baa1;hpb=a1bbedcfb50a59f5ae082fe9016af63119b205cc;p=unres.git

diff --git a/source/wham/src-M/initialize_p.F b/source/wham/src-M/initialize_p.F
index d1cc94b..9b03d11 100644
--- a/source/wham/src-M/initialize_p.F
+++ b/source/wham/src-M/initialize_p.F
@@ -62,6 +62,8 @@ C
       ihist=30
       iweight=31
       izsc=32
+C Lipidic input file for parameters range 60-79
+      iliptranpar=60
 C
 C Set default weights of the energy terms.
 C
@@ -88,8 +90,10 @@ C
       enddo
       do i=1,ntyp
 	do j=1,ntyp
-	  aa(i,j)=0.0D0
-	  bb(i,j)=0.0D0
+	  aa_lip(i,j)=0.0D0
+	  bb_lip(i,j)=0.0D0
+          aa_aq(i,j)=0.0D0
+          bb_aq(i,j)=0.0D0
 	  augm(i,j)=0.0D0
 	  sigma(i,j)=0.0D0
 	  r0(i,j)=0.0D0
@@ -184,6 +188,7 @@ C Initialize the bridge arrays
       do i=1,maxres
 	ihpb(i)=0
 	jhpb(i)=0
+        dyn_ss_mask(i)=.false.
       enddo
 C
 C Initialize timing.
@@ -261,17 +266,19 @@ c-------------------------------------------------------------------------
      &   "EVDW SC-SC","EVDW2 SC-p","EES p-p","ECORR4 ","ECORR5 ",
      &   "ECORR6 ","EELLO ","ETURN3 ","ETURN4 ","ETURN6 ",
      &   "EBE bend","ESC SCloc","ETORS ","ETORSD ","EHPB","EVDWPP",
-     &   "EVDW2_14","ESTR","ESCCOR","EDIHC","EVDW_T"/
+     &   "EVDW2_14","ESTR","ESCCOR","EDIHC","EVDW_T","ELIPTRAN",
+     &   "EAFM","ETHETC"/
       data wname /
      &   "WSC","WSCP","WELEC","WCORR","WCORR5","WCORR6","WEL_LOC",
      &   "WTURN3","WTURN4","WTURN6","WANG","WSCLOC","WTOR","WTORD",
-     &   "WHPB","WVDWPP","WSCP14","WBOND","WSCCOR","WDIHC","WSC"/
+     &   "WHPB","WVDWPP","WSCP14","WBOND","WSCCOR","WDIHC","WSC",
+     &   "WLIPTRAN","WAFM","WTHETC"/
       data ww0 /1.0d0,1.0d0,1.0d0,1.0d0,1.0d0,1.0d0,1.0d0,1.0d0,1.0d0,
      &    1.0d0,1.0d0,1.0d0,1.0d0,1.0d0,1.0d0,1.0d0,0.4d0,1.0d0,1.0d0,
-     &    0.0d0,0.0/
-      data nprint_ene /21/
+     &    0.0d0,0.0,0.0d0,0.0d0,0.0d0/
+      data nprint_ene /22/
       data print_order /1,2,3,18,11,12,13,14,4,5,6,7,8,9,10,19,
-     &  16,15,17,20,21/
+     &  16,15,17,20,21,24,22,23/
       end 
 c---------------------------------------------------------------------------
       subroutine init_int_table
@@ -328,6 +335,7 @@ cd    write (iout,*) 'ns=',ns,' nss=',nss,' ihpb,jhpb',
 cd   &   (ihpb(i),jhpb(i),i=1,nss)
       do i=nnt,nct-1
         scheck=.false.
+        if (dyn_ss) goto 10
         do ii=1,nss
           if (ihpb(ii).eq.i+nres) then
             scheck=.true.