Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC...

[unres.git] / source / wham / src-NEWSC / readrtns.F

diff --git a/source/wham/src-NEWSC/readrtns.F b/source/wham/src-NEWSC/readrtns.F
index c13b16e..9967760 100644 (file)
--- a/source/wham/src-NEWSC/readrtns.F
+++ b/source/wham/src-NEWSC/readrtns.F
@@ -42,6 +42,10 @@
      &    nparmset, Max_Parm
         return1
       endif
+<<<<<<< HEAD
+=======
+      energy_dec=index(controlcard,"ENERGY_DEC").gt.0
+>>>>>>> e183793... Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC potentials)
       call readi(controlcard,"MAXIT",maxit,5000)
       call reada(controlcard,"FIMIN",fimin,1.0d-3)
       call readi(controlcard,"ENSEMBLES",ensembles,0)