/[lmdze]/trunk/phylmd/phyetat0.f
ViewVC logotype

Diff of /trunk/phylmd/phyetat0.f

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 278 by guez, Thu Jul 12 17:53:18 2018 UTC revision 309 by guez, Thu Sep 27 14:58:10 2018 UTC
# Line 15  module phyetat0_m Line 15  module phyetat0_m
15    
16  contains  contains
17    
18    SUBROUTINE phyetat0(pctsrf, ftsol, ftsoil, qsurf, qsol, snow, albe, evap, &    SUBROUTINE phyetat0(pctsrf, ftsol, ftsoil, qsurf, qsol, snow, albe, &
19         rain_fall, snow_fall, solsw, sollw, fder, radsol, frugs, agesno, zmea, &         rain_fall, snow_fall, solsw, sollw, fder, radsol, frugs, agesno, zmea, &
20         zstd, zsig, zgam, zthe, zpic, zval, t_ancien, q_ancien, ancien_ok, &         zstd, zsig, zgam, zthe, zpic, zval, t_ancien, q_ancien, ancien_ok, &
21         rnebcon, ratqs, clwcon, run_off_lic_0, sig1, w01, ncid_startphy)         rnebcon, ratqs, clwcon, run_off_lic_0, sig1, w01, ncid_startphy)
# Line 43  contains Line 43  contains
43    
44      REAL, intent(out):: snow(klon, nbsrf)      REAL, intent(out):: snow(klon, nbsrf)
45      REAL, intent(out):: albe(klon, nbsrf)      REAL, intent(out):: albe(klon, nbsrf)
     REAL, intent(out):: evap(klon, nbsrf)  
46      REAL, intent(out):: rain_fall(klon)      REAL, intent(out):: rain_fall(klon)
47      REAL, intent(out):: snow_fall(klon)      REAL, intent(out):: snow_fall(klon)
48      real, intent(out):: solsw(klon)      real, intent(out):: solsw(klon)
# Line 202  contains Line 201  contains
201      call NF95_INQ_VARID(ncid_startphy, "ALBE", varid)      call NF95_INQ_VARID(ncid_startphy, "ALBE", varid)
202      call nf95_get_var(ncid_startphy, varid, albe)      call nf95_get_var(ncid_startphy, varid, albe)
203    
     ! Lecture de evaporation:  
   
     call NF95_INQ_VARID(ncid_startphy, "EVAP", varid)  
     call nf95_get_var(ncid_startphy, varid, evap)  
   
204      ! Lecture precipitation liquide:      ! Lecture precipitation liquide:
205    
206      call NF95_INQ_VARID(ncid_startphy, "rain_f", varid)      call NF95_INQ_VARID(ncid_startphy, "rain_f", varid)
# Line 361  contains Line 355  contains
355    
356    subroutine phyetat0_new    subroutine phyetat0_new
357    
358      use nr_util, only: pi      use nr_util, only: rad_to_deg
359    
360      use dimensions, only: iim, jjm      use dimensions, only: iim, jjm
361      use dynetat0_m, only: rlatu, rlonv      use dynetat0_m, only: rlatu, rlonv
# Line 371  contains Line 365  contains
365      !-------------------------------------------------------------------------      !-------------------------------------------------------------------------
366            
367      rlat(1) = 90.      rlat(1) = 90.
368      rlat(2:klon-1) = pack(spread(rlatu(2:jjm), 1, iim), .true.) * 180. / pi      rlat(2:klon-1) = pack(spread(rlatu(2:jjm), 1, iim), .true.) * rad_to_deg
     ! (with conversion to degrees)  
369      rlat(klon) = - 90.      rlat(klon) = - 90.
370    
371      rlon(1) = 0.      rlon(1) = 0.
372      rlon(2:klon-1) = pack(spread(rlonv(:iim), 2, jjm - 1), .true.) * 180. / pi      rlon(2:klon-1) = pack(spread(rlonv(:iim), 2, jjm - 1), .true.) * rad_to_deg
     ! (with conversion to degrees)  
373      rlon(klon) = 0.      rlon(klon) = 0.
374    
375      zmasq = pack(mask, dyn_phy)      zmasq = pack(mask, dyn_phy)

Legend:
Removed from v.278  
changed lines
  Added in v.309

  ViewVC Help
Powered by ViewVC 1.1.21