Changeset 3353 for trunk/LMDZ.PLUTO/libf/phypluto/aeroptproperties.F90

Timestamp:

May 31, 2024, 10:03:40 PM (9 months ago)

Author:

afalco

Message:

Pluto PCM:
Added zrecast & old sedim ;
Choose haze file ;
AF

File:

• trunk/LMDZ.PLUTO/libf/phypluto/aeroptproperties.F90 (modified) (2 diffs)

trunk/LMDZ.PLUTO/libf/phypluto/aeroptproperties.F90

@@ -178 +178 @@
       INTEGER :: ngrid,nlayer
 !     Aerosol effective radius used for radiative transfer (meter)
-      REAL,INTENT(IN) :: reffrad(ngrid,nlayer,naerkind)
+      REAL :: reffrad(ngrid,nlayer,naerkind)
 !     Aerosol effective variance used for radiative transfer (n.u.)
       REAL,INTENT(IN) :: nueffrad(ngrid,nlayer,naerkind)
@@ -324 +324 @@
         minrad=min(MINVAL(radiustab(1,1,1:nsize(1,1))),MINVAL(radiustab(1,2,1:nsize(1,2))))
         maxrad=min(MAXVAL(radiustab(1,1,1:nsize(1,1))),MAXVAL(radiustab(1,2,1:nsize(1,2))))
-        IF ((MINVAL(reffrad).LE.minrad).OR.(MAXVAL(reffrad).GE.maxrad)) then
+        IF ((MINVAL(reffrad).LT.minrad).OR.(MAXVAL(reffrad).GT.maxrad)) then
            WRITE(*,*) 'Warning: particle size in grid box #'
-           WRITE(*,*) ig,' is too large to be used by the '
-           WRITE(*,*) 'radiative transfer; please extend the '
-           WRITE(*,*) 'interpolation grid to larger grain sizes.'
+           WRITE(*,*) ig,' is larger than optical properties. '
+           WRITE(*,*) 'reffrad=',MINVAL(reffrad),'-',MAXVAL(reffrad)
            WRITE(*,*) 'radiustab=',minrad,'-',maxrad
-           WRITE(*,*) 'reffrad=',MINVAL(reffrad),'-',MAXVAL(reffrad)
-           stop
+
+           ! ensure reffrad is within bounds of radiustab
+           WHERE(reffrad.LT.minrad)
+              reffrad=minrad
+           ENDWHERE
+           WHERE(reffrad.GT.maxrad)
+              reffrad=maxrad
+           ENDWHERE
+           WRITE(*,*) 'Truncated reffrad within radiustab bounds:'
+           WRITE(*,*) 'New reffrad=',MINVAL(reffrad),'-',MAXVAL(reffrad)
         ENDIF