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/nuage.F90

    r1999 r2056  
    55    cldtaupi, re, fl)
    66  USE dimphy
     7  USE microphys_mod ! cloud microphysics (JBM 3/14)
    78  IMPLICIT NONE
    89  ! ======================================================================
     
    3435
    3536  include "YOMCST.h"
     37  include "nuage.h" ! JBM 3/14
    3638
    3739  ! ym#include "dimensions.h"
     
    5456  REAL zflwp, zradef, zfice, zmsac
    5557
    56   REAL radius, rad_froid, rad_chaud, rad_chau1, rad_chau2
    57   PARAMETER (rad_chau1=13.0, rad_chau2=9.0, rad_froid=35.0)
     58  REAL radius, rad_chaud
     59! JBM (3/14) parameters already defined in nuage.h:
     60! REAL rad_froid, rad_chau1, rad_chau2
     61! PARAMETER (rad_chau1=13.0, rad_chau2=9.0, rad_froid=35.0)
    5862  ! cc      PARAMETER (rad_chaud=15.0, rad_froid=35.0)
    5963  ! sintex initial      PARAMETER (rad_chaud=10.0, rad_froid=30.0)
    6064  REAL coef, coef_froi, coef_chau
    6165  PARAMETER (coef_chau=0.13, coef_froi=0.09)
    62   REAL seuil_neb, t_glace
    63   PARAMETER (seuil_neb=0.001, t_glace=273.0-15.0)
    64   INTEGER nexpo ! exponentiel pour glace/eau
    65   PARAMETER (nexpo=6)
     66  REAL seuil_neb
     67  PARAMETER (seuil_neb=0.001)
     68! JBM (3/14) nexpo is replaced by exposant_glace
     69! REAL nexpo ! exponentiel pour glace/eau
     70! PARAMETER (nexpo=6.)
     71  REAL, PARAMETER :: t_glace_min_old = 258.
     72  INTEGER, PARAMETER :: exposant_glace_old = 6
     73
    6674
    6775  ! jq for the aerosol indirect effect
     
    96104      pclc(i, k) = max(pclc(i,k), seuil_neb)
    97105      zflwp = 1000.*pqlwp(i, k)/rg/pclc(i, k)*(paprs(i,k)-paprs(i,k+1))
    98       zfice = 1.0 - (t(i,k)-t_glace)/(273.13-t_glace)
    99       zfice = min(max(zfice,0.0), 1.0)
    100       zfice = zfice**nexpo
     106      IF (iflag_t_glace.EQ.0) THEN
     107        zfice = 1.0 - (t(i,k)-t_glace_min_old)/(273.13-t_glace_min_old)
     108        zfice = min(max(zfice,0.0), 1.0)
     109        zfice = zfice**exposant_glace_old
     110      ELSE ! of IF (iflag_t_glace.EQ.0)
     111! JBM: icefrac_lsc is now a function contained in microphys_mod
     112        zfice = icefrac_lsc(t(i,k), t_glace_min, &
     113                            t_glace_max, exposant_glace)
     114      ENDIF
    101115
    102116      IF (ok_aie) THEN
Note: See TracChangeset for help on using the changeset viewer.