From: Adam Sieradzan Date: Tue, 26 May 2015 11:44:09 +0000 (+0200) Subject: Merge branch 'devel' of mmka:unres into devel X-Git-Tag: v.3.3.0~5^2~156^2~5 X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=468e8ce9457c0f4262d9b8fbca7ee420ac1dc2c9;hp=3e5191c219c2c8855e212d6852e6ef50f7e14ead;p=unres.git Merge branch 'devel' of mmka:unres into devel --- diff --git a/source/cluster/wham/src-M/energy_p_new.F b/source/cluster/wham/src-M/energy_p_new.F index 05f78fe..2c663fb 100644 --- a/source/cluster/wham/src-M/energy_p_new.F +++ b/source/cluster/wham/src-M/energy_p_new.F @@ -769,6 +769,7 @@ C common /srutu/icall integer icant external icant + logical energy_dec /.false./ c print *,'Entering EGB nnt=',nnt,' nct=',nct,' expon=',expon evdw=0.0D0 evdw_t=0.0d0