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

Timestamp:

Dec 7, 2018 6:20:37 PM (5 years ago)

Author:

eckhard

Message:

inifor: Average initial profiles over the PALM, not the geostrophic, region

File:

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

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

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Use averaged heights profile for level-based averaging instead of modified
+!    COSMO heights array
+! 
+! 
+! 3557 2018-11-22 16:01:22Z eckhard
 ! Updated documentation
 ! 
@@ -898 +903 @@
 !> iii(:) and jjj(:).
 !------------------------------------------------------------------------------!
-    SUBROUTINE find_vertical_neighbours_and_weights_average( avg_grid )
-       TYPE(grid_definition), INTENT(INOUT) ::  avg_grid
-
-       INTEGER  ::  i, j, k_palm, k_intermediate, l, nlev
-       LOGICAL  ::  point_is_below_grid, point_is_above_grid,                  &
-                    point_is_in_current_cell
-       REAL(dp) ::  current_height, column_base, column_top, h_top, h_bottom,  &
-                    weight
+    SUBROUTINE find_vertical_neighbours_and_weights_average(                   &
+       avg_grid, level_based_averaging                                         &
+    )
+
+       TYPE(grid_definition), INTENT(INOUT), TARGET ::  avg_grid
+       LOGICAL                                      ::  level_based_averaging
+
+       INTEGER           ::  i, j, k_palm, k_intermediate, l, nlev
+       LOGICAL           ::  point_is_below_grid, point_is_above_grid,         &
+                             point_is_in_current_cell
+       REAL(dp)          ::  current_height, column_base, column_top, h_top,   &
+                             h_bottom, weight
+       REAL(dp), POINTER ::  cosmo_h(:,:,:)
 
 
@@ -911 +921 @@
 
        nlev = SIZE(avg_grid % cosmo_h, 3)
+
+       IF (level_based_averaging)  THEN
+          cosmo_h => avg_grid % h
+       ELSE
+          cosmo_h => avg_grid % cosmo_h
+       END IF
 
 !
@@ -916 +932 @@
        DO l = 1, avg_grid % n_columns
 
-          i = avg_grid % iii(l)
-          j = avg_grid % jjj(l)
-
-          column_base = avg_grid % cosmo_h(i,j,1)
-          column_top  = avg_grid % cosmo_h(i,j,nlev)
+          IF (level_based_averaging)  THEN
+             i = 1
+             j = 1
+          ELSE
+             i = avg_grid % iii(l)
+             j = avg_grid % jjj(l)
+          END IF
+
+          column_base = cosmo_h(i,j,1)
+          column_top  = cosmo_h(i,j,nlev)
 
 !
@@ -934 +955 @@
 !--          current height within it
              current_height = avg_grid % z(k_palm) + avg_grid % z0
-             h_top    = avg_grid % cosmo_h(i,j,k_intermediate+1)
-             h_bottom = avg_grid % cosmo_h(i,j,k_intermediate)
+             h_top    = cosmo_h(i,j,k_intermediate+1)
+             h_bottom = cosmo_h(i,j,k_intermediate)
 
 !
@@ -972 +993 @@
                    k_intermediate = k_intermediate + 1
 
-                   h_top    = avg_grid % cosmo_h(i,j,k_intermediate+1)
-                   h_bottom = avg_grid % cosmo_h(i,j,k_intermediate)
+                   h_top    = cosmo_h(i,j,k_intermediate+1)
+                   h_bottom = cosmo_h(i,j,k_intermediate)
                    point_is_in_current_cell = (                                &
                       current_height >= h_bottom .AND.                         &