Fixes needed by gfortran, it doesn't perform lazy evaluation (Piotr)
authorhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 19 May 2009 15:25:57 +0000 (15:25 +0000)
committerhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 19 May 2009 15:25:57 +0000 (15:25 +0000)
EPOS/epos167/epos-dro-168.f
EPOS/epos167/epos-tim-155.f
EPOS/epos167/epos-uti-165.f

index 61522a1..d8ea8ca 100644 (file)
@@ -10250,4 +10250,3 @@ c          -----
 
       return 
       end
-
index 8d0a87d..b4954e2 100644 (file)
@@ -550,19 +550,23 @@ c          endif
         pprt(1,ij(2))=-cos(alpha)*pt
         pprt(2,ij(2))=-sin(alpha)*pt
       endif
-      if(ij(1).ne.j1.and.(pprt(1,io).ne.0..or.pprt(2,io).ne.0.))then
+      if(ij(1).ne.j1)then
+      if(pprt(1,io).ne.0..or.pprt(2,io).ne.0.)then
         do ii=1,2
           call utrota(-1,pprt(1,io),pprt(2,io),pprt(3,io)
      &    ,pprt(1,ij(ii)),pprt(2,ij(ii)),pprt(3,ij(ii)))
         enddo
       endif
-      if(ij(1).ne.j1.and.pprt(3,io).lt.0.)then
+      endif
+      if(ij(1).ne.j1)then
+      if(pprt(3,io).lt.0.)then
         do k=1,3
           do ii=1,2
             pprt(k,ij(ii)) = -pprt(k,ij(ii))
           enddo
         enddo
       endif
+      endif
       do ii=1,ii2
         if(id(1,ii).ne.0)then
           idprt(nprtj+1)=id(1,ii)
index 3922ad0..80fd7b5 100644 (file)
@@ -2746,7 +2746,8 @@ c-------------------------------------------------------------------
       i=0
 
     1 i=i+1
-      if(i.gt.160.or.line(i:i).eq.'!')goto5
+      if(i.gt.160)goto5
+      if(line(i:i).eq.'!')goto5
       do ne=1,mempty
       if(line(i:i).eq.empty(ne))goto1
       enddo