Changeset 1413


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • LMDZ4/trunk/libf/phylmd/fonte_neige_mod.F90

    r793 r1413  
    298298
    299299! Deallocation of all varaibles in the module
    300     DEALLOCATE(run_off_lic_0, run_off_ter, run_off_lic, ffonte_global, &
    301          fqfonte_global, fqcalving_global)
     300!   DEALLOCATE(run_off_lic_0, run_off_ter, run_off_lic, ffonte_global, &
     301!        fqfonte_global, fqcalving_global)
     302
     303    IF (ALLOCATED(run_off_lic_0)) DEALLOCATE(run_off_lic_0)
     304    IF (ALLOCATED(run_off_ter)) DEALLOCATE(run_off_ter)
     305    IF (ALLOCATED(run_off_lic)) DEALLOCATE(run_off_lic)
     306    IF (ALLOCATED(ffonte_global)) DEALLOCATE(ffonte_global)
     307    IF (ALLOCATED(fqfonte_global)) DEALLOCATE(fqfonte_global)
     308    IF (ALLOCATED(fqcalving_global)) DEALLOCATE(fqcalving_global)
    302309
    303310  END SUBROUTINE fonte_neige_final
  • LMDZ4/trunk/libf/phylmd/pbl_surface_mod.F90

    r1403 r1413  
    12791279!
    12801280!****************************************************************************************
    1281     DEALLOCATE(qsol, fder, snow, qsurf, evap, rugos, agesno, ftsoil)
     1281!   DEALLOCATE(qsol, fder, snow, qsurf, evap, rugos, agesno, ftsoil)
     1282    IF (ALLOCATED(qsol)) DEALLOCATE(qsol)
     1283    IF (ALLOCATED(fder)) DEALLOCATE(fder)
     1284    IF (ALLOCATED(snow)) DEALLOCATE(snow)
     1285    IF (ALLOCATED(qsurf)) DEALLOCATE(qsurf)
     1286    IF (ALLOCATED(evap)) DEALLOCATE(evap)
     1287    IF (ALLOCATED(rugos)) DEALLOCATE(rugos)
     1288    IF (ALLOCATED(agesno)) DEALLOCATE(agesno)
     1289    IF (ALLOCATED(ftsoil)) DEALLOCATE(ftsoil)
    12821290
    12831291  END SUBROUTINE pbl_surface_final
  • LMDZ4/trunk/libf/phylmd/physiq.F

    r1412 r1413  
    26072607
    26082608      if (iflag_cldcon.eq.1 .or.iflag_cldcon.eq.2
    2609      s    .or.iflag_cldcon.ge.4) then
     2609     s    .or.iflag_cldcon.eq.4) then
    26102610
    26112611! On ajoute une constante au ratqsc*2 pour tenir compte de
Note: See TracChangeset for help on using the changeset viewer.