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

Timestamp:

Jan 30, 2015, 2:57:13 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2158:2186 into testing branch.

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/rrtm/readaerosol_optic_rrtm.F90 (modified) (2 diffs)
• libf/phylmd/rrtm/readaerosolstrato_rrtm.F90 (modified) (4 diffs)

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

@@ -84 +84 @@
   REAL, DIMENSION(klon,klev,naero_tot) :: m_allaer
   REAL, DIMENSION(klon,klev,naero_tot) :: m_allaer_pi !RAF  
-  !  REAL, DIMENSION(klon,naero_tot)      :: fractnat_allaer !RAF delete??
-  character(len=8), dimension(nbtr) :: tracname
+
   integer :: id_ASBCM, id_ASPOMM, id_ASSO4M, id_ASMSAM, id_CSSO4M, id_CSMSAM, id_SSSSM
   integer :: id_CSSSM, id_ASSSM, id_CIDUSTM, id_AIBCM, id_AIPOMM, id_ASNO3M, id_CSNO3M, id_CINO3M
@@ -104 +103 @@
      !--convert to ug m-3 unit for consistency with offline fields
      !
-#ifdef INCA
-     call tracinca_name(tracname)
-#endif
-
      do i=1,nbtr
-        select case(trim(tracname(i)))
+        select case(trim(solsym(i)))
            case ("ASBCM")
               id_ASBCM = i

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

@@ -45 +45 @@
     real, allocatable:: tauaerstrat_mois(:, :, :)
     real, allocatable:: tauaerstrat_mois_glo(:, :)
-    real, allocatable:: tauaerstrat_mois_glo_bands(:,:,:)
 
     real, allocatable:: sum_tau_aer_strat(:)
@@ -81 +80 @@
     IF (.not.ALLOCATED(sum_tau_aer_strat)) ALLOCATE(sum_tau_aer_strat(klon))
 
+    IF (debut.OR.mth_cur.NE.mth_pre) THEN
+
     IF (is_mpi_root) THEN
-
-    IF (debut.OR.mth_cur.NE.mth_pre) THEN
 
     IF (nbands_sw_rrtm.NE.6) THEN 
@@ -130 +129 @@
     ALLOCATE(tauaerstrat_mois(n_lon, n_lat, n_lev))
     ALLOCATE(tauaerstrat_mois_glo(klon_glo, n_lev))
-    ALLOCATE(tauaerstrat_mois_glo_bands(klon_glo, n_lev,nbands_sw_rrtm))
 
 !--reading stratospheric AOD at 550 nm
@@ -170 +168 @@
     DO k=1, klev
     tausum_aero(:,wave,id_STRAT_phy)=tausum_aero(:,wave,id_STRAT_phy)+ &
-    tau_aer_strat(:,k)*alpha_sw_strat_wave(wave)/alpha_sw_strat_wave(2)
+       tau_aer_strat(:,k)*alpha_sw_strat_wave(wave)/alpha_sw_strat_wave(2)
     ENDDO
     ENDDO