Merge branch 'prerelease-3.2.1' of mmka.chem.univ.gda.pl:unres into prerelease-3.2.1

[unres.git] / source / unres / src_MD / COMMON.SCCOR

diff --git a/source/unres/src_MD/COMMON.SCCOR b/source/unres/src_MD/COMMON.SCCOR
index 78ff482..623bbad 100644 (file)
--- a/source/unres/src_MD/COMMON.SCCOR
+++ b/source/unres/src_MD/COMMON.SCCOR
@@ -1,26 +1,20 @@
 cc Parameters of the SCCOR term
       double precision v1sccor,v2sccor,vlor1sccor,
-     &                 vlor2sccor,vlor3sccor,gloc_sc,
-     &                 dcostau,dsintau,dtauangle,dcosomicron,
-     &                 domicron,v0sccor
+     &                 vlor2sccor,vlor3sccor,v0sccor
+C,gloc_sc,
+C     &                 dcostau,dsintau,dtauangle,dcosomicron,
+C     &                 domicron,v0sccor
       integer nterm_sccor,isccortyp,nsccortyp,nlor_sccor
-<<<<<<< HEAD
-      common/sccor/v1sccor(maxterm_sccor,3,20,20),
-     &    v2sccor(maxterm_sccor,3,20,20),
-=======
       common/sccor/v1sccor(maxterm_sccor,3,-ntyp:ntyp,-ntyp:ntyp),
      &    v2sccor(maxterm_sccor,3,-ntyp:ntyp,-ntyp:ntyp),
-     &    v0sccor(maxterm_sccor,-ntyp:ntyp),
+     &    v0sccor(-ntyp:ntyp,-ntyp:ntyp),
      &    nterm_sccor(-ntyp:ntyp,-ntyp:ntyp),isccortyp(-ntyp:ntyp),
      &    nsccortyp,
      &    nlor_sccor(-ntyp:ntyp,-ntyp:ntyp),
->>>>>>> 2acc991... Wprowadznie potencjalow SC-COR do multichain oraz ich pseudosymetrii dla
      &    vlor1sccor(maxterm_sccor,20,20),
      &    vlor2sccor(maxterm_sccor,20,20),
-     &    vlor3sccor(maxterm_sccor,20,20),gloc_sc(3,0:maxres2,10),
-     &    v0sccor(ntyp,ntyp),
-     &    dcostau(3,3,3,maxres2),dsintau(3,3,3,maxres2),
-     &    dtauangle(3,3,3,maxres2),dcosomicron(3,3,3,maxres2),
-     &    domicron(3,3,3,maxres2),
-     &    nterm_sccor(ntyp,ntyp),isccortyp(ntyp),nsccortyp,
-     &    nlor_sccor(ntyp,ntyp)
+     &    vlor3sccor(maxterm_sccor,20,20)
+C,gloc_sc(3,0:maxres2,10),
+C     &    dcostau(3,3,3,maxres2),dsintau(3,3,3,maxres2),
+C     &    dtauangle(3,3,3,maxres2),dcosomicron(3,3,3,maxres2),
+C     &    domicron(3,3,3,maxres2)