Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/radlwsw_m.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/radlwsw_m.F90 (modified) (12 diffs)

LMDZ5/branches/testing/libf/phylmd/radlwsw_m.F90

@@ -24 +24 @@
    qsat, flwc, fiwc, &
    ref_liq, ref_ice, ref_liq_pi, ref_ice_pi, &
-   heat,heat0,cool,cool0,radsol,albpla,&
+   heat,heat0,cool,cool0,albpla,&
    topsw,toplw,solsw,sollw,&
    sollwdown,&
@@ -48 +48 @@
   USE DIMPHY
   USE assert_m, ONLY : assert
-  USE infotrac, ONLY : type_trac
+  USE infotrac_phy, ONLY : type_trac
   USE write_field_phy
 #ifdef REPROBUS
@@ -77 +77 @@
       USE YOERRTWN , ONLY : DELWAVE   ,TOTPLNK      
       USE YOMPHY3  , ONLY : RII0
-#else
-      USE aero_mod, ONLY : nbands_lw_rrtm
 #endif
+      USE aero_mod
 
   !======================================================================
@@ -111 +110 @@
   ! heat-----output-R- echauffement atmospherique (visible) (K/jour)
   ! cool-----output-R- refroidissement dans l'IR (K/jour)
-  ! radsol---output-R- bilan radiatif net au sol (W/m**2) (+ vers le bas)
   ! albpla---output-R- albedo planetaire (entre 0 et 1)
   ! topsw----output-R- flux solaire net au sommet de l'atm.
@@ -171 +169 @@
   include "YOMCST.h"
   include "clesphys.h"
-  include "iniprint.h"
 
 ! Input arguments
@@ -195 +192 @@
   LOGICAL, INTENT(in)  :: flag_aerosol_strat                             ! use stratospheric aerosols
   REAL,    INTENT(in)  :: cldfra(KLON,KLEV), cldemi(KLON,KLEV), cldtaupd(KLON,KLEV)
-  REAL,    INTENT(in)  :: tau_aero(KLON,KLEV,9,2)                        ! aerosol optical properties (see aeropt.F)
-  REAL,    INTENT(in)  :: piz_aero(KLON,KLEV,9,2)                        ! aerosol optical properties (see aeropt.F)
-  REAL,    INTENT(in)  :: cg_aero(KLON,KLEV,9,2)                         ! aerosol optical properties (see aeropt.F)
+  REAL,    INTENT(in)  :: tau_aero(KLON,KLEV,naero_grp,2)                        ! aerosol optical properties (see aeropt.F)
+  REAL,    INTENT(in)  :: piz_aero(KLON,KLEV,naero_grp,2)                        ! aerosol optical properties (see aeropt.F)
+  REAL,    INTENT(in)  :: cg_aero(KLON,KLEV,naero_grp,2)                         ! aerosol optical properties (see aeropt.F)
 !--OB
   REAL,    INTENT(in)  :: tau_aero_sw_rrtm(KLON,KLEV,2,NSW)                 ! aerosol optical properties RRTM
@@ -225 +222 @@
   REAL,    INTENT(out) :: heat(KLON,KLEV), cool(KLON,KLEV)
   REAL,    INTENT(out) :: heat0(KLON,KLEV), cool0(KLON,KLEV)
-  REAL,    INTENT(out) :: radsol(KLON), topsw(KLON), toplw(KLON)
+  REAL,    INTENT(out) :: topsw(KLON), toplw(KLON)
   REAL,    INTENT(out) :: solsw(KLON), sollw(KLON), albpla(KLON)
   REAL,    INTENT(out) :: topsw0(KLON), toplw0(KLON), solsw0(KLON), sollw0(KLON)
@@ -293 +290 @@
   REAL(KIND=8) zsolsw0(kdlon), zsollw0(kdlon)
   REAL(KIND=8) zznormcp
-  REAL(KIND=8) tauaero(kdlon,kflev,9,2)                     ! aer opt properties
-  REAL(KIND=8) pizaero(kdlon,kflev,9,2)
-  REAL(KIND=8) cgaero(kdlon,kflev,9,2)
+  REAL(KIND=8) tauaero(kdlon,kflev,naero_grp,2)                     ! aer opt properties
+  REAL(KIND=8) pizaero(kdlon,kflev,naero_grp,2)
+  REAL(KIND=8) cgaero(kdlon,kflev,naero_grp,2)
   REAL(KIND=8) PTAUA(kdlon,2,kflev)                         ! present-day value of cloud opt thickness (PTAU is pre-industrial value), local use
   REAL(KIND=8) POMEGAA(kdlon,2,kflev)                       ! dito for single scatt albedo
@@ -393 +390 @@
   IF (nb_gr*kdlon .NE. KLON) THEN
       PRINT*, "kdlon mauvais:", KLON, kdlon, nb_gr
-      call abort_gcm("radlwsw", "", 1)
+      call abort_physic("radlwsw", "", 1)
   ENDIF
   IF (kflev .NE. KLEV) THEN
       PRINT*, "kflev differe de KLEV, kflev, KLEV"
-      call abort_gcm("radlwsw", "", 1)
+      call abort_physic("radlwsw", "", 1)
   ENDIF
   !-------------------------------------------
@@ -1000 +997 @@
           zalbpla(i)   = ZFSUP(i,klev+1)/ZFSDN(i,klev+1)
          ENDIF
-         zsollwdown(i)= ZFLDN(i,1)
+!!! 5 juin 2015
+!!! Correction MP bug RRTM
+         zsollwdown(i)= -1.*ZFLDN(i,1)
       ENDDO
 !     print*,'OK2'
@@ -1025 +1024 @@
 #else
     abort_message="You should compile with -rrtm if running with iflag_rrtm=1"
-    call abort_gcm(modname, abort_message, 1)
+    call abort_physic(modname, abort_message, 1)
 #endif
     ENDIF ! iflag_rrtm
@@ -1031 +1030 @@
 
     DO i = 1, kdlon
-      radsol(iof+i) = zsolsw(i) + zsollw(i)
       topsw(iof+i) = ztopsw(i)
       toplw(iof+i) = ztoplw(i)