Ignore:
Timestamp:
Jun 11, 2014, 3:46:46 PM (10 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r1997:2055 into testing branch

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/phylmd/phys_output_var_mod.F90

    r1999 r2056  
    1717  !$OMP THREADPRIVATE(itau_con)
    1818  REAL, ALLOCATABLE :: bils_ec(:) ! Contribution of energy conservation
     19  REAL, ALLOCATABLE :: bils_ech(:) ! Contribution of energy conservation
    1920  REAL, ALLOCATABLE :: bils_tke(:) ! Contribution of energy conservation
    2021  REAL, ALLOCATABLE :: bils_diss(:) ! Contribution of energy conservation
     
    2223  REAL, ALLOCATABLE :: bils_enthalp(:) ! bilan de chaleur au sol
    2324  REAL, ALLOCATABLE :: bils_latent(:) ! bilan de chaleur au sol
    24   !$OMP THREADPRIVATE(bils_ec,bils_tke,bils_diss,bils_kinetic,bils_enthalp,bils_latent)
     25  !$OMP THREADPRIVATE(bils_ec,bils_ech,bils_tke,bils_diss,bils_kinetic,bils_enthalp,bils_latent)
    2526
    2627
     
    8384    allocate(snow_o(klon), zfra_o(klon))
    8485    allocate(itau_con(klon))
    85     allocate (bils_ec(klon),bils_tke(klon),bils_diss(klon),bils_kinetic(klon),bils_enthalp(klon),bils_latent(klon))
     86    allocate (bils_ec(klon),bils_ech(klon),bils_tke(klon),bils_diss(klon),bils_kinetic(klon),bils_enthalp(klon),bils_latent(klon))
    8687
    8788    IF (ok_gwd_rando) allocate(zustr_gwd_rando(klon), zvstr_gwd_rando(klon))
     
    9596
    9697    deallocate(snow_o,zfra_o,itau_con)
    97     deallocate (bils_ec,bils_tke,bils_diss,bils_kinetic,bils_enthalp,bils_latent)
     98    deallocate (bils_ec,bils_ech,bils_tke,bils_diss,bils_kinetic,bils_enthalp,bils_latent)
    9899
    99100  END SUBROUTINE phys_output_var_end
Note: See TracChangeset for help on using the changeset viewer.