Changeset 2626

Timestamp:

Sep 15, 2016, 4:20:56 PM (8 years ago)

Author:

musat

Message:

Bug correction : rrtm uses LMDZ' GES from clesphys.h
MPL/IM

Location:

LMDZ5/trunk/libf/phylmd/rrtm

Files:

• rrtm_ecrt_140gp.F90 (modified) (3 diffs)
• srtm_srtm_224gp_mcica.F90 (modified) (2 diffs)
• suecrad.F90 (modified) (3 diffs)
• surdi.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/rrtm/rrtm_ecrt_140gp.F90

@@ -31 +31 @@
  & JPINPX  
 USE YOERAD   , ONLY : NLW      ,NOVLP
-USE YOERDI   , ONLY :    RCH4     ,RN2O    ,RCFC11  ,RCFC12
+!MPL/IM 20160915 on prend GES de phylmd USE YOERDI   , ONLY :    RCH4     ,RN2O    ,RCFC11  ,RCFC12
 USE YOESW    , ONLY : RAER
 
@@ -113 +113 @@
 REAL(KIND=JPRB) :: ZHOOK_HANDLE
 
+!MPL/IM 20160915 on prend GES de phylmd
+#include "clesphys.h"
 ! ***
 
@@ -400 +402 @@
 
 !     ------------------------------------------------------------------
-
+ 
 IF (LHOOK) CALL DR_HOOK('RRTM_ECRT_140GP',1,ZHOOK_HANDLE)
 END SUBROUTINE RRTM_ECRT_140GP

LMDZ5/trunk/libf/phylmd/rrtm/srtm_srtm_224gp_mcica.F90

@@ -16 +16 @@
 
 USE PARSRTM  , ONLY : JPLAY
-USE YOERDI   , ONLY : RCH4   , RN2O   
+!MPL/IM 20160915 on prend GES de phylmd USE YOERDI   , ONLY : RCH4   , RN2O   
 USE YOERAD   , ONLY : NAER
 USE YOESRTAER, ONLY : RSRTAUA, RSRPIZA, RSRASYA
@@ -133 +133 @@
 #include "srtm_setcoef.intfb.h"
 #include "srtm_spcvrt_mcica.intfb.h"
-
+!MPL/IM 20160915 on prend GES de phylmd
+#include "clesphys.h"
 
 !-----------------------------------------------------------------------

LMDZ5/trunk/libf/phylmd/rrtm/suecrad.F90

@@ -95 +95 @@
 USE YOMPHY   , ONLY : LMPHYS, LRAYFM   ,LRAYFM15
 USE YOEPHY   , ONLY : LEPHYS   ,LERADI, LE4ALB
-USE YOERDI   , ONLY : RCCO2, RCCH4, RCN2O, RCCFC11, RCCFC12, RSOLINC
+!!MPL/IM 20160915 on prend GES de phylmd USE YOERDI   , ONLY : RCCO2, RCCH4, RCN2O, RCCFC11, RCCFC12, RSOLINC
+USE YOERDI   , ONLY : RSOLINC
 USE YOERAD   , ONLY : NAER     , NOZOCL   ,&
  & NRADFR   ,NRADPFR  ,NRADPLA  ,NRINT    ,&
@@ -245 +246 @@
 #include "naerad.h"
 #include "namrgri.h"
+!MPL/IM 20160915 on prend GES de phylmd
 #include "clesphys.h"
 
@@ -449 +451 @@
 
 ! Valeurs LMDZ (physiq.def) MPL 18052010
-RCCO2   = 348.E-06_JPRB
-RCCH4   = 1.65E-06_JPRB
-RCN2O   = 306.E-09_JPRB
-RCCFC11 = 280.E-12_JPRB
-RCCFC12 = 484.E-12_JPRB
-print *,'SUECRAD-1'
-
+!RCCO2   = 348.E-06_JPRB
+!RCCH4   = 1.65E-06_JPRB
+!RCN2O   = 306.E-09_JPRB
+!RCCFC11 = 280.E-12_JPRB
+!RCCFC12 = 484.E-12_JPRB
+
+!MPL/IM 20160915 on prend GES de phylmd
+RCCO2   = CO2_ppm * 1.0e-06
+RCCH4   = CH4_ppb * 1.0e-09
+RCN2O   = N2O_ppb * 1.0e-09
+RCCFC11 = CFC11_ppt * 1.0e-12
+RCCFC12 = CFC12_ppt * 1.0e-12
+!print *,'LMDZSUECRAD-1 RCCO2=',RCCO2
+!print *,'LMDZSUECRAD-1 RCCH4=',RCCH4
+!print *,'LMDZSUECRAD-1 RCN2O=',RCN2O
+!print *,'LMDZSUECRAD-1 RCCFC11=',RCCFC11
+!print *,'LMDZSUECRAD-1 RCCFC12=',RCCFC12
 !     ------------------------------------------------------------------
 

LMDZ5/trunk/libf/phylmd/rrtm/surdi.F90

@@ -54 +54 @@
 USE YOERDI   , ONLY : RRAE     ,&
 ! & RCARDI   ,RCH4     ,RN2O     ,RO3      ,RCFC11   ,&
- & RCFC12, &   
+! & RCFC12, &   
  & REPCLC   ,REPH2O   ,RSUNDUR  ,&
  & RCCO2    ,RCCH4    ,RCN2O    ,RCCFC11  ,RCCFC12
@@ -61 +61 @@
 IMPLICIT NONE
 
+!MPL/IM 20160915 on prend GES de phylmd
 !#include "clesphys.h"
 REAL(KIND=JPRB) :: ZAIRMWG, ZC11MWG, ZC12MWG, ZCH4MWG, ZCO2MWG, ZN2OMWG, ZO3MWG