Changeset 660bcb7 in flexpart.git for src/FLEXPART.f90

Timestamp:

Nov 24, 2014, 1:36:35 PM (9 years ago)

Author:

Anne Fouilloux <annefou@…>

Branches:

NetCDF

Children:

3073eaf

Parents:

4bf4a69

Message:

NETCDF outputs from svn trunk (hasod: ADD: netcdf module file)
I did not take changes in advance.f90; it will be added later.
I also changed OPENs where status was set to new and access is set to APPEND (had problems on abel.uio.no with intel compilers 2013.sp1.3)
It should contains technical changes only and results should be identical.

File:

• src/FLEXPART.f90 (modified) (5 diffs)

src/FLEXPART.f90

@@ -45 +45 @@
   use conv_mod
 
+  use netcdf_output_mod, only: writeheader_netcdf
+
+
   implicit none
 
@@ -303 +306 @@
   !******************************************************************
 
+  if (lnetcdfout.eq.1) then 
+    call writeheader_netcdf(lnest = .false.)
+  else 
+    call writeheader
+  end if
+
+  if (nested_output.eq.1) then
+    if (lnetcdfout.eq.1) then
+      call writeheader_netcdf(lnest = .true.)
+    else
+      call writeheader_nest
+    endif
+  endif
+
   if (verbosity.gt.0) then
     print*,'call writeheader'
@@ -315 +332 @@
   if (nested_output.ne.1.and.surf_only.eq.1) call writeheader_surf
 
-  !open(unitdates,file=path(2)(1:length(2))//'dates')
-
   if (verbosity.gt.0) then
     print*,'call openreceptors'
@@ -359 +374 @@
   if (verbosity.gt.0) then
      if (verbosity.gt.1) then   
-       CALL SYSTEM_CLOCK(count_clock, count_rate, count_max)
-       write(*,*) 'SYSTEM_CLOCK',(count_clock - count_clock0)/real(count_rate) !, count_rate, count_max
+       call system_clock(count_clock, count_rate, count_max)
+       write(*,*) 'System clock',(count_clock - count_clock0)/real(count_rate) !, count_rate, count_max
      endif
      if (info_flag.eq.1) then
-       print*, 'info only mode (stop)'    
+       print*, 'Info only mode (stop)'    
        stop
      endif
@@ -373 +388 @@
   write(*,*) 'CONGRATULATIONS: YOU HAVE SUCCESSFULLY COMPLETED A FLEXPART MODEL RUN!'
 
+  ! output wall time
+  if (verbosity .gt. 0) then
+    call system_clock(count_clock,count_rate)
+    tins=(count_clock - count_clock0)/real(count_rate)
+    print*,'Wall time ',tins,'s, ',tins/60,'min, ',tins/3600,'h.'
+  endif
+
 end program flexpart