Changes from trunk/src/writeheader_txt.f90 at r20 to branches/petra/src/writeheader_txt.f90 at r36

File:

• branches/petra/src/writeheader_txt.f90 (modified) (9 diffs)

branches/petra/src/writeheader_txt.f90

@@ -1 +1 @@
 !**********************************************************************
-! Copyright 1998,1999,2000,2001,2002,2005,2007,2008,2009,2010         *
+! Copyright 1998-2015                                                 *
 ! Andreas Stohl, Petra Seibert, A. Frank, Gerhard Wotawa,             *
 ! Caroline Forster, Sabine Eckhardt, John Burkhart, Harald Sodemann   *
@@ -32 +32 @@
   !                                                                            *
   !     7 August 2002                                                          *
-  !     modified IP 2013 for text output                                       *
+  !                                                                            *
+  !     2013, IP: IP, text            output                                   *
+  !     2/2015, PS: version string length written, enclose version string in '
+  !                 write out ldep_incr
+  ! 
   !*****************************************************************************
   !                                                                            *
@@ -59 +63 @@
   !************************
 
-  open(unitheader,file=path(2)(1:length(2))//'header_txt', &
+  open(unitheader,file=path(2)(1:length(2))//'header.txt', &
        form='formatted',err=998)
-  open(unitheader_txt,file=path(2)(1:length(2))//'header_txt_releases', &
+  open(unitheader_rel,file=path(2)(1:length(2))//'header_releases.txt', &
        form='formatted',err=998)
 
@@ -68 +72 @@
   !*****************************
   
-  write(unitheader,*) '# ibdate,ibtime, iedate, ietime, flexversion'
-  write(unitheader,*) ibdate, ibtime, iedate, ietime, trim(flexversion) !  'FLEXPART V9.0'
+  write(unitheader,*) '# ibdate,ibtime, iedate, ietime, len(flexversion), flexversion'
+  write(unitheader,*) ibdate, ibtime, iedate, ietime, len_trim(flexversion), "'"//trim(flexversion)//"'" !  'FLEXPART V9.0'
   !if (ldirect.eq.1) then
   !  write(unitheader,*) ibdate,ibtime,trim(flexversion) !  'FLEXPART V9.0'
@@ -87 +91 @@
   write(unitheader,*) '# information on grid setup    '
   write(unitheader,*) '#outlon0,outlat0,numxgrid,numygrid,dxout,dyout'
-  write(unitheader,*) outlon0,outlat0,numxgrid,numygrid, &
-       dxout,dyout  
+  write(unitheader,*) outlon0,outlat0,numxgrid,numygrid, dxout,dyout
   write(unitheader,*) '# numzgrid, outheight(.) '
   write(unitheader,*) numzgrid,(outheight(i),i=1,numzgrid)
@@ -119 +122 @@
 
 
-  write(unitheader_txt,*) '# information on release points'
-  write(unitheader_txt,*) '# numpoint'
-  write(unitheader_txt,*) numpoint
-  write(unitheader_txt,*) '# for numpoint:'
+  write(unitheader_rel,*) '# information on release points'
+  write(unitheader_rel,*) '# numpoint'
+  write(unitheader_rel,*) numpoint
+  write(unitheader_rel,*) '# for numpoint:'
   do i=1,numpoint
-    write(unitheader_txt,*) ireleasestart(i),ireleaseend(i),kindz(i)
+    write(unitheader_rel,*) ireleasestart(i),ireleaseend(i),kindz(i)
     xp1=xpoint1(i)*dx+xlon0
     yp1=ypoint1(i)*dy+ylat0
     xp2=xpoint2(i)*dx+xlon0
     yp2=ypoint2(i)*dy+ylat0
-    write(unitheader_txt,*) xp1,yp1,xp2,yp2,zpoint1(i),zpoint2(i)
-    write(unitheader_txt,*) npart(i),1
+    write(unitheader_rel,*) xp1,yp1,xp2,yp2,zpoint1(i),zpoint2(i)
+    write(unitheader_rel,*) npart(i),1
     if (numpoint.le.1000) then
-      write(unitheader_txt,*) compoint(i)
+      write(unitheader_rel,*) compoint(i)
     else
-      write(unitheader_txt,*) compoint(1001)
+      write(unitheader_rel,*) compoint(1001)
     endif
     do j=1,nspec
-      write(unitheader_txt,*) xmass(i,j)
-      write(unitheader_txt,*) xmass(i,j)
-      write(unitheader_txt,*) xmass(i,j)
+      write(unitheader_rel,*) xmass(i,j)
+      write(unitheader_rel,*) xmass(i,j)
+      write(unitheader_rel,*) xmass(i,j)
     end do
   end do
@@ -148 +151 @@
   write(unitheader,*) '# information on model switches'
   write(unitheader,*) '# method,lsubgrid,lconvection, ind_source,ind_receptor'
-  write(unitheader,*) method,lsubgrid,lconvection, &
-       ind_source,ind_receptor
+  write(unitheader,*) method,lsubgrid,lconvection,ind_source,ind_receptor
 
   ! Write age class information
@@ -160 +162 @@
   !Do not write topography to text output file. Keep it on the binary one
   !********************************
-
   !do ix=0,numxgrid-1
   !  write(unitheader,*) (oroout(ix,jy),jy=0,numygrid-1)
   !end do
 
-
+  ! Write deposition type 
+  !***********************
   
-
+  write(unitheader,*) '# information on incremental / accum. deposition'
+  write(unitheader,*) ldep_incr
 
   close(unitheader)
-  close(unitheader_txt)
-
+  close(unitheader_rel)
 
 !  open(unitheader,file=path(2)(1:length(2))//'header_nml', &
@@ -181 +183 @@
 
 
-998   write(*,*) ' #### FLEXPART MODEL ERROR!   THE FILE         #### '
+998 continue
+  write(*,*) ' #### FLEXPART MODEL ERROR!   THE FILE         #### '
   write(*,*) ' #### '//path(2)(1:length(2))//'header_txt'//' #### '
   write(*,*) ' #### CANNOT BE OPENED. IF A FILE WITH THIS    #### '