Ignore:
Timestamp:
Nov 5, 2018, 3:24:59 PM (6 years ago)
Author:
Laurent Fairhead
Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:
LMDZ6/branches/DYNAMICO-conv
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/DYNAMICO-conv

  • LMDZ6/branches/DYNAMICO-conv/libf/phylmd/cosp/cosp_output_mod.F90

    r3356 r3411  
    1212                            numMODISReffLiqBins, reffLIQ_binCenters
    1313
    14      IMPLICIT NONE
    1514! cosp_output_mod
    1615      INTEGER, PRIVATE             :: i
     
    255254  real                      :: zjulian,zjulian_start
    256255  real,dimension(Ncolumns)  :: column_ax
     256  real,dimension(2,SR_BINS) :: sratio_bounds
     257  real,dimension(SR_BINS)   ::  sratio_ax
    257258  real,dimension(DBZE_BINS) ::  dbze_ax
    258259  CHARACTER(LEN=20), DIMENSION(3)  :: chfreq = (/ '1day', '1d  ', '3h  ' /)           
    259   real,parameter,dimension(SR_BINS) :: sratio_ax = (/0.005, &
    260                                                   0.605,2.09,4.,6., &
    261                                           8.5,12.5,17.5,22.5,27.5,35.,45.,55.,70.,50040./)
    262260
    263261!!! Variables d'entree
     
    284282    enddo
    285283 
     284
     285    sratio_bounds(2,:)=stlidar%srbval(:) ! srbval contains the upper
     286!                                         limits from lmd_ipsl_stats.f90
     287    sratio_bounds(1,2:SR_BINS) = stlidar%srbval(1:SR_BINS-1)
     288    sratio_bounds(1,1)         = 0.0
     289    sratio_bounds(2,SR_BINS)   = 1.e5 ! This matches with Chepfer et al., JGR,
     290!                                    ! 2009. However, it is not consistent
     291                                     ! with the upper limit in
     292                                     ! lmd_ipsl_stats.f90, which is
     293                                     ! LIDAR_UNDEF-1=998.999
     294     sratio_ax(:) = (sratio_bounds(1,:)+sratio_bounds(2,:))/2.0
     295
    286296    cosp_outfilenames(1) = 'histmthCOSP'
    287297    cosp_outfilenames(2) = 'histdayCOSP'
     
    342352! AI nov 2015
    343353   CALL wxios_add_vaxis("temp", LIDAR_NTEMP, LIDAR_PHASE_TEMP)
    344    CALL wxios_add_vaxis("cth", MISR_N_CTH, MISR_CTH)
     354   CALL wxios_add_vaxis("cth16", MISR_N_CTH, MISR_CTH)
    345355   CALL wxios_add_vaxis("dbze", DBZE_BINS, dbze_ax)
    346356   CALL wxios_add_vaxis("scatratio", SR_BINS, sratio_ax)
     
    390400      CALL histvert(cosp_nidfiles(iff),"temp","temperature","C",LIDAR_NTEMP,LIDAR_PHASE_TEMP,nverttemp(iff))
    391401
    392       CALL histvert(cosp_nidfiles(iff),"cth","altitude","m",MISR_N_CTH,MISR_CTH,nvertmisr(iff))
     402      CALL histvert(cosp_nidfiles(iff),"cth16","altitude","m",MISR_N_CTH,MISR_CTH,nvertmisr(iff))
    393403 
    394404      CALL histvert(cosp_nidfiles(iff),"ReffIce","Effective_particle_size_Ice","microns",numMODISReffIceBins, reffICE_binCenters, &
Note: See TracChangeset for help on using the changeset viewer.