Changeset 3411 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/tropopause_m.F90

Timestamp:

Nov 5, 2018, 3:24:59 PM (6 years ago)

Author:

Laurent Fairhead

Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:

LMDZ6/branches/DYNAMICO-conv

Files:

• . (modified) (1 prop)
• libf/phylmd/tropopause_m.F90 (modified) (3 diffs)

LMDZ6/branches/DYNAMICO-conv/libf/phylmd/tropopause_m.F90

@@ -9 +9 @@
 !-------------------------------------------------------------------------------
 !
-FUNCTION dyn_tropopause(t, ts, paprs, pplay, rot, itrop, thet0, pvor0)
+FUNCTION dyn_tropopause(t, ts, paprs, pplay, rot, thet0, pvor0)
 !
 !-------------------------------------------------------------------------------
@@ -26 +26 @@
   REAL, INTENT(IN)  ::  pplay(:,:) !--- Cells-centers pressure
   REAL, INTENT(IN)  ::    rot(:,:) !--- Cells-centers relative vorticity
-  INTEGER, INTENT(OUT), OPTIONAL :: itrop(klon) !--- Last tropospheric layer idx
-  REAL,    INTENT(IN),  OPTIONAL :: thet0, pvor0
+  REAL, INTENT(IN), OPTIONAL :: thet0, pvor0
 !-------------------------------------------------------------------------------
 ! Local variables:
   include "YOMCST.h"
-  REAL, PARAMETER :: DynPTrMin =8.E+3 !--- Thresholds for minimum and maximum
-  REAL, PARAMETER :: DynPTrMax =4.E+4 !    dynamical tropopause pressure (Pa).
   CHARACTER(LEN=80)  :: sub
   INTEGER :: i, k, kb, kt, kp, ib, ie, nw
@@ -103 +100 @@
     dyn_tropopause(i) = MAX( pplay(i,kp+1)*(pplay(i,kp)/pplay(i,kp+1))**al,    &
                             dyn_tropopause(i) )
-    !--- UNREALISTIC VALUES DETECTION
-    IF(dyn_tropopause(i)<DynPTrMin.OR.dyn_tropopause(i)>DynPTrMax) THEN
-      dyn_tropopause(i)=MIN(MAX(dyn_tropopause(i),DynPTrMax),DynPTrMin)
-      DO kt=1,klev-1; IF(pplay(i,kt+1)>dyn_tropopause(i)) EXIT; END DO; kp=kt
-    END IF
-    !--- LAST TROPOSPHERIC LAYER INDEX NEEDED
-    IF(PRESENT(itrop)) itrop(i)=MAX(kt,kp)
   END DO