Changeset 1d072c0 in flexpart.git for src

Timestamp:

Aug 7, 2017, 2:43:38 PM (7 years ago)

Author:

Espen Sollum ATMOS <eso@…>

Branches:

master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie

Children:

aa8c34a

Parents:

b5127f9

Message:

Changed some limits to adapt to high resolution (<0.5) winds (when i.e. 360.0 - 1.e-5 = 360.0 for 32-bit floats)

File:

• src/coordtrafo.f90 (modified) (2 diffs)

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