Skip to content

Commit 26f5dce

Browse files
authored
Merge pull request #12 from CFMIP/CESM_newDiag
Cloudsat near-surface precipitation diagnostics
2 parents 2a3d590 + aaff311 commit 26f5dce

File tree

13 files changed

+909
-293
lines changed

13 files changed

+909
-293
lines changed

cosp-1.4-interface/cosp_interface_v1p4.F90

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ MODULE MOD_COSP_INTERFACE_v1p4
3939
modis_histTauEdges,modis_histTauCenters,ntau,ntauV1p4, &
4040
tau_binBounds,tau_binEdges,tau_binCenters,R_UNDEF, &
4141
tau_binBoundsV1p4,tau_binEdgesV1p4,tau_binCentersV1p4, &
42-
numMISRHgtBins,SR_BINS,LIDAR_NCAT,LIDAR_NTEMP,DBZE_BINS, &
42+
numMISRHgtBins,SR_BINS,LIDAR_NCAT,LIDAR_NTEMP,cloudsat_DBZE_BINS, &
4343
numMODISReffIceBins, numMODISPresBins,PARASOL_NREFL, &
4444
numMODISReffLiqBins,vgrid_zl,vgrid_zu,vgrid_z, &
4545
numISCCPTauBins,numISCCPPresBins,numMISRTauBins
@@ -555,7 +555,7 @@ MODULE MOD_COSP_INTERFACE_v1p4
555555
Nlevels, & ! Number of model levels
556556
Nhydro ! Number of hydrometeors
557557
real(wp), dimension(:,:,:), pointer :: &
558-
cfad_ze ! Ze CFAD(Npoints,dBZe_bins,Nlevels)
558+
cfad_ze ! Ze CFAD(Npoints,cloudsat_dBZe_bins,Nlevels)
559559
real(wp),dimension(:),pointer :: &
560560
radar_lidar_tcc ! Radar&lidar total cloud amount, grid-box scale (Npoints)
561561
real(wp), dimension(:,:),pointer :: &
@@ -1673,7 +1673,7 @@ subroutine construct_cosp_radarstats(Npoints,Ncolumns,Nlevels,Nhydro,x)
16731673
x%Nhydro => Nhydro
16741674

16751675
! Allocate
1676-
allocate(x%cfad_ze(Npoints,DBZE_BINS,Nlevels),x%lidar_only_freq_cloud(Npoints,Nlevels), &
1676+
allocate(x%cfad_ze(Npoints,cloudsat_DBZE_BINS,Nlevels),x%lidar_only_freq_cloud(Npoints,Nlevels), &
16771677
x%radar_lidar_tcc(Npoints))
16781678

16791679
! Initialize
@@ -2241,7 +2241,7 @@ subroutine construct_cosp_outputs(Lpctisccp,Lclisccp,&
22412241

22422242
! Cloudsat simulator
22432243
if (Ldbze94) allocate(x%cloudsat_Ze_tot(Npoints,Ncolumns,Nlevels))
2244-
if (LcfadDbze94) allocate(x%cloudsat_cfad_ze(Npoints,DBZE_BINS,Nlvgrid))
2244+
if (LcfadDbze94) allocate(x%cloudsat_cfad_ze(Npoints,cloudsat_DBZE_BINS,Nlvgrid))
22452245

22462246
! Combined CALIPSO/CLOUDSAT fields
22472247
if (Lclcalipso2) allocate(x%lidar_only_freq_cloud(Npoints,Nlvgrid))
1.8 MB
Binary file not shown.

driver/run/cosp2_output_nl.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@
108108
!- Use lidar and radar
109109
Lclcalipso2=.true.,
110110
Lcltlidarradar=.true.,
111+
Lcloudsat_tcc=.true.,
112+
Lcloudsat_tcc2=.true.,
111113
!- These are provided for debugging or special purposes
112114
Lfracout=.true.,
113115
LlidarBetaMol532=.true.,
@@ -132,4 +134,16 @@
132134
Lclmodis=.true.,
133135
!- RTTOV
134136
Ltbrttov=.false.,
137+
! -CLOUDSAT precipitation frequency/occurence diagnostics
138+
Lptradarflag0=.true.,
139+
Lptradarflag1=.true.,
140+
Lptradarflag2=.true.,
141+
Lptradarflag3=.true.,
142+
Lptradarflag4=.true.,
143+
Lptradarflag5=.true.,
144+
Lptradarflag6=.true.,
145+
Lptradarflag7=.true.,
146+
Lptradarflag8=.true.,
147+
Lptradarflag9=.true.,
148+
Lradarpia=.true.
135149
/

driver/src/cosp1_io.f90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module mod_cosp1_io
22
use cosp_kinds, only: wp
33
use mod_cosp, only: cosp_outputs
44
use netcdf
5-
USE MOD_COSP_CONFIG, ONLY: Nlvgrid, LIDAR_NCAT, SR_BINS, PARASOL_NREFL, DBZE_BINS, &
5+
USE MOD_COSP_CONFIG, ONLY: Nlvgrid, LIDAR_NCAT, SR_BINS, PARASOL_NREFL, cloudsat_DBZE_BINS, &
66
numMODISReffIceBins, numMODISReffLiqBins, ntau, tau_binBounds, tau_binCenters, &
77
tau_binEdges,npres, pres_binBounds, pres_binCenters, pres_binEdges, nhgt, &
88
hgt_binBounds, hgt_binCenters, hgt_binEdges, reffLIQ_binCenters,vgrid_z, &
@@ -86,7 +86,7 @@ subroutine write_cosp1_output(Npoints, Ncolumns, Nlevels, lev, lon, lat, cfg, vg
8686
if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))
8787
status = nf90_def_dim(fileID,"PARASOL_NREFL",PARASOL_NREFL,dimID(13))
8888
if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))
89-
status = nf90_def_dim(fileID,"DBZE_BINS",DBZE_BINS,dimID(14))
89+
status = nf90_def_dim(fileID,"cloudsat_DBZE_BINS",cloudsat_DBZE_BINS,dimID(14))
9090
if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))
9191
status = nf90_def_dim(fileID,"RELIQ_MODIS",numMODISReffLiqBins,dimID(15))
9292
if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))
@@ -559,7 +559,7 @@ subroutine write_cosp1_output(Npoints, Ncolumns, Nlevels, lev, lon, lat, cfg, vg
559559
if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))
560560
status = nf90_put_att(fileID,varID(23),"standard_name", "histogram_of_equivalent_reflectivity_factor_over_height_above_reference_ellipsoid")
561561
if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))
562-
status = nf90_def_var(fileID,"DBZE_BINS",nf90_float, (/dimID(14)/),varID(83))
562+
status = nf90_def_var(fileID,"cloudsat_DBZE_BINS",nf90_float, (/dimID(14)/),varID(83))
563563
if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))
564564
status = nf90_put_att(fileID,varID(83),"long_name","CloudSat simulator equivalent radar reflectivity factor")
565565
if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))

driver/src/cosp1_test.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ program cosp1_test
3333
use cosp_kinds, only: wp
3434
USE MOD_COSP_CONFIG, ONLY: R_UNDEF,PARASOL_NREFL,LIDAR_NCAT,SR_BINS, &
3535
N_HYDRO,RTTOV_MAX_CHANNELS,numMISRHgtBins, &
36-
DBZE_BINS,LIDAR_NTEMP,calipso_histBsct, &
36+
cloudsat_DBZE_BINS,LIDAR_NTEMP,calipso_histBsct, &
3737
numMODISTauBins,numMODISPresBins, &
3838
numMODISReffIceBins,numMODISReffLiqBins, &
3939
numISCCPTauBins,numISCCPPresBins,numMISRTauBins, &

0 commit comments

Comments
 (0)