Index: palm/trunk/SOURCE/netcdf_interface_mod.f90
===================================================================
--- palm/trunk/SOURCE/netcdf_interface_mod.f90	(revision 4029)
+++ palm/trunk/SOURCE/netcdf_interface_mod.f90	(revision 4039)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Rename subroutines in module for diagnostic quantities
+! 
+! 4029 2019-06-14 14:04:35Z raasch
 ! netcdf variable NF90_NOFILL is used as argument instead of "1" in calls to NF90_DEF_VAR_FILL
 ! 
@@ -698,4 +701,7 @@
                skip_time_do3d, topography, num_leg, num_var_fl,                &
                urban_surface
+
+    USE diagnostic_output_quantities_mod,                                      & 
+        ONLY:  doq_define_netcdf_grid           
 
     USE grid_variables,                                                        &
@@ -1124,5 +1130,5 @@
                 CASE ( 'e', 'nc', 'nr', 'p', 'pc', 'pr', 'prr',                &
                        'q', 'qc', 'ql', 'ql_c', 'ql_v', 'ql_vp', 'qr', 'qv',   &
-                       's', 'theta', 'thetal', 'thetav', 'ti' )
+                       's', 'theta', 'thetal', 'thetav' )
 
                    grid_x = 'x'
@@ -1169,4 +1175,8 @@
                    ENDIF
 
+                   IF ( .NOT. found )                                          &
+                      CALL doq_define_netcdf_grid( domask(mid,av,i), found,    &
+                                                   grid_x, grid_y, grid_z )
+                   
                    IF ( .NOT. found  .AND.  gust_module_enabled )  THEN
                       CALL gust_define_netcdf_grid( domask(mid,av,i), found,   &
@@ -1870,5 +1880,5 @@
                 CASE ( 'e', 'nc', 'nr', 'p', 'pc', 'pr', 'prr',   &
                        'q', 'qc', 'ql', 'ql_c', 'ql_v', 'ql_vp', 'qr', 'qv',   &
-                       's', 'theta', 'thetal', 'thetav', 'ti' )
+                       's', 'theta', 'thetal', 'thetav' )
 
                    grid_x = 'x'
@@ -1974,4 +1984,8 @@
                                                     grid_y, grid_z )
                    ENDIF
+                   
+                   IF ( .NOT. found )                                          &
+                      CALL doq_define_netcdf_grid( do3d(av,i), found, grid_x,  &
+                                                   grid_y, grid_z        )
                                                  
                    IF ( .NOT. found )  THEN
@@ -2858,5 +2872,5 @@
                              'ql_vp_xy', 'qr_xy', 'qv_xy',                     &
                              's_xy',                                           &
-                             'theta_xy', 'thetal_xy', 'thetav_xy', 'ti_xy' )
+                             'theta_xy', 'thetal_xy', 'thetav_xy' )
 
                          grid_x = 'x'
@@ -2944,6 +2958,9 @@
                                                           grid_z )
                          ENDIF
-
-
+                         
+                         IF ( .NOT. found )                                    &
+                            CALL doq_define_netcdf_grid(                       &
+                                                    do2d(av,i), found, grid_x, &
+                                                    grid_y, grid_z              )
 !
 !--                      Check for user-defined quantities
@@ -3762,5 +3779,5 @@
                           'ql_xz', 'ql_c_xz', 'ql_v_xz', 'ql_vp_xz', 'qr_xz',  &
                           'qv_xz', 's_xz',                                     &
-                          'theta_xz', 'thetal_xz', 'thetav_xz', 'ti_xz' )
+                          'theta_xz', 'thetal_xz', 'thetav_xz' )
 
                       grid_x = 'x'
@@ -3837,4 +3854,8 @@
                                                        grid_z )
                       ENDIF
+                      
+                      IF ( .NOT. found )                                       &
+                         CALL doq_define_netcdf_grid( do2d(av,i), found,       &
+                                                      grid_x, grid_y, grid_z )
 
 !
@@ -4695,4 +4716,9 @@
                                                        grid_z )
                       ENDIF
+                      
+                      IF ( .NOT. found )                                       &
+                         CALL doq_define_netcdf_grid(                          &
+                                                    do2d(av,i), found, grid_x, &
+                                                    grid_y, grid_z           )
 !
 !--                   Check for user-defined quantities
@@ -6000,5 +6026,5 @@
                        'q', 'qc', 'ql', 'ql_c', 'ql_v', 'ql_vp', 'qr', 'qv',   &
                        'rho_sea_water', 's', 'sa', &
-                       'theta', 'thetal', 'thetav', 'ti', 'u', 'v' )
+                       'theta', 'thetal', 'thetav', 'u', 'v' )
 
                    grid_z = 'zu'
