From: Adam Sieradzan Date: Tue, 26 May 2015 11:44:09 +0000 (+0200) Subject: Merge branch 'devel' of mmka:unres into devel X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=c8b71b34ec6b864cc5db11cc5c0d95349a9b5cef;hp=e22a1f0e211043433e4f7c83d5605fa0edddabc9;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