Ignore:
Timestamp:
Jul 19, 2016, 11:06:22 PM (8 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2589:2593 into testing branch

Location:
LMDZ5/branches/testing
Files:
2 deleted
3 edited
2 copied

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

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

    r2594 r2595  
    11331133     absvisaer(i)=SUM((1-piz_allaer(i,:,mrfspecies,inu))*tau_allaer(i,:,mrfspecies,inu))
    11341134  ENDDO
    1135   STOP
    11361135
    11371136  DEALLOCATE(aerosol_name)
  • LMDZ5/branches/testing/libf/phylmd/physiq_mod.F90

    r2594 r2595  
    7373    USE ioipsl_getin_p_mod, ONLY : getin_p
    7474
     75    USE paramLMDZ_phy_mod
    7576
    7677    !IM stations CFMIP
     
    284285    !
    285286    !
    286 
    287 
    288287    INTEGER debug
    289288    INTEGER n
     
    765764    REAL uq_lay(klon,klev) ! transport zonal de l'eau a chaque niveau vert.
    766765    !
     766    REAL zjulian
     767    SAVE zjulian
     768!$OMP THREADPRIVATE(zjulian)
     769
    767770    INTEGER nhori, nvert
    768771    REAL zsto
    769772    REAL zstophy, zout
    770 
    771     real zjulian
    772     save zjulian
    773     !$OMP THREADPRIVATE(zjulian)
    774773
    775774    character*20 modname
     
    883882    !============================================================
    884883    real :: mr_ozone(klon,klev)
    885 
    886     !IM sorties fichier 1D paramLMDZ_phy.nc
    887     REAL :: zx_tmp_0d(1,1)
    888     INTEGER, PARAMETER :: np=1
    889     REAL,dimension(klon_glo)        :: rlat_glo
    890     REAL,dimension(klon_glo)        :: rlon_glo
    891     REAL gbils(1), gevap(1), gevapt(1), glat(1), gnet0(1), gnet(1)
    892     REAL grain(1), gtsol(1), gt2m(1), gprw(1)
    893884
    894885    !IM stations CFMIP
     
    13921383       include "ini_histday_seri.h"
    13931384
    1394        include "ini_paramLMDZ_phy.h"
     1385       CALL ini_paramLMDZ_phy(dtime,nid_ctesGCM)
    13951386
    13961387#endif
     
    43494340         flag_aerosol, flag_aerosol_strat, ok_cdnc)
    43504341
    4351 
    4352 
    43534342    include "write_histday_seri.h"
    43544343
    4355     include "write_paramLMDZ_phy.h"
     4344    CALL write_paramLMDZ_phy(itap,nid_ctesGCM,ok_sync)
    43564345
    43574346#endif
Note: See TracChangeset for help on using the changeset viewer.