Changeset 1413 for LMDZ4/trunk/libf

Timestamp:

Jul 13, 2010, 9:55:22 AM (14 years ago)

Author:

idelkadi

Message:

Dans fonte_neige_mod.F90 et pbl_surface_mod.F90 : deallocate des variables sous conditions qu'ls soient allous
Dans physiq.F : Nettoyage dans physiq.F des anciennes versions des options iflag_cldcon=5 ou 6.

Location:

LMDZ4/trunk/libf/phylmd

Files:

• fonte_neige_mod.F90 (modified) (1 diff)
• pbl_surface_mod.F90 (modified) (1 diff)
• physiq.F (modified) (1 diff)

LMDZ4/trunk/libf/phylmd/fonte_neige_mod.F90

@@ -298 +298 @@
 
 ! Deallocation of all varaibles in the module
-    DEALLOCATE(run_off_lic_0, run_off_ter, run_off_lic, ffonte_global, &
-         fqfonte_global, fqcalving_global)
+!   DEALLOCATE(run_off_lic_0, run_off_ter, run_off_lic, ffonte_global, &
+!        fqfonte_global, fqcalving_global)
+
+    IF (ALLOCATED(run_off_lic_0)) DEALLOCATE(run_off_lic_0)
+    IF (ALLOCATED(run_off_ter)) DEALLOCATE(run_off_ter)
+    IF (ALLOCATED(run_off_lic)) DEALLOCATE(run_off_lic)
+    IF (ALLOCATED(ffonte_global)) DEALLOCATE(ffonte_global)
+    IF (ALLOCATED(fqfonte_global)) DEALLOCATE(fqfonte_global)
+    IF (ALLOCATED(fqcalving_global)) DEALLOCATE(fqcalving_global)
 
   END SUBROUTINE fonte_neige_final

LMDZ4/trunk/libf/phylmd/pbl_surface_mod.F90

@@ -1279 +1279 @@
 !
 !****************************************************************************************
-    DEALLOCATE(qsol, fder, snow, qsurf, evap, rugos, agesno, ftsoil)
+!   DEALLOCATE(qsol, fder, snow, qsurf, evap, rugos, agesno, ftsoil)
+    IF (ALLOCATED(qsol)) DEALLOCATE(qsol)
+    IF (ALLOCATED(fder)) DEALLOCATE(fder)
+    IF (ALLOCATED(snow)) DEALLOCATE(snow)
+    IF (ALLOCATED(qsurf)) DEALLOCATE(qsurf)
+    IF (ALLOCATED(evap)) DEALLOCATE(evap)
+    IF (ALLOCATED(rugos)) DEALLOCATE(rugos)
+    IF (ALLOCATED(agesno)) DEALLOCATE(agesno)
+    IF (ALLOCATED(ftsoil)) DEALLOCATE(ftsoil)
 
   END SUBROUTINE pbl_surface_final

LMDZ4/trunk/libf/phylmd/physiq.F

@@ -2607 +2607 @@
 
       if (iflag_cldcon.eq.1 .or.iflag_cldcon.eq.2
-     s    .or.iflag_cldcon.ge.4) then
+     s    .or.iflag_cldcon.eq.4) then
 
 ! On ajoute une constante au ratqsc*2 pour tenir compte de