Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/rrtm

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/rrtm/aeropt_6bands_rrtm.F90 (modified) (1 diff)
• libf/phylmd/rrtm/readaerosol_optic_rrtm.F90 (modified) (2 diffs)
• libf/phylmd/rrtm/readaerosolstrato_rrtm.F90 (modified) (4 diffs)
• libf/phylmd/rrtm/rrtm_rtrn1a_140gp.F90 (modified) (1 diff)
• libf/phylmd/rrtm/suphec.F90 (modified) (4 diffs)

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

@@ -22 +22 @@
 
   INCLUDE "YOMCST.h"
-  INCLUDE "iniprint.h"
   INCLUDE "clesphys.h"
 

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

@@ -288 +288 @@
   ! Calculate the total mass of all soluble aersosols
   ! to be revisited for AR6
-  mass_solu_aero(:,:)    = sulfacc(:,:)    + bcsol(:,:)    + pomsol(:,:)   + nitracc(:,:)   ! + & 
-  !                           sscoarse(:,:)    + ssacu(:,:)    + sssupco(:,:) 
-  mass_solu_aero_pi(:,:) = sulfacc_pi(:,:) + bcsol_pi(:,:) + pomsol_pi(:,:) + nitracc_pi(:,:) ! + &
-  !                           sscoarse_pi(:,:) + ssacu_pi(:,:) + sssupco_pi(:,:)
+  mass_solu_aero(:,:)    = sulfacc(:,:)    + bcsol(:,:)    + pomsol(:,:)   + nitracc(:,:) + ssacu(:,:)
+  mass_solu_aero_pi(:,:) = sulfacc_pi(:,:) + bcsol_pi(:,:) + pomsol_pi(:,:) + nitracc_pi(:,:) + ssacu_pi(:,:) 
 
   !****************************************************************************************
@@ -303 +301 @@
   END DO
 
+!--new aerosol properties
   ! aeropt_6bands for rrtm
   CALL aeropt_6bands_rrtm( &

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

@@ -9 +9 @@
 
     USE phys_cal_mod, ONLY : mth_cur
-    USE mod_grid_phy_lmdz
+    USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, klon_glo, grid2dTo1d_glo
     USE mod_phys_lmdz_mpi_data, ONLY :  is_mpi_root
     USE mod_phys_lmdz_para 
@@ -21 +21 @@
 
     include "YOMCST.h"
-    include "dimensions.h"
 
 ! Variable input
@@ -103 +102 @@
     n_lat = size(latitude)
     print *, 'LAT aerosol strato=', n_lat, latitude
-    IF (n_lat.NE.jjm+1) THEN 
-       print *,'Le nombre de lat n est pas egal a jjm+1'
+    IF (n_lat.NE.nbp_lat) THEN 
+       print *,'Le nombre de lat n est pas egal a nbp_lat'
        STOP
     ENDIF
@@ -112 +111 @@
     n_lon = size(longitude)
     print *, 'LON aerosol strato=', n_lon, longitude
-    IF (n_lon.NE.iim) THEN 
-       print *,'Le nombre de lon n est pas egal a iim'
+    IF (n_lon.NE.nbp_lon) THEN 
+       print *,'Le nombre de lon n est pas egal a nbp_lon'
        STOP
     ENDIF

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

@@ -496 +496 @@
 !    Z_FACCMB2D(I_LEV-1) = Z_FACCLD1D(I_LEV-1) * Z_FACCLR2D(I_LEV) *&
 !     & (1.0_JPRB - Z_CLDFRAC(I_LEV+1))  
-    if (istcldd(i_lev).ne.1) then
+    if (istcldd(i_lev).ne.1.and.i_lev.ne.0) then
        z_faccmb1d(i_lev-1) = max(0.,min(z_cldfrac(i_lev+1)-z_cldfrac(i_lev), &
                             z_cldfrac(i_lev-1)-z_cldfrac(i_lev)))

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

@@ -87 +87 @@
 USE YOM_PHYS_GRID ,ONLY : PHYS_GRID
 USE YOMCT0  , ONLY  : LSCMEC   ,LROUGH   ,REXTZ0M  ,REXTZ0H
+USE vertical_layers_mod, ONLY: ap,bp
 
 IMPLICIT NONE
@@ -114 +115 @@
 #include "suvdfs.intfb.h"
 #include "suwcou.intfb.h"
-#include "dimensions.h"
-#include "comvert.h"
 
 !     ------------------------------------------------------------------
@@ -168 +167 @@
 !ALLOCATE(VBH    (0:MAX(JPMXLE,NFLEVG)))  from suallo.F90
 !! 
-!! ATTENTION, il faut que ~dyn3d/comvert.h soit conforme au Fortran 90 !!
-!! 
 ALLOCATE(VAH    (0:NFLEVG))  ! Ajout ALLOCATE MPL 200509
 ALLOCATE(VBH    (0:NFLEVG))
@@ -177 +174 @@
 VP00=101325.     !!!!! A REVOIR (MPL)
 ZPRES(NFLEVG)=VP00
-! on recupere ap et bp de dyn3d (comvert.h) MPL 19.05.09
+! on recupere ap et bp de dyn3d (vertical_layers_mod) MPL 19.05.09
 ! Attention, VAH et VBH sont inverses, comme les niveaux
 ! plev(l)=PAPRS(klon,nlayer+1-l) de 1 a nlayer (apllmd.F)