Changes in / [8fcfd08:5b7ec80] in flexpart.git

Location:

src

Files:

• concoutput_mpi.f90 (modified) (1 diff)
• readOHfield.f90 (modified) (3 diffs)
• timemanager_mpi.f90 (modified) (2 diffs)

src/concoutput_mpi.f90

@@ -113 +113 @@
   integer :: ierr
   character(LEN=100) :: dates_char
+!  character :: dates_char
 
 ! Measure execution time

src/readOHfield.f90

@@ -22 +22 @@
 subroutine readOHfield
 
-!*****************************************************************************
-!                                                                            *
-! Reads the OH field into memory                                             *
-!                                                                            *
-! AUTHOR: R.L. Thompson, Nov 2014                                            *
-!                                                                            *
-! UPDATES:                                                                   *
-!   03/2018 SEC: Converted original netCDF files to binary format            *
-!*****************************************************************************
-!                                                                            *
-! Variables:                                                                 *
-!                                                                            *
-! path(numpath)              contains the path names                         *
-! lonOH(nxOH)                longitude of OH fields                          *
-! latOH(nyOH)                latitude of OH fields                           *
-! altOH(nzOH)                altitude of OH fields                           *
-! etaOH(nzOH)                eta-levels of OH fields                         *
-! OH_field(nxOH,nyOH,nzOH,m) OH concentration (molecules/cm3)                *
-!                                                                            *
-!                                                                            *
-!*****************************************************************************
+  !*****************************************************************************
+  !                                                                            *
+  ! Reads the OH field into memory                                             *
+  !                                                                            *
+  ! AUTHOR: R.L. Thompson, Nov 2014                                            *
+  !                                                                            *
+  !*****************************************************************************
+  !                                                                            *
+  ! Variables:                                                                 *
+  !                                                                            *
+  ! path(numpath)              contains the path names                         *
+  ! lonOH(nxOH)                longitude of OH fields                          *
+  ! latOH(nyOH)                latitude of OH fields                           *
+  ! altOH(nzOH)                altitude of OH fields                           *
+  ! etaOH(nzOH)                eta-levels of OH fields                         *
+  ! OH_field(nxOH,nyOH,nzOH,m) OH concentration (molecules/cm3)                *
+  !                                                                            *
+  !                                                                            *
+  !*****************************************************************************
 
   use oh_mod
@@ -50 +48 @@
   implicit none
 
+  include 'netcdf.inc'
+
   character(len=150) :: thefile
   character(len=2) :: mm
   integer :: nid,ierr,xid,yid,zid,vid,m
-  integer :: i,j,k,l
   real, dimension(:), allocatable :: etaOH
 
@@ -62 +61 @@
   real, parameter :: scalehgt=7000. ! scale height in metres
 
-
-  open(unitOH,file=trim(ohfields_path) &
-       //'OH_FIELDS/OH_variables.bin',status='old', &
-       form='UNFORMATTED', iostat=ierr, convert='little_endian')
-
-  if(ierr.ne.0) then
-    write(*,*) 'Cannot read binary OH fields in ',trim(ohfields_path)//'OH_FIELDS/OH_variables.bin'
-    stop
-  endif
-
-  read(unitOH) nxOH
-  read(unitOH) nyOH
-  read(unitOH) nzOH
-  write(*,*) nxOH,nyOH,nzOH
-
-! allocate variables
-  allocate(lonOH(nxOH))
-  allocate(latOH(nyOH))
-  allocate(etaOH(nzOH))
-  allocate(altOH(nzOH))
-  allocate(OH_field(nxOH,nyOH,nzOH,12))
-  allocate(OH_hourly(nxOH,nyOH,nzOH,2))
-
-  read(unitOH) (lonjr(i),i=1,360)
-  read(unitOH) (latjr(i),i=1,180)
-  read(unitOH) (((jrate_average(i,j,k),i=1,360),j=1,180),k=1,12)
-  read(unitOH) (lonOH(i),i=1,nxOH)
-  read(unitOH) (latOH(i),i=1,nyOH)
-  read(unitOH) (lonOH(i),i=1,nxOH)
-
-  read(unitOH) (altOH(i),i=1,nzOH)
-  read(unitOH) ((((OH_field(i,j,k,l),i=1,nxOH),j=1,nyOH),k=1,nzOH),l=1,12)
-  read(unitOH) ((((OH_hourly(i,j,k,l),i=1,nxOH),j=1,nyOH),k=1,nzOH),l=1,2)
-  write(*,*) 'nzOH: ',nzOH,(altOH(i),i=1,nzOH) 
+  ! Read OH fields and level heights
+  !********************************
+
+  do m=1,12
+  
+    ! open netcdf file
+    write(mm,fmt='(i2.2)') m
+!    thefile=trim(path(1))//'OH_FIELDS/'//'geos-chem.OH.2005'//mm//'01.nc'
+    thefile=trim(ohfields_path)//'OH_FIELDS/'//'geos-chem.OH.2005'//mm//'01.nc'
+    ierr=nf_open(trim(thefile),NF_NOWRITE,nid)
+    if(ierr.ne.0) then
+      write (*,*) 'The OH field at: '//thefile// ' could not be opened'
+      write (*,*) 'please copy the OH fields there, or change the path in the'
+      write (*,*) 'COMMAND namelist!'
+      write(*,*) nf_strerror(ierr)
+      stop
+    endif
+
+    ! inquire about variables
+    ierr=nf_inq_dimid(nid,'Lon-000',xid)
+    if(ierr.ne.0) then
+      write(*,*) nf_strerror(ierr)
+      stop
+    endif
+    ierr=nf_inq_dimid(nid,'Lat-000',yid)
+    if(ierr.ne.0) then
+      write(*,*) nf_strerror(ierr)
+      stop
+    endif
+    ierr=nf_inq_dimid(nid,'Alt-000',zid)
+    if(ierr.ne.0) then
+      write(*,*) nf_strerror(ierr)
+      stop
+    endif
+
+    if(m.eq.1) then
+
+      ! read dimension sizes
+      ierr=nf_inq_dimlen(nid,xid,nxOH)
+      if(ierr.ne.0) then
+        write(*,*) nf_strerror(ierr)
+        stop
+      endif
+      ierr=nf_inq_dimlen(nid,yid,nyOH)
+      if(ierr.ne.0) then
+        write(*,*) nf_strerror(ierr)
+        stop
+      endif
+      ierr=nf_inq_dimlen(nid,zid,nzOH)
+      if(ierr.ne.0) then
+        write(*,*) nf_strerror(ierr)
+        stop
+      endif  
+
+      ! allocate variables
+      allocate(lonOH(nxOH))
+      allocate(latOH(nyOH))
+      allocate(etaOH(nzOH))
+      allocate(altOH(nzOH))
+      allocate(OH_field(nxOH,nyOH,nzOH,12))
+      allocate(OH_hourly(nxOH,nyOH,nzOH,2))
+
+      ! read dimension variables
+      ierr=nf_inq_varid(nid,'LON',xid)
+      ierr=nf_get_var_real(nid,xid,lonOH)
+      if(ierr.ne.0) then
+        write(*,*) nf_strerror(ierr)
+        stop
+      endif
+      ierr=nf_inq_varid(nid,'LAT',yid)
+      ierr=nf_get_var_real(nid,yid,latOH)
+      if(ierr.ne.0) then
+        write(*,*) nf_strerror(ierr)
+        stop
+      endif
+      ierr=nf_inq_varid(nid,'ETAC',zid)
+      ierr=nf_get_var_real(nid,zid,etaOH)
+      if(ierr.ne.0) then
+        write(*,*) nf_strerror(ierr)
+        stop
+      endif
+
+      ! convert eta-level to altitude (assume surface pressure of 1010 hPa)
+      altOH=log(1010./(etaOH*1010.))*scalehgt
+
+    endif ! m.eq.1
+
+    ! read OH_field
+    ierr=nf_inq_varid(nid,'CHEM-L_S__OH',vid)
+    ierr=nf_get_var_real(nid,vid,OH_field(:,:,:,m))
+    if(ierr.ne.0) then
+      write(*,*) nf_strerror(ierr)
+      stop
+    endif
+
+    ierr=nf_close(nid)
+
+  end do 
+ 
+  deallocate(etaOH)
+
+  ! Read J(O1D) photolysis rates
+  !********************************  
+
+  ! open netcdf file
+!  thefile=trim(path(1))//'OH_FIELDS/jrate_average.nc'
+  thefile=trim(ohfields_path)//'OH_FIELDS/jrate_average.nc'
+  ierr=nf_open(trim(thefile),NF_NOWRITE,nid)
+  if(ierr.ne.0) then
+    write(*,*) nf_strerror(ierr)
+    stop
+  endif
+
+  ! read dimension variables
+  ierr=nf_inq_varid(nid,'longitude',xid)
+  ierr=nf_get_var_real(nid,xid,lonjr)
+  if(ierr.ne.0) then
+    write(*,*) nf_strerror(ierr)
+    stop
+  endif
+  ierr=nf_inq_varid(nid,'latitude',yid)
+  ierr=nf_get_var_real(nid,yid,latjr)
+  if(ierr.ne.0) then
+    write(*,*) nf_strerror(ierr)
+    stop
+  endif
+
+  ! read jrate_average
+  ierr=nf_inq_varid(nid,'jrate',vid)
+  ierr=nf_get_var_real(nid,vid,jrate_average)
+  if(ierr.ne.0) then
+    write(*,*) nf_strerror(ierr)
+    stop
+  endif
+
+  ierr=nf_close(nid) 
+
+  return
 
 end subroutine readOHfield

src/timemanager_mpi.f90

@@ -808 +808 @@
                  call initial_cond_calc(itime+lsynctime,j)
             itra1(j)=-999999999
-            if (verbosity.gt.0) then
-              print*, 'terminated particle ',j,'for age'
-            endif
+            !print*, 'terminated particle ',j,'for age'
           endif
         endif
@@ -821 +819 @@
 
 
-! Counter of "unstable" particle velocity during a time scale
-! of maximumtl=20 minutes (defined in com_mod)
-!************************************************************
+! Added by mc: counter of "unstable" particle velocity during a time scale
+!   of maximumtl=20 minutes (defined in com_mod)
+
     total_nan_intl=0
     i_nan=i_nan+1 ! added by mc to count nan during a time of maxtl (i.e. maximum tl fixed here to 20 minutes, see com_mod)