Changeset dba4221 in flexpart.git for src/FLEXPART_MPI.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_MPI.f90 (modified) (20 diffs)

src/FLEXPART_MPI.f90

@@ -44 +44 @@
   implicit none
 
-  integer :: i,j,ix,jy,inest
+  integer :: i, j, ix, jy, inest, iopt
   integer :: idummy = -320
   character(len=256) :: inline_options  !pathfile, flexversion, arg2
@@ -71 +71 @@
   call gasdev1(idummy,rannumb(maxrand),rannumb(maxrand-1))
 
+
   ! FLEXPART version string
   flexversion_major = '10' ! Major version number, also used for species file names
-  flexversion='Ver. '//trim(flexversion_major)//'.2beta MPI (2017-08-01)'
+  flexversion='Version '//trim(flexversion_major)//'.4.1 MPI (2022-11-09)'
   verbosity=0
 
@@ -80 +81 @@
 
   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
@@ -97 +98 @@
   end select
   
-  if (lroot) then
   ! Print the GPL License statement
   !*******************************************************
+  if (lroot) then
     print*,'Welcome to FLEXPART ', trim(flexversion)
     print*,'FLEXPART is free software released under the GNU General Public License.'
   endif
-  
+
+
+  ! Ingest inline options
+  !*******************************************************
   if (inline_options(1:1).eq.'-') then
-    if (trim(inline_options).eq.'-v'.or.trim(inline_options).eq.'-v1') then
-      print*, 'Verbose mode 1: display detailed information during run'
+    print*,'inline_options:',inline_options
+    !verbose mode
+    iopt=index(inline_options,'v') 
+    if (iopt.gt.0) then
       verbosity=1
-    endif
-    if (trim(inline_options).eq.'-v2') then
-      print*, 'Verbose mode 2: display more detailed information during run'
-      verbosity=2
+      !print*, iopt, inline_options(iopt+1:iopt+1)
+      if  (trim(inline_options(iopt+1:iopt+1)).eq.'2') then
+        print*, 'Verbose mode 2: display more detailed information during run'
+        verbosity=2
+      endif
+    endif
+    !debug mode 
+    iopt=index(inline_options,'d')
+    if (iopt.gt.0) then
+      debug_mode=.true.
     endif
     if (trim(inline_options).eq.'-i') then
@@ -125 +137 @@
   endif
            
+  if (verbosity.gt.0) then
+    print*, 'nxmax=',nxmax
+    print*, 'nymax=',nymax
+    print*, 'nzmax=',nzmax
+    print*,'nxshift=',nxshift 
+  endif
+  
   if (verbosity.gt.0) then
     write(*,*) 'call readpaths'
@@ -133 +152 @@
      !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
@@ -157 +176 @@
   endif
 
-  ! Initialize arrays in com_mod 
+  ! Initialize arrays in com_mod
   !*****************************
-
   if(.not.(lmpreader.and.lmp_use_reader)) call com_mod_allocate_part(maxpart_mpi)
 
 
-! Read the age classes to be used
-!********************************
+  ! Read the age classes to be used
+  !********************************
   if (verbosity.gt.0 .and. lroot) then
     write(*,*) 'call readageclasses'
@@ -185 +203 @@
   ! Detect metdata format
   !**********************
+  if (verbosity.gt.0 .and. lroot) then
+    write(*,*) 'call detectformat'
+  endif
 
   metdata_format = detectformat()
@@ -207 +228 @@
   call com_mod_allocate_nests
 
-! Read the model grid specifications,
-! both for the mother domain and eventual nests
-!**********************************************
+  ! Read the model grid specifications,
+  ! both for the mother domain and eventual nests
+  !**********************************************
 
   if (verbosity.gt.0 .and. lroot) then
@@ -221 +242 @@
   end if
 
-
   if (verbosity.gt.1 .and. lroot) then   
     call system_clock(count_clock, count_rate, count_max)
@@ -227 +247 @@
   endif      
 
-
   if (verbosity.gt.0 .and. lroot) then
     write(*,*) 'call gridcheck_nests'
@@ -233 +252 @@
   call gridcheck_nests
 
-
-! Read the output grid specifications
-!************************************
-
-  if (verbosity.gt.0 .and. lroot) then
-    WRITE(*,*) 'call readoutgrid'
+  ! Read the output grid specifications
+  !************************************
+
+  if (verbosity.gt.0 .and. lroot) then
+    write(*,*) 'call readoutgrid'
   endif
 
@@ -246 +264 @@
     call readoutgrid_nest
     if (verbosity.gt.0.and.lroot) then
-      WRITE(*,*) '# readoutgrid_nest'
+      write(*,*) '# readoutgrid_nest'
     endif
   endif
@@ -263 +281 @@
   !call readspecies
 
-
   ! Read the landuse inventory
   !***************************
@@ -272 +289 @@
   call readlanduse
 
-
-! Assign fractional cover of landuse classes to each ECMWF grid point
-!********************************************************************
+  ! Assign fractional cover of landuse classes to each ECMWF grid point
+  !********************************************************************
 
   if (verbosity.gt.0 .and. lroot) then
@@ -289 +305 @@
   call readreleases
 
-
-! Read and compute surface resistances to dry deposition of gases
-!****************************************************************
+  ! Read and compute surface resistances to dry deposition of gases
+  !****************************************************************
 
   if (verbosity.gt.0 .and. lroot) then
@@ -305 +320 @@
     print*,'call coordtrafo'
   endif
-
 
   ! Initialize all particles to non-existent
@@ -337 +351 @@
   endif
 
-
   ! Calculate volume, surface area, etc., of all output grid cells
   ! Allocate fluxes and OHfield if necessary
   !***************************************************************
-
 
   if (verbosity.gt.0 .and. lroot) then
@@ -387 +399 @@
 
     call writeheader
-! FLEXPART 9.2 ticket ?? write header in ASCII format 
+    ! FLEXPART 9.2 ticket ?? write header in ASCII format 
     call writeheader_txt
 
@@ -445 +457 @@
   end if
 
-! Calculate particle trajectories
-!********************************
+  ! Calculate particle trajectories
+  !********************************
 
   if (verbosity.gt.0.and. lroot) then