Changeset dba4221 in flexpart.git for src/FLEXPART.f90

Timestamp:

Nov 9, 2022, 4:50:39 PM (18 months ago)

Author:

Pirmin Kaufmann <pirmin.kaufmann@…>

Branches:

bugfixes+enhancements

Children:

8ad70c7

Parents:

49e63b9

Message:

Bugfixes:

• options/SPECIES/SPECIES_009: corrected wrong number format, replaced comma by decimal point
• options/SPECIES/SPECIES_028: corrected wrong number format, moved sign of exponent to after the E
• options/SPECIES/specoverview.f90: added namelist parameters that appear in SPECIES files but were missing here
• src/FLEXPART.f90: replaced compiler-specific command line argument routines by standard Fortran intrinsic routines
• src/FLEXPART_MPI.f90: ditto
• src/gridcheck_ecmwf.f90: corrected handling of vertical levels when input files do not contain uppermost layers
• src/gridcheck_nests.f90: ditto
• src/readwind_ecmwf.f90: corrected handling of vertical levels when input files do not contain uppermost layers
• readwind_ecmwf_mpi.f90: ditto

Code enhancements:

• options/OUTGRID: added comments describing contents
• options/SPECIES/SPECIES_*: aligned comments
• options/SPECIES/specoverview.f90: removed commented lines, rectified lines indenting
• src/FLEXPART.f90: rectified lines indenting, updated date in version string
• src/FLEXPART_MPI.f90: ditto, and realigned code with src/FLEXPART.f90
• src/gridcheck_*.f90: added code to write out name of file before it is opened (helps a lot when an input file causes troubles)
• src/par_mod.f90: added comment explaining relevance of nuvzmax for GRIB input
• src/readreleases.f90: write out warning if too few particles are used to randomize release
• src/readspecies.f90: write out name of SPECIES file before it is read
• src/readwind_*.f90: write out name of input file before opening it
• src/writeheader_txt.f90: removed wrong comment

File:

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

src/FLEXPART.f90

@@ -44 +44 @@
   implicit none
 
-  integer :: i,j,ix,jy,inest, iopt
+  integer :: i, j, ix, jy, inest, iopt
   integer :: idummy = -320
   character(len=256) :: inline_options  !pathfile, flexversion, arg2
@@ -62 +62 @@
   ! FLEXPART version string
   flexversion_major = '10' ! Major version number, also used for species file names
-  flexversion='Version '//trim(flexversion_major)//'.4.1 (2020-08-05)'
+  flexversion='Version '//trim(flexversion_major)//'.4.1 (2022-11-09)'
   verbosity=0
 
@@ -69 +69 @@
 
   inline_options='none'
-  select case (iargc())
+  select case (command_argument_count())  ! Portable standard Fortran intrinsic procedure
   case (2)
-    call getarg(1,arg1)
+    call get_command_argument(1,arg1)     ! Portable standard Fortran intrinsic procedure
     pathfile=arg1
-    call getarg(2,arg2)
+    call get_command_argument(2,arg2)     ! Portable standard Fortran intrinsic procedure
     inline_options=arg2
   case (1)
-    call getarg(1,arg1)
+    call get_command_argument(1,arg1)     ! Portable standard Fortran intrinsic procedure
     pathfile=arg1
     if (arg1(1:1).eq.'-') then
@@ -90 +90 @@
   print*,'Welcome to FLEXPART ', trim(flexversion)
   print*,'FLEXPART is free software released under the GNU General Public License.'
- 
+
 
   ! Ingest inline options
@@ -112 +112 @@
     endif
     if (trim(inline_options).eq.'-i') then
-       print*, 'Info mode: provide detailed run specific information and stop'
-       verbosity=1
-       info_flag=1
+      print*, 'Info mode: provide detailed run specific information and stop'
+      verbosity=1
+      info_flag=1
     endif
     if (trim(inline_options).eq.'-i2') then
-       print*, 'Info mode: provide more detailed run specific information and stop'
-       verbosity=2
-       info_flag=1
+      print*, 'Info mode: provide more detailed run specific information and stop'
+      verbosity=2
+      info_flag=1
     endif
   endif
@@ -138 +138 @@
      !print*,'length(4)',length(4)
      !count=0,count_rate=1000
-     CALL SYSTEM_CLOCK(count_clock0, count_rate, count_max)
+     call system_clock(count_clock0, count_rate, count_max)
      !WRITE(*,*) 'SYSTEM_CLOCK',count, count_rate, count_max
      !WRITE(*,*) 'SYSTEM_CLOCK, count_clock0', count_clock0
@@ -159 +159 @@
       CALL SYSTEM_CLOCK(count_clock, count_rate, count_max)
       write(*,*) 'SYSTEM_CLOCK',(count_clock - count_clock0)/real(count_rate) !, count_rate, count_max
-    endif     
+    endif
   endif
 
@@ -217 +217 @@
   ! both for the mother domain and eventual nests
   !**********************************************
- 
-  if (verbosity.gt.0) then
-     write(*,*) 'call gridcheck'
+
+  if (verbosity.gt.0) then
+    write(*,*) 'call gridcheck'
   endif
 
@@ -258 +258 @@
 
   if (verbosity.eq.1) then
-     print*,'call readreceptors'
+    print*,'call readreceptors'
   endif
   call readreceptors
@@ -267 +267 @@
   !call readspecies
 
-
   ! Read the landuse inventory
   !***************************
@@ -329 +328 @@
     if (verbosity.gt.0) then
       print*,'numpart=0, numparticlecount=0'
-    endif    
+    endif
     numpart=0
     numparticlecount=0