From: Adam Sieradzan <adasko@mmka.chem.univ.gda.pl>
Date: Tue, 5 Nov 2013 16:30:27 +0000 (+0100)
Subject: Debug part 1
X-Git-Tag: v.3.2~2
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=commitdiff_plain;h=3d715fcd9a4c5ccea28a8e33a8e150be82aa0cec

Debug part 1
---

diff --git a/source/cluster/wham/src/Makefile b/source/cluster/wham/src/Makefile
index b192a7b..333ebec 100644
--- a/source/cluster/wham/src/Makefile
+++ b/source/cluster/wham/src/Makefile
@@ -3,15 +3,9 @@ BIN=../../../../bin
 FC = ifort
 OPT = -O3 -ip -w
 OPT = -CB -g 
-<<<<<<< HEAD
-FFLAGS =  ${OPT} -c -I. -Iinclude_unres -I$(INSTALL_DIR)/include
-CPPFLAGS = -DLINUX -DPGI -DSPLITELE -DPROCOR -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DMP -DMPI
-LIBS = -L$(INSTALL_DIR)/lib -lmpich xdrf/libxdrf.a -g -d2 -CA -CB
-=======
 FFLAGS =  ${OPT} -c -I. -I./include_unres -I../src_MD_T-sccor -I/users/adam/MEY_MD/src_Tc-czarek -I$(INSTALL_DIR)/include
 CPPFLAGS = -DLINUX -DPGI -DSPLITELE -DPROCOR -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DMP -DMPI
 LIBS = -L$(INSTALL_DIR)/lib -lmpich ./xdrf/libxdrf.a -g -d2 -CA -CB
->>>>>>> devel
 
 .c.o:
 	cc -c -DLINUX -DPGI $*.c
diff --git a/source/unres/src_MD/COMMON.SCCOR b/source/unres/src_MD/COMMON.SCCOR
index 395e4e2..8de6d3c 100644
--- a/source/unres/src_MD/COMMON.SCCOR
+++ b/source/unres/src_MD/COMMON.SCCOR
@@ -2,7 +2,7 @@ cc Parameters of the SCCOR term
       double precision v1sccor,v2sccor,vlor1sccor,
      &                 vlor2sccor,vlor3sccor,gloc_sc,
      &                 dcostau,dsintau,dtauangle,dcosomicron,
-     &                 domicron
+     &                 domicron,v0sccor
       integer nterm_sccor,isccortyp,nsccortyp,nlor_sccor
       common/sccor/v1sccor(maxterm_sccor,3,20,20),
      &    v2sccor(maxterm_sccor,3,20,20),