Changeset 2748 for LMDZ5/trunk

Timestamp:

Jan 8, 2017, 1:47:25 PM (8 years ago)

Author:

oboucher

Message:

Small tweaks to aeropt RRTM routines

Location:

LMDZ5/trunk/libf/phylmd/rrtm

Files:

• aeropt_5wv_rrtm.F90 (modified) (2 diffs)
• aeropt_6bands_rrtm.F90 (modified) (5 diffs)
• aeropt_lw_rrtm.F90 (modified) (3 diffs)

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

@@ -12 +12 @@
   USE DIMPHY
   USE aero_mod
-  USE phys_local_var_mod, only: od550aer,od865aer,ec550aer,od550lt1aer
+  USE phys_local_var_mod, ONLY: od550aer,od865aer,ec550aer,od550lt1aer
+  USE YOMCST, ONLY: RD,RG
 
   !
@@ -51 +52 @@
   !
   IMPLICIT NONE
-  INCLUDE "YOMCST.h"
   !
   ! Input arguments:
   !
-  REAL, DIMENSION(klon,klev), INTENT(in)   :: pdel
-  REAL, DIMENSION(klon,klev,naero_tot), INTENT(in) :: m_allaer
-  REAL, DIMENSION(klon,klev), INTENT(in)   :: RHcl     ! humidite relative ciel clair
-  INTEGER,INTENT(in)                       :: flag_aerosol
-  LOGICAL,INTENT(in)                       :: flag_bc_internal_mixture
-  REAL, DIMENSION(klon,klev), INTENT(in)   :: pplay
-  REAL, DIMENSION(klon,klev), INTENT(in)   :: t_seri
+  REAL, DIMENSION(klon,klev), INTENT(IN)   :: pdel
+  REAL, DIMENSION(klon,klev,naero_tot), INTENT(IN) :: m_allaer
+  REAL, DIMENSION(klon,klev), INTENT(IN)   :: RHcl     ! humidite relative ciel clair
+  INTEGER,INTENT(IN)                       :: flag_aerosol
+  LOGICAL,INTENT(IN)                       :: flag_bc_internal_mixture
+  REAL, DIMENSION(klon,klev), INTENT(IN)   :: pplay
+  REAL, DIMENSION(klon,klev), INTENT(IN)   :: t_seri
   !
   ! Output arguments:
   !
-  REAL, DIMENSION(klon), INTENT(out)                      :: ai      ! POLDER aerosol index 
-  REAL, DIMENSION(klon,nwave,naero_tot), INTENT(out)      :: tausum
-  REAL, DIMENSION(klon,klev,nwave,naero_tot), INTENT(out) :: tau
+  REAL, DIMENSION(klon), INTENT(OUT)                      :: ai      ! POLDER aerosol index 
+  REAL, DIMENSION(klon,nwave,naero_tot), INTENT(OUT)      :: tausum
+  REAL, DIMENSION(klon,klev,nwave,naero_tot), INTENT(OUT) :: tau
 
   !

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

@@ -11 +11 @@
   USE aero_mod
   USE phys_local_var_mod, only: absvisaer
+  USE YOMCST, ONLY: RG
 
   !    Yves Balkanski le 12 avril 2006
@@ -20 +21 @@
   !
   IMPLICIT NONE
-
-  INCLUDE "YOMCST.h"
-  INCLUDE "clesphys.h"
-
+  ! 
+  INCLUDE "clephys.h"
   !
   ! Input arguments:
   !
-  REAL, DIMENSION(klon,klev),     INTENT(in)  :: pdel
-  REAL, DIMENSION(klon,klev,naero_tot),   INTENT(in)  :: m_allaer
-  REAL, DIMENSION(klon,klev,naero_tot),   INTENT(in)  :: m_allaer_pi
-  REAL, DIMENSION(klon,klev),     INTENT(in)  :: RHcl       ! humidite relative ciel clair
-  INTEGER,                        INTENT(in)  :: flag_aerosol
-  LOGICAL,                        INTENT(in)  :: flag_bc_internal_mixture
-  REAL, DIMENSION(klon,klev),     INTENT(in)  :: zrho
+  REAL, DIMENSION(klon,klev),     INTENT(IN)  :: pdel
+  REAL, DIMENSION(klon,klev,naero_tot),   INTENT(IN)  :: m_allaer
+  REAL, DIMENSION(klon,klev,naero_tot),   INTENT(IN)  :: m_allaer_pi
+  REAL, DIMENSION(klon,klev),     INTENT(IN)  :: RHcl       ! humidite relative ciel clair
+  INTEGER,                        INTENT(IN)  :: flag_aerosol
+  LOGICAL,                        INTENT(IN)  :: flag_bc_internal_mixture
+  REAL, DIMENSION(klon,klev),     INTENT(IN)  :: zrho
   !
   ! Output arguments:
@@ -39 +38 @@
   ! 1= natural aerosols
   !
-  REAL, DIMENSION(klon,klev,2,nbands_sw_rrtm), INTENT(out) :: tau_allaer ! epaisseur optique aerosol
-  REAL, DIMENSION(klon,klev,2,nbands_sw_rrtm), INTENT(out) :: piz_allaer ! single scattering albedo aerosol
-  REAL, DIMENSION(klon,klev,2,nbands_sw_rrtm), INTENT(out) :: cg_allaer  ! asymmetry parameter aerosol
-
+  REAL, DIMENSION(klon,klev,2,nbands_sw_rrtm), INTENT(OUT) :: tau_allaer ! epaisseur optique aerosol
+  REAL, DIMENSION(klon,klev,2,nbands_sw_rrtm), INTENT(OUT) :: piz_allaer ! single scattering albedo aerosol
+  REAL, DIMENSION(klon,klev,2,nbands_sw_rrtm), INTENT(OUT) :: cg_allaer  ! asymmetry parameter aerosol
   !
   ! Local
@@ -104 +102 @@
   INTEGER :: aerindex, classbc, classbc_pi
   REAL :: tmp_var, tmp_var_pi, BC_massfra, BC_massfra_pi
-
+  CHARACTER*20 :: modname
   !
   REAL, PARAMETER :: tau_min = 1.e-7
@@ -474 +472 @@
 !----BEGINNING OF CALCULATIONS
 
+  modname='aeropt_6bands_rrtm'
+
   spsol = 0
   spinsol = 0 
 
   IF (NSW.NE.nbands_sw_rrtm) THEN
-     print *,'Erreur NSW doit etre egal a 6 pour cette routine'
-     stop
+    CALL abord_physic(modname,'Erreur NSW doit etre egal a 6 pour cette routine',1)
   ENDIF
 

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

@@ -12 +12 @@
   USE dimphy
   USE aero_mod
-  USE phys_state_var_mod, ONLY : tau_aero_lw_rrtm
-  USE YOERAD, ONLY : NLW
-  USE YOMCST
+  USE phys_state_var_mod, ONLY: tau_aero_lw_rrtm
+  USE YOERAD, ONLY: NLW
+  USE YOMCST, ONLY: RG
 
   IMPLICIT NONE
@@ -24 +24 @@
   LOGICAL, INTENT(IN)                              :: ok_alw
   INTEGER, INTENT(IN)                              :: flag_aerosol
-  REAL, DIMENSION(klon,klev), INTENT(in)           :: pdel, zrho
-  REAL, DIMENSION(klon,klev,naero_tot), INTENT(in) :: m_allaer, m_allaer_pi
+  REAL, DIMENSION(klon,klev), INTENT(IN)           :: pdel, zrho
+  REAL, DIMENSION(klon,klev,naero_tot), INTENT(IN) :: m_allaer, m_allaer_pi
   !
   INTEGER inu, i, k
   REAL :: zdh(klon,klev)
   REAL :: tmp_var, tmp_var_pi
+  CHARACTER*20 modname
   !
   !--absorption coefficient for CIDUST
@@ -37 +38 @@
   0.017, 0.053, 0.031, 0.008, 0.010, 0.011, 0.013, 0.015  /
   !
+  modname='aeropt_lw_rrtm'
+  !
   IF (NLW.NE.nbands_lw_rrtm) THEN
-     PRINT *,'Erreur NLW doit etre egal a 16 pour cette routine'
-     STOP
+    CALL abort_physic(modname,'Erreur NLW doit etre egal a 16 pour cette routine',1)
   ENDIF
   !