Changeset 34f1452 in flexpart.git

Timestamp:

Sep 10, 2018, 10:27:33 AM (6 years ago)

Author:

pesei <petra seibert at univie ac at>

Branches:

univie

Children:

d7935de

Parents:

2870133

Message:

increase output width for time (ticket:205)

2018-09-10, Petra Seibert: increase output width for time in sec
small improvements in code layout, name big loops

File:

• src/plumetraj.f90 (modified) (8 diffs)

src/plumetraj.f90

@@ -32 +32 @@
   !                                                                            *
   !     24 January 2002                                                        *
+  !                                                                            *
+  !     2018-09-10, Petra Seibert: increase output width for time in sec       *
+  !       small improvements in code layout, name big loops                    *
   !                                                                            *
   ! Variables:                                                                 *
@@ -77 +80 @@
 
 
-  ! Loop about all release points
-  !******************************
-
-  do j=1,numpoint
+  ! Loop over all release points
+  !*****************************
+
+  point_loop: do j=1,numpoint
     if (abs(ireleasestart(j)-itime).gt.lage(nageclass)) goto 10
     topocenter=0.
@@ -93 +96 @@
 
     n=0
-    do i=1,numpart
+    particle_loop: do i=1,numpart
       if (itra1(i).ne.itime) goto 20
       if (npoint(i).ne.j) goto 20
@@ -125 +128 @@
 
       topo=p1*oro(ix ,jy) &
-           + p2*oro(ixp,jy) &
-           + p3*oro(ix ,jyp) &
-           + p4*oro(ixp,jyp)
+         + p2*oro(ixp,jy) &
+         + p3*oro(ix ,jyp) &
+         + p4*oro(ixp,jyp)
       topocenter=topocenter+topo
 
@@ -151 +154 @@
           indexh=memind(m)
           pv1(m)=p1*pv(ix ,jy ,ind,indexh) &
-               +p2*pv(ixp,jy ,ind,indexh) &
-               +p3*pv(ix ,jyp,ind,indexh) &
-               +p4*pv(ixp,jyp,ind,indexh)
+                +p2*pv(ixp,jy ,ind,indexh) &
+                +p3*pv(ix ,jyp,ind,indexh) &
+                +p4*pv(ixp,jyp,ind,indexh)
         end do
         pvprof(ind-indz+1)=(pv1(1)*dt2+pv1(2)*dt1)*dtt
@@ -173 +176 @@
 
         tr(m)=p1*tropopause(ix ,jy ,1,indexh) &
-             + p2*tropopause(ixp,jy ,1,indexh) &
-             + p3*tropopause(ix ,jyp,1,indexh) &
-             + p4*tropopause(ixp,jyp,1,indexh)
+            + p2*tropopause(ixp,jy ,1,indexh) &
+            + p3*tropopause(ix ,jyp,1,indexh) &
+            + p4*tropopause(ixp,jyp,1,indexh)
 
         hm(m)=p1*hmix(ix ,jy ,1,indexh) &
-             + p2*hmix(ixp,jy ,1,indexh) &
-             + p3*hmix(ix ,jyp,1,indexh) &
-             + p4*hmix(ixp,jyp,1,indexh)
+            + p2*hmix(ixp,jy ,1,indexh) &
+            + p3*hmix(ix ,jyp,1,indexh) &
+            + p4*hmix(ixp,jyp,1,indexh)
       end do
 
@@ -191 +194 @@
       hmixcenter=hmixcenter+hmixi
 
-
 20    continue
-    end do
+    end do particle_loop
 
 
@@ -234 +236 @@
   !******************************************
 
-      write(unitouttraj,'(i5,i8,2f9.4,4f8.1,f8.2,4f8.1,3f6.1,&
-           &5(2f8.3,f7.0,f6.1,f8.1))')&
-           &j,itime-(ireleasestart(j)+ireleaseend(j))/2, &
+      write (unitouttraj,901) j,itime-(ireleasestart(j)+ireleaseend(j))/2, &
            xcenter,ycenter,zcenter,topocenter,hmixcenter,tropocenter, &
-           pvcenter,rmsdist,rms,zrmsdist,zrms,hmixfract,pvfract, &
-           tropofract, &
-           (xclust(k),yclust(k),zclust(k),fclust(k),rmsclust(k), &
-           k=1,ncluster)
+           pvcenter,rmsdist,rms,zrmsdist,zrms,hmixfract,pvfract,tropofract, &
+           (xclust(k),yclust(k),zclust(k),fclust(k),rmsclust(k), k=1,ncluster)
+901   format(i5,i10,2f9.4,4f8.1,f8.2,4f8.1,3f6.1,5(2f8.3,f7.0,f6.1,f8.1))    
     endif
 
 
 10  continue
-  end do
+  end do point_loop