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

Timestamp:

May 20, 2017, 9:41:16 AM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2865:2885 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/rrtm/rrtm_init_140gp.F90 (modified) (1 diff)
• libf/phylmd/rrtm/rrtm_taumol2.F90 (modified) (2 diffs)
• libf/phylmd/rrtm/yoerrtbg2.F90 (modified) (1 diff)

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

@@ -81 +81 @@
 !  Calculate lookup tables for functions needed in routine TAUMOL (TAUGB2)
 
+! FH 2017/05/03 
+! Ce facteur de correction CORR2 est vraiment bizare parce qu'on
+! impose 1. aux bornes,  en I=1 et I=200 mais la fonction
+! CORE=( 1 - sqrt(i/im) ) / ( 1 - i/im ) = 1/ ( 1 + sqrt(i/im))
+! vaut 1 en i=1 et 1/2 en i=im ...
+
 CORR1(0) = 1.0_JPRB
-CORR1(400) = 1.0_JPRB
+CORR1(200) = 1.0_JPRB
 CORR2(0) = 1.0_JPRB
-CORR2(400) = 1.0_JPRB
-DO I = 1,399
-  Z_FP = 0.0025_JPRB*REAL(I)
+CORR2(200) = 1.0_JPRB
+DO I = 1,199
+  Z_FP = 0.005_JPRB*REAL(I)
   Z_RTFP = SQRT(Z_FP)
   CORR1(I) = Z_RTFP/Z_FP

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

@@ -111 +111 @@
   IFP=MAX(0,IFP)
 
+! FH 2017/05/02
+! Modification parce qu'on avait un plantage sur un cas 1D.
+! C'est evidemment une correction suspecte
+  IF (IFP>200) THEN
+      PRINT*,'WARNING IFP=',IFP,' 2.E2_JPRB*Z_FP+0.5_JPRB avec Z_FP=',Z_FP
+      IFP=200
+  ENDIF
+
   Z_FC00(I_LAY) = P_FAC00(I_LAY) * CORR2(IFP)
   Z_FC10(I_LAY) = P_FAC10(I_LAY) * CORR2(IFP)
@@ -147 +155 @@
 !---MI 981104        
   IF (IFP <= 0) IFP=0
+  IF (IFP>200) THEN
+      PRINT*,'WARNING IFP=',IFP,' 2.E2_JPRB*Z_FP+0.5_JPRB avec Z_FP=',Z_FP
+      IFP=200
+  ENDIF
 
   Z_FC00(I_LAY) = P_FAC00(I_LAY) * CORR2(IFP)

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

@@ -13 +13 @@
 !    -------------------------------------------------------------------
 
-REAL(KIND=JPRB) :: CORR1(0:400)
-REAL(KIND=JPRB) :: CORR2(0:400)
+REAL(KIND=JPRB) :: CORR1(0:200)
+REAL(KIND=JPRB) :: CORR2(0:200)
 
 !     -----------------------------------------------------------------