Index: LMDZ6/branches/contrails/DefLists/context_input_lmdz.xml
===================================================================
--- LMDZ6/branches/contrails/DefLists/context_input_lmdz.xml (revision 5572)
+++ LMDZ6/branches/contrails/DefLists/context_input_lmdz.xml (revision 5573)
@@ -399,7 +399,7 @@
-
-
-
+
+
+
@@ -427,6 +427,6 @@
-
-
+
+
@@ -435,7 +435,4 @@
-
-
-
@@ -454,5 +451,5 @@
-
+
Index: LMDZ6/branches/contrails/DefLists/file_def_histday_lmdz.xml
===================================================================
--- LMDZ6/branches/contrails/DefLists/file_def_histday_lmdz.xml (revision 5572)
+++ LMDZ6/branches/contrails/DefLists/file_def_histday_lmdz.xml (revision 5573)
@@ -504,4 +504,13 @@
+
+
+
+
+
+
+
+
+
Index: LMDZ6/branches/contrails/DefLists/file_def_histhf_lmdz.xml
===================================================================
--- LMDZ6/branches/contrails/DefLists/file_def_histhf_lmdz.xml (revision 5572)
+++ LMDZ6/branches/contrails/DefLists/file_def_histhf_lmdz.xml (revision 5573)
@@ -1,556 +1,557 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: LMDZ6/branches/contrails/DefLists/file_def_histmth_lmdz.xml
===================================================================
--- LMDZ6/branches/contrails/DefLists/file_def_histmth_lmdz.xml (revision 5572)
+++ LMDZ6/branches/contrails/DefLists/file_def_histmth_lmdz.xml (revision 5573)
@@ -553,4 +553,14 @@
+
+
+
+
+
+
+
+
+
+
Index: LMDZ6/branches/contrails/libf/phylmd/lmdz_aviation.f90
===================================================================
--- LMDZ6/branches/contrails/libf/phylmd/lmdz_aviation.f90 (revision 5572)
+++ LMDZ6/branches/contrails/libf/phylmd/lmdz_aviation.f90 (revision 5573)
@@ -622,5 +622,5 @@
END FUNCTION contrail_cross_section_onera
-SUBROUTINE read_aviation_emissions(klon, klev, flight_dist, flight_h2o)
+SUBROUTINE read_aviation_emissions(klon, klev, flight_dist_read, flight_h2o_read, aviation_lev, nleva)
! This subroutine allows to read the traffic density data read in the file aviation.nc
! This file is defined in ./COMP/lmdz.card
@@ -635,15 +635,42 @@
INTEGER, INTENT(IN) :: klon, klev ! number of horizontal grid points and vertical levels
- REAL, DIMENSION(klon,klev), INTENT(OUT) :: flight_dist ! Aviation distance flown concentration [m/s/m3]
- REAL, DIMENSION(klon,klev), INTENT(OUT) :: flight_h2o ! Aviation emitted H2O [kgH2O/s/m3]
+ INTEGER, INTENT(out) :: nleva ! Size of the vertical axis in the file
+ !REAL, DIMENSION(klon,klev), INTENT(OUT) :: flight_dist ! Aviation distance flown within the mesh [m/s/mesh]
+ !REAL, DIMENSION(klon,klev), INTENT(OUT) :: flight_h2o ! Aviation H2O emitted within the mesh [kgH2O/s/mesh]
+ REAL, ALLOCATABLE, INTENT(OUT) :: flight_dist_read(:,:,:) ! Aviation distance flown within the mesh [m/s/mesh]
+ REAL, ALLOCATABLE, INTENT(OUT) :: flight_h2o_read(:,:,:) ! Aviation H2O emitted within the mesh [kgH2O/s/mesh]
+ REAL, ALLOCATABLE, INTENT(OUT) :: aviation_lev(:) ! Pressure in the middle of the layers [Pa]
!----------------------------------------------------
! Local variable
!----------------------------------------------------
- REAL, DIMENSION(klon_mpi,klev,1) :: flight_dist_mpi
+ !REAL, DIMENSION(klon_mpi,klev,1) :: flight_dist_mpi
+ REAL, ALLOCATABLE :: flight_dist_mpi(:,:,:)
+ INTEGER :: ierr
+
+ ! Get number of vertical levels and level values
+ CALL xios_get_axis_attr( "aviation_lev", n_glo=nleva )
+
+ ! Allocation of arrays
+ !$OMP MASTER
+ ALLOCATE(aviation_lev(nleva), STAT=ierr)
+ IF (ierr /= 0) CALL abort_physic('read_aviation_emissions', 'problem to allocate aviation_lev',1)
+ ALLOCATE(flight_dist_read(klon, nleva,1), STAT=ierr)
+ IF (ierr /= 0) CALL abort_physic('read_aviation_emissions', 'problem to allocate flight_dist',1)
+ ALLOCATE(flight_h2o_read(klon, nleva,1), STAT=ierr)
+ IF (ierr /= 0) CALL abort_physic('read_aviation_emissions', 'problem to allocate flight_h2o',1)
+ ALLOCATE(flight_dist_mpi(klon_mpi, nleva,1), STAT=ierr)
+ IF (ierr /= 0) CALL abort_physic('read_aviation_emissions', 'problem to allocate flight_dist_mpi',1)
+ !$OMP END MASTER
+
+ !$OMP BARRIER ! Ensure all threads wait until the arrays are allocated
!--Initialisation
- flight_dist(:,:) = 0.
- flight_h2o(:,:) = 0.
+ aviation_lev(:) = 0.
+ flight_dist_read(:,:,1) = 0.
+ flight_h2o_read(:,:,1) = 0.
+
+ ! Get number of vertical levels and level values
+ CALL xios_get_axis_attr( "aviation_lev", value=aviation_lev(:))
! Read the data from the file
@@ -651,9 +678,84 @@
IF (is_omp_master) CALL xios_recv_field("KMFLOWN_interp", flight_dist_mpi(:,:,1))
- ! Propagate to other OMP threads: flight_dist_mpi(klon_mpi,klev) to flight_dist(klon,klev)
- ! (klon_mpi,klon) = (200,50) avec 80 MPI, 4 OMP, nbp40
- CALL scatter_omp(flight_dist_mpi(:,:,1), flight_dist)
+ ! Propagate to other OMP threads: flight_dist_mpi(klon_mpi,klev) to flight_dist(klon,klev)
+ ! (klon_mpi,klon) = (200,50) avec 80 MPI, 4 OMP, nbp40
+ CALL scatter_omp(flight_dist_mpi(:,:,1), flight_dist_read(:,:,1))
END SUBROUTINE read_aviation_emissions
+SUBROUTINE vertical_interpolation_aviation(klon, klev, paprs, pplay, flight_dist_read, &
+ flight_h2o_read, aviation_lev, nleva, flight_dist, &
+ flight_h2o)
+ ! This subroutine performs the vertical interpolation from the read data in aviation.nc
+ ! where there are nleva vertical levels described in aviation_lev to the klev levels or
+ ! the model.
+ ! flight_dist_read(klon,nleva) -> flight_dist(klon, klev)
+ ! flight_h2o_read(klon,nleva) -> flight_h2o(klon, klev)
+ USE print_control_mod, ONLY: lunout
+ IMPLICIT NONE
+
+ INTEGER, INTENT(IN) :: klon, klev ! number of horizontal grid points and vertical levels
+ REAL, INTENT(IN) :: paprs(klon, klev+1) ! inter-layer pressure [Pa]
+ REAL, INTENT(IN) :: pplay(klon, klev) ! mid-layer pressure [Pa]
+ INTEGER, INTENT(IN) :: nleva ! Size of the vertical axis in the file
+ REAL, INTENT(OUT) :: flight_dist(klon,klev,1) ! Aviation distance flown within the mesh [m/s/mesh]
+ REAL, INTENT(OUT) :: flight_h2o(klon,klev,1) ! Aviation H2O emitted within the mesh [kgH2O/s/mesh]
+ REAL, INTENT(IN) :: flight_dist_read(klon,nleva,1) ! Aviation distance flown within the mesh in file [m/s/mesh]
+ REAL, INTENT(IN) :: flight_h2o_read(klon,nleva,1) ! Aviation H2O emitted within the mesh in file [kgH2O/s/mesh]
+ REAL, INTENT(IN) :: aviation_lev(nleva) ! Pressure in the middle of the layers [Pa]
+
+ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ ! Local variable
+ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ REAL :: aviation_interface(1:nleva+1) ! Pressure of aviation file interfaces [ Pa ]
+ INTEGER :: k, kori ! Loop index for vertical layers
+ INTEGER :: i ! Loop index for horizontal grid
+ REAL :: zfrac ! Fraction of layer kori in layer k
+ REAL :: width_read_layer(1:nleva) ! width of a given layer [ Pa ]
+
+ ! Initialisation
+ flight_dist(:,:,1) = 0.
+ flight_h2o(:,:,1) = 0.
+
+ ! Compute the array with the vertical interface
+ ! It starts at 1 and has length nleva + 1
+ ! Note that aviation_lev has nleva and gives the altitude in the middle of the layers
+ ! Surface pressure in standard atmosphere model [ Pa ]
+ aviation_interface(1) = 101325.
+ DO kori=2, nleva
+ aviation_interface(kori) = (aviation_lev(kori-1)+aviation_lev(kori))/2.0 ! [ Pa ]
+ ENDDO
+ ! Last interface - we assume the same spacing as the very last one
+ aviation_interface(nleva+1) = aviation_interface(nleva) - (aviation_lev(nleva-1) - aviation_lev(nleva))
+
+ ! Vertical width of each layer of the read file
+ ! It is positive
+ DO kori=1, nleva
+ width_read_layer(kori) = aviation_interface(kori) - aviation_interface(kori+1)
+ ENDDO
+
+ ! Vertical reprojection
+ ! The loop over klon is induced since it is done by MPI threads
+ ! zfrac is the fraction of layer kori (read file) included in layer k (model)
+ DO i=1,klon
+ DO k=1, klev
+ DO kori=1,nleva
+ ! Which of the lower interfaces is the highest (<=> the lowest pressure) ?
+ zfrac = min(paprs(i,k), aviation_interface(kori))
+ ! Which of the upper interfaces is the lowest (<=> the greatest pressure) ?
+ zfrac = zfrac - max(paprs(i,k+1), aviation_interface(kori+1))
+ ! If zfrac is negative, the layers are not overlapping
+ ! Otherwise, we get the fraction of layer kori that overlap with layer k
+ ! after normalisation to the total kori layer width
+ zfrac = max(0.0, zfrac) / width_read_layer(kori)
+
+ ! Vertical reprojection for each desired array
+ flight_dist(i,k,1) = flight_dist(i,k,1) + zfrac * flight_dist_read(i,kori,1)
+ flight_h2o(i,k,1) = flight_h2o(i,k,1) + zfrac * flight_h2o(i,kori,1)
+ ENDDO
+ ENDDO
+ ENDDO
+
+END SUBROUTINE vertical_interpolation_aviation
+
END MODULE lmdz_aviation
Index: LMDZ6/branches/contrails/libf/phylmd/lmdz_lscp.f90
===================================================================
--- LMDZ6/branches/contrails/libf/phylmd/lmdz_lscp.f90 (revision 5572)
+++ LMDZ6/branches/contrails/libf/phylmd/lmdz_lscp.f90 (revision 5573)
@@ -24,8 +24,10 @@
dqi_adj, dqi_sub, dqi_con, dqi_mix, dqvc_adj, &
dqvc_sub, dqvc_con, dqvc_mix, qsatl, qsati, &
- rcont_seri, flight_dist, flight_h2o, contfra, &
- Tcritcont, qcritcont, potcontfraP, potcontfraNP, &
- dcontfra_cir, dcf_avi, dqi_avi, dqvc_avi, &
- cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv, &
+ rcont_seri, flight_dist, flight_h2o, &
+ flight_dist_read, flight_h2o_read, &
+ aviation_lev, nleva, contfra, Tcritcont, qcritcont,&
+ potcontfraP, potcontfraNP, dcontfra_cir, dcf_avi, &
+ dqi_avi, dqvc_avi, cloudth_sth,cloudth_senv, &
+ cloudth_sigmath,cloudth_sigmaenv, &
qraindiag, qsnowdiag, dqreva, dqssub, dqrauto, &
dqrcol, dqrmelt, dqrfreez, dqsauto, dqsagg, dqsrim,&
@@ -122,4 +124,8 @@
USE lmdz_lscp_ini, ONLY : ok_plane_contrail
+! aviation module
+USE mod_phys_lmdz_para, ONLY : is_omp_master
+USE lmdz_aviation, ONLY : vertical_interpolation_aviation
+
IMPLICIT NONE
@@ -175,6 +181,11 @@
!--------------------------------------------------
REAL, DIMENSION(klon,klev), INTENT(INOUT):: rcont_seri ! ratio of contrails fraction to total cloud fraction [-]
- REAL, DIMENSION(klon,klev), INTENT(IN) :: flight_dist ! aviation distance flown concentration [m/s/m3]
- REAL, DIMENSION(klon,klev), INTENT(IN) :: flight_h2o ! aviation emitted H2O concentration [kgH2O/s/m3]
+ REAL, DIMENSION(klon,klev,1), INTENT(OUT) :: flight_dist ! aviation distance flown within the mesh [m/s/mesh]
+ REAL, DIMENSION(klon,klev,1), INTENT(OUT) :: flight_h2o ! aviation H2O emitted within the mesh [kgH2O/s/mesh]
+ ! Read from file - nleva vertical levels - define in state_var
+ INTEGER, INTENT(IN) :: nleva
+ REAL, DIMENSION(nleva), INTENT(IN) :: aviation_lev ! vertical levels [km]
+ REAL, DIMENSION(klon,nleva,1), INTENT(IN) :: flight_dist_read ! aviation distance flown within the mesh [m/s/mesh]
+ REAL, DIMENSION(klon,nleva,1), INTENT(IN) :: flight_h2o_read ! aviation H2O emitted within the mesh [kgH2O/s/mesh]
! OUTPUT variables
@@ -452,4 +463,10 @@
!c_iso: variable initialisation for iso
+IF ( ok_plane_contrail ) THEN
+ ! Vertical interpolation is done at each physical timestep
+ !
+ IF (is_omp_master) CALL vertical_interpolation_aviation(klon, klev, paprs, pplay, flight_dist_read, &
+ flight_h2o_read, aviation_lev, nleva, flight_dist, flight_h2o)
+ENDIF
!===============================================================================
@@ -731,5 +748,5 @@
dqi_adj(:,k), dqi_sub(:,k), dqi_con(:,k), dqi_mix(:,k), &
dqvc_adj(:,k), dqvc_sub(:,k), dqvc_con(:,k), dqvc_mix(:,k), &
- rcont_seri(:,k), flight_dist(:,k), flight_h2o(:,k), contfra(:,k), &
+ rcont_seri(:,k), flight_dist(:,k,1), flight_h2o(:,k,1), contfra(:,k), &
Tcritcont(:,k), qcritcont(:,k), potcontfraP(:,k), potcontfraNP(:,k), &
dcontfra_cir(:,k), dcf_avi(:,k), dqi_avi(:,k), dqvc_avi(:,k))
Index: LMDZ6/branches/contrails/libf/phylmd/phys_output_ctrlout_mod.F90
===================================================================
--- LMDZ6/branches/contrails/libf/phylmd/phys_output_ctrlout_mod.F90 (revision 5572)
+++ LMDZ6/branches/contrails/libf/phylmd/phys_output_ctrlout_mod.F90 (revision 5573)
@@ -2193,7 +2193,7 @@
'dqvcavi', 'Aviation cloudy water vapor tendency', 'kg/kg/s', (/ ('', i=1, 10) /))
TYPE(ctrl_out), SAVE :: o_flight_dist = ctrl_out((/ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11/), &
- 'flightdist', 'Aviation flown distance concentration', 'm/s/m3', (/ ('', i=1, 10) /))
+ 'flightdist', 'Aviation flown distance', 'm/s/m^3', (/ ('', i=1, 10) /))
TYPE(ctrl_out), SAVE :: o_flight_h2o = ctrl_out((/ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11/), &
- 'flighth2o', 'Aviation emitted H2O concentration', 'kg H2O/s/m3', (/ ('', i=1, 10) /))
+ 'flighth2o', 'Aviation H2O flight emission', 'kg H2O/s/m^3', (/ ('', i=1, 10) /))
!!!!!!!!!!!!! Sorties niveaux standards de pression NMC
Index: LMDZ6/branches/contrails/libf/phylmd/phys_state_var_mod.F90
===================================================================
--- LMDZ6/branches/contrails/libf/phylmd/phys_state_var_mod.F90 (revision 5572)
+++ LMDZ6/branches/contrails/libf/phylmd/phys_state_var_mod.F90 (revision 5573)
@@ -528,4 +528,18 @@
!$OMP THREADPRIVATE(delta_sal, ds_ns, dt_ns, delta_sst, dter, dser, dt_ds)
+ ! Arrays for the lecture of aviation files
+ ! The allocation is done in the read_aviation module
+ ! The size is (klon, nleva, 1) where
+ ! nleva is the size of the vertical axis (read from file)
+ ! flight_dist_read is the number of km per second
+ ! flight_h2o_read is the water content added to the air
+ ! aviation_lev is the value of the levels
+ REAL, SAVE, ALLOCATABLE :: flight_dist_read(:,:,:), flight_h2o_read(:,:,:)
+ REAL, SAVE, ALLOCATABLE :: aviation_lev(:)
+ !$OMP THREADPRIVATE(flight_dist_read, flight_h2o_read, aviation_lev)
+ INTEGER, SAVE :: nleva
+ !$OMP THREADPRIVATE(nleva)
+
+
CONTAINS
@@ -942,4 +956,7 @@
DEALLOCATE(ratqs_inter_,sigma_qtherm)
+ ! DEALLOCATE aviation arrays
+ DEALLOCATE(flight_dist_read, flight_h2o_read, aviation_lev)
+
if (activate_ocean_skin >= 1) then
deALLOCATE(delta_sal, ds_ns, dt_ns, delta_sst, dter, dser)
Index: LMDZ6/branches/contrails/libf/phylmd/physiq_mod.F90
===================================================================
--- LMDZ6/branches/contrails/libf/phylmd/physiq_mod.F90 (revision 5572)
+++ LMDZ6/branches/contrails/libf/phylmd/physiq_mod.F90 (revision 5573)
@@ -2124,5 +2124,6 @@
!--Read the aviation emissions
IF ( ok_plane_h2o .OR. ok_plane_contrail ) THEN
- CALL read_aviation_emissions(klon, klev, flight_dist, flight_h2o)
+ CALL read_aviation_emissions(klon, klev, flight_dist_read, flight_h2o_read, &
+ aviation_lev, nleva)
ENDIF
!
@@ -3914,7 +3915,7 @@
dcf_sub, dcf_con, dcf_mix, dqi_adj, dqi_sub, dqi_con, dqi_mix, &
dqvc_adj, dqvc_sub, dqvc_con, dqvc_mix, qsatliq, qsatice, &
- rcont_seri, flight_dist, flight_h2o, contfra, &
- Tcritcont, qcritcont, potcontfraP, potcontfraNP, &
- dcontfra_cir, dcf_avi, dqi_avi, dqvc_avi, &
+ rcont_seri, flight_dist, flight_h2o, flight_dist_read, flight_h2o_read, &
+ aviation_lev, nleva, contfra, Tcritcont, qcritcont, potcontfraP, &
+ potcontfraNP, dcontfra_cir, dcf_avi, dqi_avi, dqvc_avi, &
cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv, &
qraindiag, qsnowdiag, dqreva, dqssub, dqrauto, dqrcol, dqrmelt, &