Ignore:
Timestamp:
Jan 17, 2025, 6:16:25 PM (13 days ago)
Author:
aborella
Message:

Merge with trunk

Location:
LMDZ6/branches/contrails
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/contrails

  • LMDZ6/branches/contrails/libf/phylmd/conf_phys_m.f90

    r5364 r5489  
    213213    LOGICAL, SAVE :: ok_lic_cond_omp
    214214    !
    215     REAL, SAVE    :: zrel_oro_t_omp, zstd_orodr_t_omp
     215    REAL, SAVE    :: nm_oro_t_omp, zstd_orodr_t_omp
    216216    REAL, SAVE    :: zpmm_orodr_t_omp, zpmm_orolf_t_omp
    217217    INTEGER, SAVE :: iflag_cycle_diurne_omp
     
    893893
    894894
    895     !Config  Key  =  zrel_oro_t
    896     !Config  Desc = zrel_oro_t
    897     !Config  Def  = 9999.
     895    !Config  Key  =  nm_oro_t
     896    !Config  Desc = nm_oro_t
     897    !Config  Def  = -1
    898898    !Config  Help = Connais pas !
    899     zrel_oro_t_omp = 9999.
    900     CALL getin('zrel_oro_t', zrel_oro_t_omp)
     899    nm_oro_t_omp = -1.
     900    CALL getin('nm_oro_t', nm_oro_t_omp)
    901901
    902902    !Config  Key  =  zstd_orodr_t
     
    23132313    ok_orodr = ok_orodr_omp
    23142314    ok_orolf = ok_orolf_omp
    2315     zrel_oro_t=zrel_oro_t_omp
     2315    nm_oro_t=nm_oro_t_omp
    23162316    zstd_orodr_t=zstd_orodr_t_omp
    23172317    zpmm_orodr_t=zpmm_orodr_t_omp
     
    27322732    WRITE(lunout,*) ' ok_orodr=',ok_orodr
    27332733    WRITE(lunout,*) ' ok_orolf=',ok_orolf
    2734     WRITE(lunout,*) ' zrel_oro_t=',zrel_oro_t
     2734    WRITE(lunout,*) ' nm_oro_t=',nm_oro_t
    27352735    WRITE(lunout,*) ' zstd_orodr_t=',zstd_orodr_t
    27362736    WRITE(lunout,*) ' zpmm_orodr_t=',zpmm_orodr_t
Note: See TracChangeset for help on using the changeset viewer.