X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fcluster%2Fwham%2Fsrc%2Finclude_unres%2FCOMMON.SBRIDGE;h=f866aa7a13f7a4e58fc0b57dacbab18a844de934;hb=15b72ec8512874f2fd1485ed0a66e7a775d806e5;hp=2848b610a205f05b41892f3ee90d9b1b427f4ef0;hpb=52187c9365594597457799445140ea830f1141a3;p=unres.git

diff --git a/source/cluster/wham/src/include_unres/COMMON.SBRIDGE b/source/cluster/wham/src/include_unres/COMMON.SBRIDGE
index 2848b61..f866aa7 100644
--- a/source/cluster/wham/src/include_unres/COMMON.SBRIDGE
+++ b/source/cluster/wham/src/include_unres/COMMON.SBRIDGE
@@ -1,19 +1,17 @@
-      double precision ebr,d0cm,akcm,akth,akct,v1ss,v2ss,v3ss,dhpb,
-<<<<<<< HEAD
-     & dhpb1,forcon,weidis
-      integer ns,nss,nfree,iss,ihpb,jhpb,nhpb,link_start,link_end,
-     & ibecarb
-      common /sbridge/ ebr,d0cm,akcm,akth,akct,v1ss,v2ss,v3ss,ns,nss,
-     &  nfree,iss(maxss)
+      double precision ss_depth,ebr,d0cm,akcm,akth,akct,v1ss,v2ss,v3ss
+      integer ns,nss,nfree,iss
+      common /sbridge/ ss_depth,ebr,d0cm,akcm,akth,akct,v1ss,v2ss,v3ss,
+     & ns,nss,nfree,iss(maxss)
+      double precision dhpb,dhpb1,forcon
+      integer ihpb,jhpb,nhpb,idssb,jdssb,ibecarb
       common /links/ dhpb(maxdim),dhpb1(maxdim),forcon(maxdim),
      & ihpb(maxdim),jhpb(maxdim),ibecarb(maxdim),nhpb
-=======
-     & forcon,weidis
-      integer ns,nss,nfree,iss,ihpb,jhpb,nhpb,link_start,link_end
-      common /sbridge/ ebr,d0cm,akcm,akth,akct,v1ss,v2ss,v3ss,ns,nss,
-     &  nfree,iss(maxss)
-      common /links/ dhpb(maxdim),forcon(maxdim),ihpb(maxdim),
-     & jhpb(maxdim),nhpb
->>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1
+      double precision weidis
       common /restraints/ weidis
+      integer link_start,link_end
       common /links_split/ link_start,link_end
+      double precision Ht,dyn_ssbond_ij
+      logical dyn_ss,dyn_ss_mask
+      common /dyn_ssbond/ dyn_ssbond_ij(maxres,maxres),
+     &  idssb(maxdim),jdssb(maxdim),
+     &  Ht,dyn_ss,dyn_ss_mask(maxres)