Changeset 37017c8 in flexpart.git for src/readcommand.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/readcommand.f90 (modified) (5 diffs)

src/readcommand.f90

@@ -109 +109 @@
   nested_output, &
   linit_cond, &
+  lnetcdfout, &
   surf_only    
 
@@ -138 +139 @@
   nested_output=0
   linit_cond=0
+  lnetcdfout=0
   surf_only=0 
 
@@ -344 +346 @@
   endif
 
+!  check for netcdf output switch (use for non-namelist input only!)
+  if (iout.ge.8) then
+     lnetcdfout = 1
+     iout = iout - 8
+#ifndef NETCDF_OUTPUT
+     print*,'ERROR: netcdf output not activated during compile time but used in COMMAND file!'
+     print*,'Please recompile with netcdf library or use standard output format.'
+     stop
+#endif
+  endif
+
   ! Check whether a valid option for gridded model output has been chosen
   !**********************************************************************
@@ -349 +362 @@
   if ((iout.lt.1).or.(iout.gt.5)) then
     write(*,*) ' #### FLEXPART MODEL ERROR! FILE COMMAND:     #### '
-    write(*,*) ' #### IOUT MUST BE 1, 2, 3, 4, OR 5!          #### '
+    write(*,*) ' #### IOUT MUST BE 1, 2, 3, 4, OR 5 FOR       #### '
+    write(*,*) ' #### STANDARD FLEXPART OUTPUT OR  9 - 13     #### '
+    write(*,*) ' #### FOR NETCDF OUTPUT                       #### '
     stop
   endif
@@ -361 +376 @@
     stop
   endif
-