Changes in / [dd6a4aa:bb579a9] in flexpart.git

Location:

src

Files:

• coordtrafo.f90 (modified) (2 diffs)
• mpi_mod.f90 (modified) (2 diffs)
• readspecies.f90 (modified) (1 diff)

src/coordtrafo.f90

@@ -46 +46 @@
 
   integer :: i,j,k
+  real :: yrspc ! small real number relative to x
 
   if (numpoint.eq.0) goto 30
@@ -64 +65 @@
   ! CHECK IF RELEASE POINTS ARE WITHIN DOMAIN
   !******************************************
-
+  
+  yrspc = spacing(real(nymin1,kind=sp))
+  
   do i=1,numpoint
     if (sglobal.and.(ypoint1(i).lt.1.e-6)) ypoint1(i)=1.e-6
-    if (nglobal.and.(ypoint2(i).gt.real(nymin1)-1.e-5)) &
-         ypoint2(i)=real(nymin1)-1.e-5
-  if ((ypoint1(i).lt.1.e-6).or.(ypoint1(i).ge.real(nymin1)-1.e-6) &
-       .or.(ypoint2(i).lt.1.e-6).or.(ypoint2(i).ge.real(nymin1)-1.e-6) &
+    if (nglobal.and.(ypoint2(i).gt.real(nymin1,kind=dp)-1.e-5)) &
+         ypoint2(i)=real(nymin1,kind=dp)-10*yrspc
+    if ((ypoint1(i).lt.1.e-6).or.(ypoint1(i).ge.real(nymin1,kind=dp)-1.e-6) &
+       .or.(ypoint2(i).lt.1.e-6).or.(ypoint2(i).ge.real(nymin1,kind=dp)-yrspc) &
        .or.((.not.xglobal).and.((xpoint1(i).lt.1.e-6).or. &
-       (xpoint1(i).ge.real(nxmin1)-1.e-6).or.(xpoint2(i).lt.1.e-6).or. &
-       (xpoint2(i).ge.real(nxmin1)-1.e-6)))) then
+       (xpoint1(i).ge.real(nxmin1,kind=dp)-1.e-6).or.(xpoint2(i).lt.1.e-6).or. &
+       (xpoint2(i).ge.real(nxmin1,kind=dp)-1.e-6)))) then
       write(*,*) ' NOTICE: RELEASE POINT OUT OF DOMAIN DETECTED.'
       write(*,*) ' IT IS REMOVED NOW ... '
-      if (i.ge.1000) then
+      if (i.le.1000) then
          write(*,*) ' COMMENT: ',compoint(i)
       else

src/mpi_mod.f90

@@ -1658 +1658 @@
       write(*,*) "#### mpi_mod::mpif_gf_send_vars_async> ERROR: &
            & invalid memstat"
+      mind=-1
+      stop
     end if
 
@@ -2033 +2035 @@
       write(*,*) "#### mpi_mod::mpif_gf_send_vars_nest_async> ERROR: &
            & invalid memstat"
+      mind=-1
+      stop
     end if
 

src/readspecies.f90

@@ -67 +67 @@
   character(len=16) :: pspecies
   real :: pdecay, pweta_gas, pwetb_gas, preldiff, phenry, pf0, pdensity, pdquer
-  real :: pdsigma, pdryvel, pweightmolar, pohcconst, pohdconst, pohnconst, pspec_ass, pkao
+  real :: pdsigma, pdryvel, pweightmolar, pohcconst, pohdconst, pohnconst, pkao
   real :: pcrain_aero, pcsnow_aero, pccn_aero, pin_aero
-  integer :: readerror
+  integer :: readerror, pspec_ass
 
 ! declare namelist