Changeset 505a96e in flexpart.git for src/readcommand.f90

Timestamp:

May 22, 2018, 2:40:40 PM (6 years ago)

Author:

Ignacio Pisso <Ignacio.Pisso@…>

Branches:

master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie

Children:

cd6e10c, 77778f8

Parents:

3d04845 (diff), 20963b1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Pull: Merge branch 'dev' of ​https://git.nilu.no/flexpart/flexpart into dev

File:

• src/readcommand.f90 (modified) (2 diffs)

src/readcommand.f90

@@ -332 +332 @@
      case (3)  ! 3 .. wet deposition in outputfield 
         ind_rel = 3
-         write(*,*) ' #### FLEXPART WET DEPOSITION BACKWARD MODE    #### '
-         write(*,*) ' #### Releaseheight is forced to 0 - 20km      #### '
-         write(*,*) ' #### Release is performed above ground lev    #### '
+        if (lroot) then
+          write(*,*) ' #### FLEXPART WET DEPOSITION BACKWARD MODE    #### '
+          write(*,*) ' #### Releaseheight is forced to 0 - 20km      #### '
+          write(*,*) ' #### Release is performed above ground lev    #### '
+        end if
          WETBKDEP=.true.
          allocate(xscav_frac1(maxpart,maxspec))
      case (4)  ! 4 .. dry deposition in outputfield
          ind_rel = 4
-         write(*,*) ' #### FLEXPART DRY DEPOSITION BACKWARD MODE    #### '
-         write(*,*) ' #### Releaseheight is forced to 0 - 2*href    #### '
-         write(*,*) ' #### Release is performed above ground lev    #### '
+         if (lroot) then
+           write(*,*) ' #### FLEXPART DRY DEPOSITION BACKWARD MODE    #### '
+           write(*,*) ' #### Releaseheight is forced to 0 - 2*href    #### '
+           write(*,*) ' #### Release is performed above ground lev    #### '
+         end if
          DRYBKDEP=.true.
          allocate(xscav_frac1(maxpart,maxspec))
@@ -392 +396 @@
   endif
 
-!  check for netcdf output switch (use for non-namelist input only!)
+! Check for netcdf output switch
+!*******************************
   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
+#ifndef USE_NCF
+     write(*,*) 'ERROR: netcdf output not activated during compile time but used in COMMAND file!'
+     write(*,*) 'Please recompile with netcdf library (`make [...] ncf=yes`) or use standard output format.'
+     stop
+#endif
   endif