restoring read2sigma code after wrong merge

[unres.git] / source / unres / src_MD / energy_split-sep.F

diff --git a/source/unres/src_MD/energy_split-sep.F b/source/unres/src_MD/energy_split-sep.F
index f40b7af..9d0b82f 100644 (file)
--- a/source/unres/src_MD/energy_split-sep.F
+++ b/source/unres/src_MD/energy_split-sep.F
@@ -264,7 +264,12 @@ cMS$ATTRIBUTES C ::  proc_proc
       include 'COMMON.VAR'
       include 'COMMON.LOCAL'
       include 'COMMON.CONTROL'
-
+#ifndef DFA
+      edfadis=0.0d0
+      edfator=0.0d0
+      edfanei=0.0d0
+      edfabet=0.0d0
+#endif
 c      write(iout,'(a,i2)')'Calling etotal_short ipot=',ipot
 c      call flush(iout)
       if (modecalc.eq.12.or.modecalc.eq.14) then
@@ -396,7 +401,7 @@ C
 C Calculate electrostatic (H-bonding) energy of the main chain.
 C
   107 continue
-
+#ifdef DFA
 C     BARTEK for dfa test!
       if (wdfa_dist.gt.0) then 
          call edfad(edfadis)
@@ -422,6 +427,7 @@ c      print*, 'edfan is finished!', edfanei
          edfabet=0.0
       endif
 c      print*, 'edfab is finished!', edfabet
+#endif
 c
 c Calculate the short-range part of Evdwpp
 c