Changes in / [1a04fab:b012d4d] in flexpart.git

Location:

src

Files:

• com_mod.f90 (modified) (1 diff)
• ecmwf_mod.f90 (modified) (1 diff)
• gfs_mod.f90 (modified) (1 diff)
• mpi_mod.f90 (modified) (3 diffs)
• par_mod.f90 (modified) (2 diffs)
• readpaths.f90 (modified) (1 diff)
• readspecies.f90 (modified) (1 diff)

src/com_mod.f90

@@ -373 +373 @@
 !ZHG Sep 2015  
 !   real :: icloud_stats(0:nxmax-1,0:nymax-1,5,numwfmem)
-   real :: ctwc(0:nxmax-1,0:nymax-1,numwfmem) ! ESO: =icloud_stats(:,:,4,:)
+   real :: ctwc(0:nxmax-1,0:nymax-1,numwfmem) ! eso: =icloud_stats(:,:,4,:)
 
 

src/ecmwf_mod.f90

@@ -51 +51 @@
   !*********************************************
 
-  integer,parameter :: maxnests=0,nxmaxn=361,nymaxn=181
+  integer,parameter :: maxnests=1,nxmaxn=361,nymaxn=181
+!  integer,parameter :: maxnests=1,nxmaxn=86,nymaxn=31
 
   ! nxmax,nymax        maximum dimension of wind fields in x and y

src/gfs_mod.f90

@@ -49 +49 @@
   !*********************************************
 
-  integer,parameter :: maxnests=0,nxmaxn=361,nymaxn=181
+  integer,parameter :: maxnests=1,nxmaxn=361,nymaxn=181
 
   ! nxmax,nymax        maximum dimension of wind fields in x and y

src/mpi_mod.f90

@@ -103 +103 @@
   logical :: lmp_use_reader=.false. ! true if separate readwind process is used
 
-! .true. if only using synchronous MPI send/recv (default)
+! true if only using synchronous MPI send/recv:
 ! If setting this to .false., numwfmem must be set to 3
 !===============================================================================
@@ -208 +208 @@
 !*********************************************
 
-    if (.not.lmp_sync.and.numwfmem.ne.3) then
-      if (lroot) then
-        write(*,FMT='(80("#"))')
-        write(*,*) '#### mpi_mod::mpif_init> ERROR: ', &
-             & 'numwfmem must be set to 3 for asyncronous reading ####'
-        write(*,FMT='(80("#"))')
-      end if
-      call MPI_FINALIZE(mp_ierr)
+    if (.not.lmp_sync.and.numwfmem.ne.3.and.lroot) then
+      write(*,FMT='(80("#"))')
+      write(*,*) '#### mpi_mod::mpif_init> ERROR: ', &
+           & 'numwfmem must be set to 3 for asyncronous reading ####'
+      write(*,FMT='(80("#"))')
       stop
     else if (lmp_sync.and.numwfmem.ne.2.and.lroot) then
@@ -221 +218 @@
       write(*,*) '#### mpi_mod::mpif_init> WARNING: ', &
            & 'numwfmem should be set to 2 for syncronous'
-      write(*,*) ' reading. Results will still be valid, but unneccesary memory &
-           &is allocated.'
+      write(*,*) ' reading. Results will still be valid, but unneccesary '
+      write(*,*) 'amount of memory is being allocated.'
       write(*,FMT='(80("#"))')
 ! Force "syncronized" version if all processes will call getfields

src/par_mod.f90

@@ -89 +89 @@
   real,parameter :: rho_water=1000. !ZHG 2015 [kg/m3]
   !ZHG MAR2016
-  real,parameter :: incloud_ratio=6.2
+  real,parameter :: incloud_ratio=2.2
 
   ! karman                  Karman's constant
@@ -186 +186 @@
   !**************************************************
 
-  integer,parameter :: maxpart=20000000
-  integer,parameter :: maxspec=6
+  integer,parameter :: maxpart=1000000
+  integer,parameter :: maxspec=1
   real,parameter :: minmass=0.0001
 

src/readpaths.f90

@@ -82 +82 @@
 
   do i=1,maxnests
-  ! ESO 2016 Added 'end'/'err' in case user forgot '====' at end of file and
-  ! maxnests > numbnests
-    read(unitpath,'(a)', end=30, err=30) path(numpath+2*(i-1)+1)
-    read(unitpath,'(a)', end=30, err=30) path(numpath+2*(i-1)+2)
+    read(unitpath,'(a)') path(numpath+2*(i-1)+1)
+    read(unitpath,'(a)') path(numpath+2*(i-1)+2)
     if (path(numpath+2*(i-1)+1)(1:5).eq.'=====') goto 30
     length(numpath+2*(i-1)+1)=index(path(numpath+2*(i-1)+1),' ')-1

src/readspecies.f90

@@ -223 +223 @@
 
   if (lroot) then
-! ZHG 2016.04.07 Start of changes
-    write(*,*) ' '
-    if (dquer(pos_spec) .gt.0)  write(*,'(a,i3,a,a,a)')       ' SPECIES: ', &
-         &id_spec,'  ', species(pos_spec),'  (AEROSOL) '
-    if (dquer(pos_spec) .le.0)  write(*,'(a,i3,a,a,a)')       ' SPECIES: ', &
-         &id_spec,'  ', species(pos_spec),'  (GAS) '
-
 ! Particles
 !**********