Switch off cloudsat precipitation frequency diagnostics for test with outputs on model levels

.github/workflows/continuous_integration.yml

@@ -41,7 +41,7 @@ jobs:
         python-version: [3.11]
         include:
           - compiler_short_name: gfortran
-          - kgo_version: v004
+          - kgo_version: v005
     defaults:
       run:
         shell: bash -el {0}

driver/data/outputs/UKMO/cosp2_output.um_global.gfortran.kgo.v005.nc.md5

@@ -0,0 +1 @@
+83c3d91b0c451ccfce9e8742a9e45d59  cosp2_output.um_global.gfortran.kgo.v005.nc

driver/data/outputs/UKMO/cosp2_output.um_global_model_levels.gfortran.kgo.v005.nc.md5

@@ -0,0 +1 @@
+ddb2ff79094fbf5323f951a6eb0b7d39  cosp2_output.um_global_model_levels.gfortran.kgo.v005.nc

driver/data/outputs/UKMO/cosp2_output_um.gfortran.kgo.v005.nc.md5

@@ -0,0 +1 @@
+76b8b0c8ba0859782a1b53feecc2a0c9  cosp2_output_um.gfortran.kgo.v005.nc

driver/download_test_data.sh

@@ -5,10 +5,10 @@ COMPILER=$1
 case $COMPILER in
 
   "gfortran")
-    KGO_VERSION=v004
-    kgo_links=( "https://docs.google.com/uc?export=download&id=1kC9RViPBdAsGcOivpYXxs3hHJ11Kv8IN" \
-                "https://docs.google.com/uc?export=download&id=1X_oOzvY2lf-kyAR-D1E6JfuefkGg1idn" \
-                "https://docs.google.com/uc?export=download&id=1c14qBf9VwYJWYVGCu-Cw35F-qqHx0mSg" )
+    KGO_VERSION=v005
+    kgo_links=( "https://docs.google.com/uc?export=download&id=1olgrWzCSpFyPdimFnRfeFxkq5SoIfPDv" \
+                "https://docs.google.com/uc?export=download&id=1B9Too1KSfT7fcWKJj2OeR7cytk56eZO2" \
+                "https://docs.google.com/uc?export=download&id=1ddBYJsdRXy4z7kLrhRq54KvtuO6AjnTq" )
     out_type=( "cosp2_output_um.${COMPILER}.kgo" \
                "cosp2_output.um_global.${COMPILER}.kgo" \
                "cosp2_output.um_global_model_levels.${COMPILER}.kgo" )

driver/run/cosp2_output_nl.um_global_model_levels.txt

@@ -135,17 +135,17 @@
   !- 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.,
+  Lptradarflag0=.false.,
+  Lptradarflag1=.false.,
+  Lptradarflag2=.false.,
+  Lptradarflag3=.false.,
+  Lptradarflag4=.false.,
+  Lptradarflag5=.false.,
+  Lptradarflag6=.false.,
+  Lptradarflag7=.false.,
+  Lptradarflag8=.false.,
+  Lptradarflag9=.false.,
+  Lradarpia=.false.,
   !- CloudSat+MODIS joint diagnostics
   Lwr_occfreq=.true.,
   Lcfodd=.true.

driver/src/cosp2_test.f90

@@ -423,7 +423,7 @@ program cosp2_test
        Ltbrttov, Lptradarflag0,Lptradarflag1,Lptradarflag2,Lptradarflag3,Lptradarflag4,  &
        Lptradarflag5,Lptradarflag6,Lptradarflag7,Lptradarflag8,Lptradarflag9,Lradarpia,  &
        Lwr_occfreq, Lcfodd,                                                              &
-       Npoints, Ncolumns, Nlevels, Nlvgrid_local, rttov_Nchannels, cospOUT)
+       Npoints, Ncolumns, Nlevels, Nlvgrid_local, rttov_Nchannels, use_vgrid, cospOUT)
 
   !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   ! Break COSP up into pieces and loop over each COSP 'chunk'.
@@ -1059,7 +1059,7 @@ subroutine construct_cosp_outputs(Lpctisccp,Lclisccp,&
                                     Lptradarflag3,Lptradarflag4,Lptradarflag5,           &
                                     Lptradarflag6,Lptradarflag7,Lptradarflag8,           &
                                     Lptradarflag9,Lradarpia,Lwr_occfreq,Lcfodd,          &
-                                    Npoints,Ncolumns,Nlevels,Nlvgrid,Nchan,x)
+                                    Npoints,Ncolumns,Nlevels,Nlvgrid,Nchan,use_vgrid,x)
      ! Inputs
      logical,intent(in) :: &
          Lpctisccp,        & ! ISCCP mean cloud top pressure
@@ -1169,7 +1169,8 @@ subroutine construct_cosp_outputs(Lpctisccp,Lclisccp,&
          Lptradarflag9,    & ! CLOUDSAT 
          Lradarpia,        & ! CLOUDSAT 
          Lwr_occfreq,      & ! CloudSat+MODIS joint diagnostics
-         Lcfodd              ! CloudSat+MODIS joint diagnostics
+         Lcfodd,           & ! CloudSat+MODIS joint diagnostics
+         use_vgrid
 
      integer,intent(in) :: &
           Npoints,         & ! Number of sampled points
@@ -1318,11 +1319,23 @@ subroutine construct_cosp_outputs(Lpctisccp,Lclisccp,&
     if (Ldbze94)        allocate(x%cloudsat_Ze_tot(Npoints,Ncolumns,Nlevels))
     if (LcfadDbze94)    allocate(x%cloudsat_cfad_ze(Npoints,cloudsat_DBZE_BINS,Nlvgrid))
     if (Lptradarflag0 .or. Lptradarflag1 .or. Lptradarflag2 .or. Lptradarflag3 .or. &
-        Lptradarflag4 .or. Lptradarflag5 .or. Lptradarflag6 .or. Lptradarflag7 .or. &
-        Lptradarflag8 .or. Lptradarflag9) then
-       allocate(x%cloudsat_precip_cover(Npoints,cloudsat_DBZE_BINS))
+         Lptradarflag4 .or. Lptradarflag5 .or. Lptradarflag6 .or. Lptradarflag7 .or. &
+         Lptradarflag8 .or. Lptradarflag9) then
+       if (use_vgrid) then
+          allocate(x%cloudsat_precip_cover(Npoints,cloudsat_DBZE_BINS))
+       else
+          print*,'WARNING: CLOUDSAT Precipitation occurrence diagnostics not available when use_vgrid=FALSE.'
+          print*,'WARNING: Turning CLOUDSAT Precipitation occurrence diagnostcs OFF'
+       endif
+    endif
+    if (Lradarpia) then
+       if (use_vgrid) then
+          allocate(x%cloudsat_pia(Npoints))
+       else
+          print*,'WARNING: CLOUDSAT Precipitation occurrence diagnostics not available when use_vgrid=FALSE.'
+          print*,'WARNING: Turning CLOUDSAT Precipitation occurrence diagnostcs OFF'
+       endif
     endif
-    if (Lradarpia) allocate(x%cloudsat_pia(Npoints))
 
     ! Combined CALIPSO/CLOUDSAT fields
     if (Lclcalipso2)    allocate(x%lidar_only_freq_cloud(Npoints,Nlvgrid))

src/simulator/quickbeam/quickbeam.F90

@@ -264,6 +264,8 @@ subroutine quickbeam_column(npoints, ncolumns, nlevels, llm, DBZE_BINS, platform
 
     ! Create Cloudsat diagnostics.
     if (lcloudsat) then
+       cloudsat_precip_cover = 0._wp
+       cloudsat_pia          = 0._wp
        if (use_vgrid) then
           ! Regrid in the vertical (*NOTE* This routine requires SFC-2-TOA ordering, so flip
           ! inputs and outputs to maintain TOA-2-SFC ordering convention in COSP2.)