Merge pull request #12 from CFMIP/CESM_newDiag

Cloudsat near-surface precipitation diagnostics
CFMIP · Sep 17, 2018 · 26f5dce · 26f5dce
2 parents 2a3d590 + aaff311
commit 26f5dce
Show file tree

Hide file tree

Showing 13 changed files with 909 additions and 293 deletions.
diff --git a/cosp-1.4-interface/cosp_interface_v1p4.F90 b/cosp-1.4-interface/cosp_interface_v1p4.F90
@@ -39,7 +39,7 @@ MODULE MOD_COSP_INTERFACE_v1p4
                                  modis_histTauEdges,modis_histTauCenters,ntau,ntauV1p4,   &
                                  tau_binBounds,tau_binEdges,tau_binCenters,R_UNDEF,       &
                                  tau_binBoundsV1p4,tau_binEdgesV1p4,tau_binCentersV1p4,   &
-                                 numMISRHgtBins,SR_BINS,LIDAR_NCAT,LIDAR_NTEMP,DBZE_BINS, &
+                                 numMISRHgtBins,SR_BINS,LIDAR_NCAT,LIDAR_NTEMP,cloudsat_DBZE_BINS, &
                                  numMODISReffIceBins, numMODISPresBins,PARASOL_NREFL,     &
                                  numMODISReffLiqBins,vgrid_zl,vgrid_zu,vgrid_z,           &
                                  numISCCPTauBins,numISCCPPresBins,numMISRTauBins
@@ -555,7 +555,7 @@ MODULE MOD_COSP_INTERFACE_v1p4
           Nlevels,            & ! Number of model levels
           Nhydro                ! Number of hydrometeors
      real(wp), dimension(:,:,:), pointer :: &
-          cfad_ze               ! Ze CFAD(Npoints,dBZe_bins,Nlevels)
+          cfad_ze               ! Ze CFAD(Npoints,cloudsat_dBZe_bins,Nlevels)
      real(wp),dimension(:),pointer :: &
           radar_lidar_tcc       ! Radar&lidar total cloud amount, grid-box scale (Npoints)
      real(wp), dimension(:,:),pointer :: &
@@ -1673,7 +1673,7 @@ subroutine construct_cosp_radarstats(Npoints,Ncolumns,Nlevels,Nhydro,x)
     x%Nhydro   => Nhydro
 
     ! Allocate
-    allocate(x%cfad_ze(Npoints,DBZE_BINS,Nlevels),x%lidar_only_freq_cloud(Npoints,Nlevels), &
+    allocate(x%cfad_ze(Npoints,cloudsat_DBZE_BINS,Nlevels),x%lidar_only_freq_cloud(Npoints,Nlevels), &
              x%radar_lidar_tcc(Npoints))
 
     ! Initialize
@@ -2241,7 +2241,7 @@ subroutine construct_cosp_outputs(Lpctisccp,Lclisccp,&
 
     ! Cloudsat simulator
     if (Ldbze94)        allocate(x%cloudsat_Ze_tot(Npoints,Ncolumns,Nlevels))
-    if (LcfadDbze94)    allocate(x%cloudsat_cfad_ze(Npoints,DBZE_BINS,Nlvgrid))
+    if (LcfadDbze94)    allocate(x%cloudsat_cfad_ze(Npoints,cloudsat_DBZE_BINS,Nlvgrid))
 
     ! Combined CALIPSO/CLOUDSAT fields
     if (Lclcalipso2)    allocate(x%lidar_only_freq_cloud(Npoints,Nlvgrid))

diff --git a/driver/data/outputs/UKMO/cosp2_output_um.ref.nc b/driver/data/outputs/UKMO/cosp2_output_um.ref.nc
diff --git a/driver/run/cosp2_output_nl.txt b/driver/run/cosp2_output_nl.txt
@@ -108,6 +108,8 @@
   !- Use lidar and radar
   Lclcalipso2=.true.,
   Lcltlidarradar=.true.,
+  Lcloudsat_tcc=.true.,
+  Lcloudsat_tcc2=.true.,
   !- These are provided for debugging or special purposes
   Lfracout=.true.,
   LlidarBetaMol532=.true.,  
@@ -132,4 +134,16 @@
   Lclmodis=.true.,
   !- RTTOV
   Ltbrttov=.false.,
+  ! -CLOUDSAT precipitation frequency/occurence diagnostics
+  Lptradarflag0=.true.,
+  Lptradarflag1=.true.,
+  Lptradarflag2=.true.,
+  Lptradarflag3=.true.,
+  Lptradarflag4=.true.,
+  Lptradarflag5=.true.,
+  Lptradarflag6=.true.,
+  Lptradarflag7=.true.,
+  Lptradarflag8=.true.,
+  Lptradarflag9=.true.,
+  Lradarpia=.true.
 /
diff --git a/driver/src/cosp1_io.f90 b/driver/src/cosp1_io.f90
@@ -2,7 +2,7 @@ module mod_cosp1_io
   use cosp_kinds, only: wp
   use mod_cosp,   only: cosp_outputs
   use netcdf
-  USE MOD_COSP_CONFIG, ONLY:  Nlvgrid, LIDAR_NCAT, SR_BINS, PARASOL_NREFL, DBZE_BINS, &
+  USE MOD_COSP_CONFIG, ONLY:  Nlvgrid, LIDAR_NCAT, SR_BINS, PARASOL_NREFL, cloudsat_DBZE_BINS, &
        numMODISReffIceBins, numMODISReffLiqBins, ntau, tau_binBounds, tau_binCenters, &
        tau_binEdges,npres, pres_binBounds, pres_binCenters, pres_binEdges, nhgt,      &
        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
     if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))
     status = nf90_def_dim(fileID,"PARASOL_NREFL",PARASOL_NREFL,dimID(13))
     if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))
-    status = nf90_def_dim(fileID,"DBZE_BINS",DBZE_BINS,dimID(14))
+    status = nf90_def_dim(fileID,"cloudsat_DBZE_BINS",cloudsat_DBZE_BINS,dimID(14))
     if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))
     status = nf90_def_dim(fileID,"RELIQ_MODIS",numMODISReffLiqBins,dimID(15))
     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
        if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))
        status = nf90_put_att(fileID,varID(23),"standard_name", "histogram_of_equivalent_reflectivity_factor_over_height_above_reference_ellipsoid")
        if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status)) 
-       status = nf90_def_var(fileID,"DBZE_BINS",nf90_float, (/dimID(14)/),varID(83))
+       status = nf90_def_var(fileID,"cloudsat_DBZE_BINS",nf90_float, (/dimID(14)/),varID(83))
        if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))
        status = nf90_put_att(fileID,varID(83),"long_name","CloudSat simulator equivalent radar reflectivity factor")
        if (status .ne. nf90_NoERR) print*,trim(nf90_strerror(status))

diff --git a/driver/src/cosp1_test.f90 b/driver/src/cosp1_test.f90
@@ -33,7 +33,7 @@ program cosp1_test
   use cosp_kinds,          only: wp                         
   USE MOD_COSP_CONFIG,     ONLY: R_UNDEF,PARASOL_NREFL,LIDAR_NCAT,SR_BINS,                &
                                  N_HYDRO,RTTOV_MAX_CHANNELS,numMISRHgtBins,               &
-                                 DBZE_BINS,LIDAR_NTEMP,calipso_histBsct,                  &
+                                 cloudsat_DBZE_BINS,LIDAR_NTEMP,calipso_histBsct,                  &
                                  numMODISTauBins,numMODISPresBins,                        &
                                  numMODISReffIceBins,numMODISReffLiqBins,                 &
                                  numISCCPTauBins,numISCCPPresBins,numMISRTauBins,         &