From 434a43dd4af042a57f459d8aecce46f25ac60c94 Mon Sep 17 00:00:00 2001 From: Huub Van Dam Date: Mon, 16 May 2011 21:53:52 +0000 Subject: [PATCH] HvD: Gfortran seemed to have trouble understanding the logical expressions involving character strings. I have introduced some brackets to make the meaning explicit which seems to have fixed the problem. --- src/prepar/pre_merge.F | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/prepar/pre_merge.F b/src/prepar/pre_merge.F index 46a6bc6e9d..b71b9111f1 100644 --- a/src/prepar/pre_merge.F +++ b/src/prepar/pre_merge.F @@ -84,15 +84,15 @@ c ATOM c if(card(1:4).eq.'ATOM') then if(card(18:20).eq.namslv) lslvnt=.true. - if(card(17:17).ne.' '.and. - + card(17:17).ne.altloc.and.altloc.ne.'*') goto 1 + if((card(17:17).ne.' ').and. + + (card(17:17).ne.altloc).and.(altloc.ne.'*')) goto 1 if(.not.lslvnt) natm=natm+1 if(lrgmrg) then read(card(22:26),1003) i 1003 format(i5) else - if(card(22:22).ne.' '.and. - + card(22:22).ne.chain.and.chain.ne.'*') goto 1 + if((card(22:22).ne.' ').and. + + (card(22:22).ne.chain).and.(chain.ne.'*')) goto 1 read(card(23:26),1013) i 1013 format(i4) endif