Philippe 02/06/2023: sensors: move water content and radar reflectivity variables to tsensor

src/MNH/modd_aircraft_balloon.f90

@@ -107,13 +107,9 @@ TYPE, EXTENDS(TSENSOR), ABSTRACT :: TFLYERDATA
   REAL, DIMENSION(:,:),   ALLOCATABLE :: XRTZ       ! tot hydrometeor mixing ratio
   REAL, DIMENSION(:,:,:), ALLOCATABLE :: XRZ        ! water vapour mixing ratio
   REAL, DIMENSION(:,:),   ALLOCATABLE :: XFFZ       ! horizontal wind
-  REAL, DIMENSION(:,:),   ALLOCATABLE :: XIWCZ      ! ice water content
-  REAL, DIMENSION(:,:),   ALLOCATABLE :: XLWCZ      ! liquid water content
   REAL, DIMENSION(:,:),   ALLOCATABLE :: XCIZ       ! Ice concentration
   REAL, DIMENSION(:,:),   ALLOCATABLE :: XCCZ       ! Cloud concentration (LIMA)
   REAL, DIMENSION(:,:),   ALLOCATABLE :: XCRZ       ! Rain concentration (LIMA)
-  REAL, DIMENSION(:,:),   ALLOCATABLE :: XCRARE     ! cloud radar reflectivity
-  REAL, DIMENSION(:,:),   ALLOCATABLE :: XCRARE_ATT ! attenuated (= more realistic) cloud radar reflectivity
   REAL, DIMENSION(:,:),   ALLOCATABLE :: XWZ        ! vertical profile of vertical velocity
   REAL, DIMENSION(:,:),   ALLOCATABLE :: XZZ        ! vertical profile of mass point altitude (above sea)
   REAL, DIMENSION(:),     ALLOCATABLE :: XZS        ! zs(n)

src/MNH/modd_sensor.f90

@@ -77,6 +77,13 @@ MODULE MODD_SENSOR
       REAL :: XVCOEF10 = XUNDEF ! Interpolation coefficient in Z direction for ni_m+1, nj_v
       REAL :: XVCOEF11 = XUNDEF ! Interpolation coefficient in Z direction for ni_m+1, nj_v+1
 
+      ! Data records (at recording instants)
+      REAL, DIMENSION(:,:),   ALLOCATABLE :: XIWCZ      ! ice water content
+      REAL, DIMENSION(:,:),   ALLOCATABLE :: XLWCZ      ! liquid water content
+      REAL, DIMENSION(:,:),   ALLOCATABLE :: XCRARE     ! cloud radar reflectivity
+      REAL, DIMENSION(:,:),   ALLOCATABLE :: XCRARE_ATT ! attenuated (= more realistic) cloud radar reflectivity
+
+
     CONTAINS
       PROCEDURE(TSENSOR_ALLOCATION),   DEFERRED :: DATA_ARRAYS_ALLOCATE
       PROCEDURE(TSENSOR_DEALLOCATION), DEFERRED :: DATA_ARRAYS_DEALLOCATE

src/MNH/modd_type_statprof.f90

@@ -114,11 +114,7 @@ TYPE, EXTENDS( TSTATPROFDATA ) ::  TPROFILERDATA
   REAL, DIMENSION(:,:),   ALLOCATABLE :: XTHV       ! thv(n)
   REAL, DIMENSION(:,:),   ALLOCATABLE :: XVISIGUL   ! VISI GULTEPE(n)
   REAL, DIMENSION(:,:),   ALLOCATABLE :: XVISIKUN   ! VISI KUNKEL(n)
-  REAL, DIMENSION(:,:),   ALLOCATABLE :: XCRARE     ! radar reflectivity (n)
-  REAL, DIMENSION(:,:),   ALLOCATABLE :: XCRARE_ATT ! radar attenuated reflectivity (n)
   REAL, DIMENSION(:,:),   ALLOCATABLE :: XCIZ       ! Ice number concentration ICE3 (n)
-  REAL, DIMENSION(:,:),   ALLOCATABLE :: XLWCZ      ! liquid water content (n)
-  REAL, DIMENSION(:,:),   ALLOCATABLE :: XIWCZ      ! ice water content (n)
   REAL, DIMENSION(:,:),   ALLOCATABLE :: XRHOD      ! density of dry air/moist air
   REAL, DIMENSION(:,:,:), ALLOCATABLE :: XR         ! r*(n)
   REAL, DIMENSION(:,:,:), ALLOCATABLE :: XSV        ! Sv*(n)
@@ -445,6 +441,12 @@ SUBROUTINE PROFILER_ALLOCATE( TPSENSOR, KSTORE )
       ALLOCATE( TPSENSOR%XSFCO2(KSTORE) )
     END IF
 
+    ! Fields not used for stations (but available in tsensor type)
+    ALLOCATE( TPSENSOR%XCRARE    (0, 0) )
+    ALLOCATE( TPSENSOR%XCRARE_ATT(0, 0) )
+    ALLOCATE( TPSENSOR%XLWCZ     (0, 0) )
+    ALLOCATE( TPSENSOR%XIWCZ     (0, 0) )
+
     TPSENSOR%XZON(:)    = XUNDEF
     TPSENSOR%XMER(:)    = XUNDEF
     TPSENSOR%XW(:)      = XUNDEF
@@ -521,6 +523,10 @@ SUBROUTINE PROFILER_ALLOCATE( TPSENSOR, KSTORE )
     DEALLOCATE( TPSENSOR%XSLTAOD )
     DEALLOCATE( TPSENSOR%XSFCO2  )
 
+    DEALLOCATE( TPSENSOR%XCRARE     )
+    DEALLOCATE( TPSENSOR%XCRARE_ATT )
+    DEALLOCATE( TPSENSOR%XLWCZ      )
+    DEALLOCATE( TPSENSOR%XIWCZ      )
   END SUBROUTINE STATION_DEALLOCATE
 
 END MODULE MODD_TYPE_STATPROF