Changeset 2488 for LMDZ5/branches/testing/libf/phylmd/rrtm

Timestamp:

Apr 3, 2016, 12:09:34 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2457:2487 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/rrtm/rrtm_rtrn1a_140gp.F90 (modified) (2 diffs)
• libf/phylmd/rrtm/surayolmd.F90 (modified) (3 diffs)

LMDZ5/branches/testing/libf/phylmd/rrtm/rrtm_rtrn1a_140gp.F90

@@ -383 +383 @@
 !       & (1.0_JPRB - Z_CLDFRAC(I_LEV-1))   
 !    ENDIF
-     if(istcld(i_lev).ne.1) then
+     if(istcld(i_lev).ne.1.and.i_lev.ne.1) then
         z_faccmb1(i_lev+1) = max(0.,min(z_cldfrac(i_lev+1)-z_cldfrac(i_lev), &
                z_cldfrac(i_lev-1)-z_cldfrac(i_lev)))
@@ -496 +496 @@
 !    Z_FACCMB2D(I_LEV-1) = Z_FACCLD1D(I_LEV-1) * Z_FACCLR2D(I_LEV) *&
 !     & (1.0_JPRB - Z_CLDFRAC(I_LEV+1))  
-    if (istcldd(i_lev).ne.1.and.i_lev.ne.0) then
+    if (istcldd(i_lev).ne.1.and.i_lev.ne.1) then
        z_faccmb1d(i_lev-1) = max(0.,min(z_cldfrac(i_lev+1)-z_cldfrac(i_lev), &
                             z_cldfrac(i_lev-1)-z_cldfrac(i_lev)))

LMDZ5/branches/testing/libf/phylmd/rrtm/surayolmd.F90

@@ -1 @@
-SUBROUTINE SURAYOLMD(PPRES)
+SUBROUTINE SURAYOLMD
 #ifdef DOC
 
@@ -53 +53 @@
 IMPLICIT NONE
 LOGICAL LLTRACE, LLDEBUG
-REAL PPRES(NFLEVG)
 
 LLTRACE=.TRUE.
@@ -67 +66 @@
 WRITE(*,FMT='(''     SUPHY: '')')
 WRITE(*,FMT='('' ---------------- '')')
-!  CALL SUPHY(PPRES)
   CALL SUPHY(6)    !!!!! A REVOIR (MPL) argument KULOUT=6 "en dur"