Changeset 3480 for LMDZ6/trunk/libf/phylmd/radlwsw_m.F90

Timestamp:

Apr 18, 2019, 5:13:26 PM (5 years ago)

Author:

Laurent Fairhead

Message:

Integration of revisions 3425 through 3427 from IPSLCM6.0.15 branch into the trunk
LF

File:

• LMDZ6/trunk/libf/phylmd/radlwsw_m.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/phylmd/radlwsw_m.F90

@@ -739 +739 @@
 !
 !--OB
-!--aerosol TOT  - anthropogenic+natural
-!--aerosol NAT  - natural only
+!--aerosol TOT  - anthropogenic+natural - index 2
+!--aerosol NAT  - natural only          - index 1
 !
       DO i = 1, kdlon
@@ -760 +760 @@
 !
 !--C. Kleinschmitt
-!--aerosol TOT  - anthropogenic+natural
-!--aerosol NAT  - natural only
+!--aerosol TOT  - anthropogenic+natural - index 2
+!--aerosol NAT  - natural only          - index 1
 !
       DO i = 1, kdlon
@@ -1054 +1054 @@
            zcool0(i,k)=(ZLWFT0_i(i,k)-ZLWFT0_i(i,k+1))*RDAY*RG/RCPD/PDP(i,k)
            IF(ok_volcan) THEN
-              zheat_volc(i,k)=(ZSWADAERO(i,k+1)-ZSWADAERO(i,k))*RDAY*RG/RCPD/PDP(i,k) !NL
-              zcool_volc(i,k)=(ZLWADAERO(i,k)-ZLWADAERO(i,k+1))*RDAY*RG/RCPD/PDP(i,k) !NL
+              zheat_volc(i,k)=(ZSWADAERO(i,k+1)-ZSWADAERO(i,k))*RG/RCPD/PDP(i,k) !NL
+              zcool_volc(i,k)=(ZLWADAERO(i,k)-ZLWADAERO(i,k+1))*RG/RCPD/PDP(i,k) !NL
            ENDIF
 !          print *,'heat cool heat0 cool0 ',zheat(i,k),zcool(i,k),zheat0(i,k),zcool0(i,k)