Changeset 2641 for LMDZ5/branches/testing/libf/phylmd/rrtm/suecrad.F90

Timestamp:

Sep 29, 2016, 11:26:46 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2593:2640 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/rrtm/suecrad.F90 (modified) (2 diffs)

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

@@ -245 +245 @@
 #include "naerad.h"
 #include "namrgri.h"
+!MPL/IM 20160915 on prend GES de phylmd
 #include "clesphys.h"
 
@@ -449 +450 @@
 
 ! 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
 !     ------------------------------------------------------------------