Changeset 2152 for LMDZ5/trunk/libf/phylmd

Timestamp:

Nov 19, 2014, 5:52:35 PM (10 years ago)

Author:

fhourdin

Message:

Corrections cosmétiques pour RRTM
Bug fixing for RRTM

Location:

LMDZ5/trunk/libf/phylmd

Files:

• readaerosolstrato.F90 (modified) (2 diffs)
• rrtm/readaerosolstrato_rrtm.F90 (modified) (1 diff)
• rrtm/rrtm_ecrt_140gp.F90 (modified) (1 diff)
• rrtm/suecrad.F90 (modified) (1 diff)

LMDZ5/trunk/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

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

@@ -148 +148 @@
     CALL grid2dTo1d_glo(tauaerstrat_mois,tauaerstrat_mois_glo)
 
+    ENDIF !--is_mpi_root
+
+!--keep memory of previous month
+    mth_pre=mth_cur
+
 !--scatter on all proc
     CALL scatter(tauaerstrat_mois_glo,tau_aer_strat)
 
+    IF (is_mpi_root) THEN
+!
     DEALLOCATE(tauaerstrat)
     DEALLOCATE(tauaerstrat_mois)
     DEALLOCATE(tauaerstrat_mois_glo)
-  
-    mth_pre=mth_cur
+!
+    ENDIF !--is_mpi_root
 
     ENDIF !--debut ou nouveau mois
-
-    ENDIF !--is_mpi_root
 
 !--total vertical aod at the 5 SW wavelengths

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

@@ -264 +264 @@
 DO I_L=1,KLEV
   JK=KLEV-I_L+1
-!  DO JAE=1, NLW 
-  DO JAE=1, 16
+  DO JAE=1, NLW 
     P_TAUAERL(I_L,JAE) = MAX( PTAU_LW(K_IPLON, JK, JAE), 1e-30 )
   ENDDO

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

@@ -407 +407 @@
   END SELECT
 print *,'SUECRAD: NOVLP=',NOVLP
-NLW    = 6
+NLW    = 16
 NTSW   = 14
 !NSW    = 6    !!!!! Maintenant dans config.def (MPL 20140213)