Changeset 2160 for LMDZ5/branches/testing/libf/phylmd/readaerosolstrato.F90

Timestamp:

Nov 28, 2014, 4:36:29 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/readaerosolstrato.F90 (modified) (2 diffs)

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

@@ -128 +128 @@
     CALL grid2dTo1d_glo(tauaerstrat_mois,tauaerstrat_mois_glo)
 
-!    DEALLOCATE(tauaerstrat)
-!    DEALLOCATE(tauaerstrat_mois)
-!    DEALLOCATE(tauaerstrat_mois_glo)
-  
     ENDIF !--is_mpi_root
 
@@ -139 +135 @@
 !--keep memory of previous month
     mth_pre=mth_cur
+!
+    IF (is_mpi_root) THEN
+!
+    DEALLOCATE(tauaerstrat)
+    DEALLOCATE(tauaerstrat_mois)
+    DEALLOCATE(tauaerstrat_mois_glo)
+!
+    ENDIF !-is_mpi_root
 
     ENDIF !--debut ou nouveau mois
 
-!--total vertical aod at the 5 wavelengths
+!--total vertical aod at the 6 wavelengths
     DO wave=1, nwave
     DO k=1, klev
-    tausum_aero(:,wave,id_STRAT)=tausum_aero(:,wave,id_STRAT)+tau_aer_strat(:,k)*alpha_strat_wave(wave)/alpha_strat_wave(2)
-!    tausum_aero(:,wave,id_ASBCM)=tausum_aero(:,wave,id_ASBCM)+tau_aer_strat(:,k)*alpha_strat_wave(wave)/alpha_strat_wave(2)
+    tausum_aero(:,wave,id_STRAT_phy)=tausum_aero(:,wave,id_STRAT_phy)+tau_aer_strat(:,k)*alpha_strat_wave(wave)/alpha_strat_wave(2)
     ENDDO
     ENDDO