Changeset 48 for palm/trunk/SOURCE/modules.f90

Timestamp:

Mar 6, 2007 12:28:36 PM (17 years ago)

Author:

raasch

Message:

preliminary version, several changes to be explained later

File:

• palm/trunk/SOURCE/modules.f90 (modified) (9 diffs)

palm/trunk/SOURCE/modules.f90

@@ -5 +5 @@
 ! Actual revisions:
 ! -----------------
-! +netcdf_64bit_3d
+! +netcdf_64bit_3d, zu_s_inner, zw_w_inner, id_var_zusi_*, id_var_zwwi_*,
+! ts_value
+! -data_output_ts, dots_n
+! arrays dots_label and dots_unit now dimensioned with dots_max
 !
 ! Former revisions:
@@ -228 +231 @@
     CHARACTER (LEN=10), DIMENSION(100) ::  data_output = ' ',    &
                                            data_output_pr = ' ', &
-                                           data_output_ts = ' ', &
                                            data_output_user = ' ', doav = ' '
     CHARACTER (LEN=20), DIMENSION(10)  ::  netcdf_precision = ' '
@@ -239 +241 @@
                 disturbance_level_ind_t, doav_n = 0, dopr_n = 0, &
                 dopr_time_count = 0, dopts_time_count = 0, &
-                dosp_time_count = 0, dots_n = 0, dots_time_count = 0, &
+                dosp_time_count = 0, dots_time_count = 0, &
                 do2d_xy_n = 0, do2d_xz_n = 0, do2d_yz_n = 0, do3d_avs_n = 0, &
                 dvrp_filecount = 0, dz_stretch_level_index, gamma_mg, &
@@ -489 +491 @@
     REAL, DIMENSION(:), ALLOCATABLE ::  ddx2_mg, ddy2_mg
 
-    REAL, DIMENSION(:,:), ALLOCATABLE ::  fwxm, fwxp, fwym, fwyp, fxm, fxp, &
-                                          fym, fyp, wall_e_x, wall_e_y, &
-                                          wall_u, wall_v, wall_w_x, wall_w_y
+    REAL, DIMENSION(:,:), ALLOCATABLE ::  fwxm, fwxp, fwym, fwyp, fxm, fxp,   &
+                                          fym, fyp, wall_e_x, wall_e_y,       &
+                                          wall_u, wall_v, wall_w_x, wall_w_y, &
+                                          zu_s_inner, zw_w_inner
 
     SAVE
@@ -648 +651 @@
 #endif
 
-    INTEGER, PARAMETER ::  dopr_norm_num = 7, dopts_num = 26, dots_num = 22, &
+    INTEGER, PARAMETER ::  dopr_norm_num = 7, dopts_num = 26, dots_max = 100, &
                            replace_num = 6
+
+    INTEGER ::  dots_num = 22
 
     CHARACTER, DIMENSION( replace_num ) :: &
@@ -677 +682 @@
              'm2/s2  ', 'number2' /)
 
-    CHARACTER (LEN=7), DIMENSION(dots_num) :: dots_label = &
+    CHARACTER (LEN=7), DIMENSION(dots_max) :: dots_label = &
           (/ 'E      ', 'E*     ', 'dt     ', 'u*     ', 'th*    ', 'umax   ', &
              'vmax   ', 'wmax   ', 'div_new', 'div_old', 'z_i_wpt', 'z_i_pt ', &
              'w*     ', 'w"pt"0 ', 'w"pt"  ', 'wpt    ', 'pt(0)  ', 'pt(zp) ', &
-             'splptx ', 'splpty ', 'splptz ', 'mo_L   ' /)
-
-    CHARACTER (LEN=7), DIMENSION(dots_num) :: dots_unit = &
+             'splptx ', 'splpty ', 'splptz ', 'mo_L   ',                       &
+             ( 'unknown', i9 = 1, 78) /)
+
+    CHARACTER (LEN=7), DIMENSION(dots_max) :: dots_unit = &
           (/ 'm2/s2  ', 'm2/s2  ', 's      ', 'm/s    ', 'K      ', 'm/s    ', &
              'm/s    ', 'm/s    ', 's-1    ', 's-1    ', 'm      ', 'm      ', &
              'm/s    ', 'K m/s  ', 'K m/s  ', 'k m/s  ', 'K      ', 'K      ', &
-             '%      ', '%      ', '%      ', 'm      ' /)
+             '%      ', '%      ', '%      ', 'm      ',                       &
+             ( 'unknown', i9 = 1, 78 ) /)
 
     CHARACTER (LEN=7), DIMENSION(100) ::  dopr_unit = 'unknown'
@@ -737 +744 @@
                 id_var_xu_yz, id_var_x_3d, id_var_xu_3d, id_var_y_xy, &
                 id_var_yv_xy, id_var_y_xz, id_var_yv_xz, id_var_y_yz, &
-                id_var_yv_yz, id_var_y_3d, id_var_yv_3d, id_var_zu_xy, &
-                id_var_zu1_xy, id_var_zu_xz, id_var_zu_yz, id_var_zu_3d, &
+                id_var_yv_yz, id_var_y_3d, id_var_yv_3d, id_var_zusi_xy, &
+                id_var_zusi_3d, id_var_zu_xy, id_var_zu1_xy, id_var_zu_xz, &
+                id_var_zu_yz, id_var_zu_3d, id_var_zwwi_xy, id_var_zwwi_3d, &
                 id_var_zw_xy, id_var_zw_xz, id_var_zw_yz, id_var_zw_3d
 
@@ -749 +757 @@
     INTEGER, DIMENSION(100,0:9)        ::  id_dim_z_pr, id_var_dopr, &
                                            id_var_z_pr
-    INTEGER, DIMENSION(dots_num,0:9)   ::  id_var_dots
+    INTEGER, DIMENSION(dots_max,0:9)   ::  id_var_dots
 
 
@@ -1020 +1028 @@
 
     CHARACTER (LEN=40) ::  region(0:9)
-    INTEGER ::  statistic_regions = 0, var_hom = 80, var_sum = 80
+    INTEGER ::  statistic_regions = 0, var_hom = 80, var_sum = 80, var_ts = 100
     INTEGER ::  u_max_ijk(3), v_max_ijk(3), w_max_ijk(3)
     LOGICAL ::  flow_statistics_called = .FALSE.
     REAL ::     u_max, v_max, w_max
     REAL, DIMENSION(:), ALLOCATABLE       ::  sums_divnew_l, sums_divold_l
-    REAL, DIMENSION(:,:), ALLOCATABLE     ::  sums, sums_wsts_bc_l
+    REAL, DIMENSION(:,:), ALLOCATABLE     ::  sums, sums_wsts_bc_l, ts_value
     REAL, DIMENSION(:,:,:), ALLOCATABLE   ::  hom_sum, rmask, spectrum_x, &
                                               spectrum_y, sums_l, sums_l_l, &