Changeset 4553 for palm/trunk/UTIL/inifor/src/inifor_transform.f90

Timestamp:

Jun 3, 2020 4:34:15 PM (4 years ago)

Author:

eckhard

Message:

Fixed domain extend check, readablity and documentation improvements

File:

• palm/trunk/UTIL/inifor/src/inifor_transform.f90 (modified) (8 diffs)

palm/trunk/UTIL/inifor/src/inifor_transform.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Improved code readability and documentation
+! 
+! 
+! 4523 2020-05-07 15:58:16Z eckhard
 ! bugfix: pressure extrapolation
 ! respect integer working precision (iwp) specified in inifor_defs.f90
@@ -1037 +1041 @@
        k_intermediate = 0
 
-       column_base = palm_intermediate%h(i,j,0)
-       column_top  = palm_intermediate%h(i,j,nlev)
+       column_base = palm_intermediate%intermediate_h(i,j,0)
+       column_top  = palm_intermediate%intermediate_h(i,j,nlev)
 
 !
@@ -1051 +1055 @@
 !--       current height within it
           current_height = palm_grid%z(k) + palm_grid%z0
-          h_top    = palm_intermediate%h(i,j,k_intermediate+1)
-          h_bottom = palm_intermediate%h(i,j,k_intermediate)
+          h_top    = palm_intermediate%intermediate_h(i,j,k_intermediate+1)
+          h_bottom = palm_intermediate%intermediate_h(i,j,k_intermediate)
 
           point_is_above_grid = (current_height > column_top) !22000m, very unlikely
@@ -1086 +1090 @@
                 k_intermediate = k_intermediate + 1
 
-                h_top    = palm_intermediate%h(i,j,k_intermediate+1)
-                h_bottom = palm_intermediate%h(i,j,k_intermediate)
+                h_top    = palm_intermediate%intermediate_h(i,j,k_intermediate+1)
+                h_bottom = palm_intermediate%intermediate_h(i,j,k_intermediate)
                 point_is_in_current_cell = (                                &
                    current_height >= h_bottom .AND.                         &
@@ -1127 +1131 @@
 !> are adressed. While the _interp variant loops over all PALM grid columns
 !> given by combinations of all index indices (i,j), this routine loops over a
-!> subset of COSMO columns, which are sequantlially stored in the index lists
+!> subset of COSMO columns, which are sequentially stored in the index lists
 !> iii(:) and jjj(:).
 !------------------------------------------------------------------------------!
@@ -1149 +1153 @@
     nlev = SIZE(avg_grid%cosmo_h, 3)
 
+!
+!-- For level-based averaging, use the profile of averaged vertical mesoscale
+!-- levels computed in init_averaging_grid().
     IF (level_based_averaging)  THEN
-       cosmo_h => avg_grid%h
+       cosmo_h => avg_grid%intermediate_h
     ELSE
        cosmo_h => avg_grid%cosmo_h
@@ -1159 +1166 @@
     DO  l = 1, avg_grid%n_columns
 
+!--    The profile of averaged vertical mesoscale levels stored in
+!--    intermediate_h only contains one column. By using the same column -- and
+!--    consequently the same vertical interpolation neighbours and weights --
+!--    
        IF (level_based_averaging)  THEN
           i = 1
@@ -1171 +1182 @@
 
 !
-!--    scan through avg_grid column until and set neighbour indices in
+!--    Scan through avg_grid column until and set neighbour indices in
 !--    case current_height is either below column_base, in the current
 !--    cell, or above column_top. Keep increasing current cell index until
 !--    the current cell overlaps with the current_height.
-       k_intermediate = 1 !avg_grid%cosmo_h is indezed 1-based.
+       k_intermediate = 1 !avg_grid%cosmo_h is indexed 1-based.
        DO  k_palm = 1, avg_grid%nz