Merge branch 'master' of mmka:unres into multichain

[unres.git] / source / unres / src_MD-M / unres.F

diff --git a/source/unres/src_MD-M/unres.F b/source/unres/src_MD-M/unres.F
index b1ddb28..4903ec0 100644 (file)
--- a/source/unres/src_MD-M/unres.F
+++ b/source/unres/src_MD-M/unres.F
@@ -196,13 +196,25 @@ c---------------------------------------------------------------------------
       double precision energy(0:n_ene)
       double precision energy_long(0:n_ene),energy_short(0:n_ene)
       double precision varia(maxvar)
+<<<<<<< HEAD
+      if (indpdb.eq.0)     call chainbuild
+      time00=MPI_Wtime()
+      print *,'dc',c(1,1)
+      if (indpdb.ne.0) then
+      dc(1,0)=c(1,1)
+      dc(2,0)=c(2,1)
+      dc(3,0)=c(3,1)
+      endif
+=======
       if (indpdb.eq.0) call chainbuild
 #ifdef MPI
       time00=MPI_Wtime()
 #else
       time00=tcpu()
 #endif
+>>>>>>> f5379d3246c4bd95e946c4d35d4a1c13e329c4cb
       call chainbuild_cart
+      print *,'dc',dc(1,0),dc(2,0),dc(3,0)
       if (split_ene) then
        print *,"Processor",myrank," after chainbuild"
        icall=1
@@ -231,7 +243,9 @@ c---------------------------------------------------------------------------
       etot =etota
       call enerprint(energy(0))
       call hairpin(.true.,nharp,iharp)
+        print *,'after hairpin'
       call secondary2(.true.)
+        print *,'after secondary'
       if (minim) then
 crc overlap test
         if (overlapsc) then 
@@ -275,8 +289,10 @@ crc overlap test
 #endif
         print *,'# eval/s',evals
         print *,'refstr=',refstr
-        call hairpin(.true.,nharp,iharp)
+        call hairpin(.false.,nharp,iharp)
+        print *,'after hairpin'
         call secondary2(.true.)
+        print *,'after secondary'
         call etotal(energy(0))
         etot = energy(0)
         call enerprint(energy(0))