Ignore:
Timestamp:
Mar 18, 2016, 12:09:23 PM (9 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2434:2457 into testing branch

Location:
LMDZ5/branches/testing
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/phylmd/cosp/cosp_output_mod.F90

    r2435 r2471  
    1616      INTEGER, DIMENSION(3), SAVE  :: cosp_nidfiles
    1717!$OMP THREADPRIVATE(cosp_outfilekeys, cosp_nidfiles)
    18       INTEGER, DIMENSION(3), SAVE  :: nhoricosp,nvert,nvertmcosp,nvertcol,nvertisccp,nvertp,nverttemp,nvertmisr
     18      INTEGER, DIMENSION(3), SAVE  :: nhoricosp,nvert,nvertmcosp,nvertcol,nvertbze, &
     19                                      nvertsratio,nvertisccp,nvertp,nverttemp,nvertmisr
    1920      REAL, DIMENSION(3), SAVE                :: zoutm_cosp
    20 !$OMP THREADPRIVATE(nhoricosp, nvert, nvertmcosp, nvertcol, nvertisccp, nvertp, zoutm_cosp, nverttemp, nvertmisr)
     21!$OMP THREADPRIVATE(nhoricosp, nvert,nvertmcosp,nvertcol,nvertsratio,nvertbze,nvertisccp,nvertp,zoutm_cosp,nverttemp,nvertmisr)
    2122      REAL, SAVE                   :: zdtimemoy_cosp
    2223!$OMP THREADPRIVATE(zdtimemoy_cosp)
     
    107108  TYPE(ctrl_outcosp), SAVE :: o_clcalipso2 = ctrl_outcosp((/ .TRUE., .TRUE., .TRUE. /), &
    108109         "clcalipso2", "CALIPSO Cloud Fraction Undetected by CloudSat", "1", (/ ('', i=1, 3) /))
    109 
     110  TYPE(ctrl_outcosp), SAVE :: o_cltlidarradar = ctrl_outcosp((/ .TRUE., .TRUE.,.TRUE. /), &         
     111         "cltlidarradar", "Lidar and Radar Total Cloud Fraction", "%", (/ ('', i=1, 3) /))
     112     
    110113! ISCCP vars
    111114  TYPE(ctrl_outcosp), SAVE :: o_sunlit = ctrl_outcosp((/ .TRUE., .TRUE., .TRUE. /), &
     
    220223
    221224!!! Variables locales
    222   integer                  :: idayref, iff, ii
    223   real                     :: zjulian,zjulian_start
    224   real,dimension(Ncolumns) :: column_ax
     225  integer                   :: idayref, iff, ii
     226  real                      :: zjulian,zjulian_start
     227  real,dimension(Ncolumns)  :: column_ax
     228  real,dimension(2,SR_BINS) :: sratio_bounds
     229  real,dimension(SR_BINS)   ::  sratio_ax
    225230  CHARACTER(LEN=20), DIMENSION(3)  :: chfreq = (/ '1day', '1d', '3h' /)           
    226231
     
    239244    ! Initialisations (Valeurs par defaut)
    240245
     246!! Definition valeurs axes
    241247    do ii=1,Ncolumns
    242248      column_ax(ii) = real(ii)
    243249    enddo
    244250
     251!    do ii=1,DBZE_BINS
     252!     dbze_ax(i) = CFAD_ZE_MIN + CFAD_ZE_WIDTH*(ii - 0.5)
     253!    enddo
     254
     255!   sratio_bounds(2,:)=stlidar%srbval(:) ! srbval contains the upper
     256!                                         limits from lmd_ipsl_stats.f90
     257!   sratio_bounds(1,2:SR_BINS) = stlidar%srbval(1:SR_BINS-1)
     258!   sratio_bounds(1,1)         = 0.0
     259!   sratio_bounds(2,SR_BINS)   = 1.e5 ! This matches with Chepfer et al., JGR,
     260!                                    ! 2009. However, it is not consistent
     261                                     ! with the upper limit in
     262                                     ! lmd_ipsl_stats.f90, which is
     263                                     ! LIDAR_UNDEF-1=998.999
     264!    sratio_ax(:) = (sratio_bounds(1,:)+sratio_bounds(2,:))/2.0
    245265
    246266    cosp_outfilenames(1) = 'histmthCOSP'
     
    303323   CALL wxios_add_vaxis("temp", LIDAR_NTEMP, LIDAR_PHASE_TEMP)
    304324   CALL wxios_add_vaxis("cth16", MISR_N_CTH, MISR_CTH)
     325!   CALL wxios_add_vaxis("dbze", DBZE_BINS, dbze_ax)
     326!   CALL wxios_add_vaxis("scatratio", SR_BINS, sratio_ax)
    305327#endif
    306328   
     
    343365      CALL histvert(cosp_nidfiles(iff),"temp","temperature","C",LIDAR_NTEMP,LIDAR_PHASE_TEMP,nverttemp(iff))                                       
    344366      CALL histvert(cosp_nidfiles(iff),"cth16","altitude","m",MISR_N_CTH,MISR_CTH,nvertmisr(iff))                                                                                                 
     367!      CALL histvert(cosp_nidfiles(iff),"dbze","equivalent_reflectivity_factor","dBZ",DBZE_BINS,dbze_ax,nvertbze(iff))
     368     
     369!      CALL histvert(cosp_nidfiles(iff),"scatratio","backscattering_ratio","1",SR_BINS,sratio_ax,nvertsratio(iff))
     370     
    345371!!! Valeur indefinie en cas IOIPSL
    346372     Cosp_fill_value=0.
  • LMDZ5/branches/testing/libf/phylmd/cosp/cosp_output_write_mod.F90

    r2435 r2471  
    209209                           stradar%lidar_only_freq_cloud = 0.0
    210210   CALL histwrite3d_cosp(o_clcalipso2,stradar%lidar_only_freq_cloud,nvert)
     211   where(stradar%radar_lidar_tcc == R_UNDEF) &
     212                           stradar%radar_lidar_tcc = 0.0
     213   CALL histwrite2d_cosp(o_cltlidarradar,stradar%radar_lidar_tcc)
    211214 endif
    212215
Note: See TracChangeset for help on using the changeset viewer.