Changeset 37017c8 in flexpart.git for src/FLEXPART.f90

Timestamp:

Jul 15, 2015, 9:36:05 AM (9 years ago)

Author:

Ignacio Pisso <Ignacio.Pisso@…>

Branches:

svn-petra, svn-trunk

Children:

cbd7de3

Parents:

0317b57

git-author:

Ignacio Pisso <Ignacio.Pisso@…> (07/15/15 08:45:07)

git-committer:

Ignacio Pisso <Ignacio.Pisso@…> (07/15/15 09:36:05)

Message:

from svn
r30 | hasod | 2014-10-21 10:08:00 +0200 (Tue, 21 Oct 2014) | 5 lines
Changed paths:

M /trunk/src/FLEXPART.f90
M /trunk/src/com_mod.f90
M /trunk/src/makefile
A /trunk/src/makefile.netcdf
M /trunk/src/readcommand.f90
M /trunk/src/timemanager.f90

ADD: Optional (compressed) netcdf output added. Activated via COMMAND
file. During compile time switches -DNETCDF_OUTPUT -cpp need to be
invoked. Compliation and linking is shown in makefile.netcdf

File:

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

src/FLEXPART.f90

@@ -45 +45 @@
   use conv_mod
 
+#ifdef NETCDF_OUTPUT
+  use netcdf_output_mod, only: writeheader_netcdf
+#endif
+
+
   implicit none
 
@@ -303 +308 @@
   !******************************************************************
 
+  if (lnetcdfout.eq.1) then 
+#ifdef NETCDF_OUTPUT
+    call writeheader_netcdf(lnest = .false.)
+#endif
+  else 
+    call writeheader
+  end if
+
+  if (nested_output.eq.1) then
+    if (lnetcdfout.eq.1) then
+#ifdef NETCDF_OUTPUT
+      call writeheader_netcdf(lnest = .true.)
+#endif
+    else
+      call writeheader_nest
+    endif
+  endif
+
   if (verbosity.gt.0) then
     print*,'call writeheader'
@@ -315 +338 @@
   if (nested_output.ne.1.and.surf_only.eq.1) call writeheader_surf
 
-  !open(unitdates,file=path(2)(1:length(2))//'dates')
+  if (lnetcdfout.ne.1) then
+    open(unitdates,file=path(2)(1:length(2))//'dates')
+  end if
 
   if (verbosity.gt.0) then
@@ -359 +384 @@
   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 +398 @@
   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