Changeset 4019 for palm/trunk

Timestamp:

Jun 6, 2019 2:00:35 PM (5 years ago)

Author:

eckhard

Message:

inifor: bugfix: Fix wrong z_top height with gfortran -O2/-O3

Location:

palm/trunk/UTIL/inifor/src

Files:

• inifor_defs.f90 (modified) (2 diffs)
• inifor_grid.f90 (modified) (7 diffs)

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

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Bumped version number
+! 
+! 
+! 3997 2019-05-23 12:35:57Z eckhard
 ! Defined netCDF attribute names for PALM origin coordinates
 ! Make netCDF variable names constants
@@ -176 +180 @@
     ACHAR( 10 ) // ' Copyright 2017-2019 Deutscher Wetterdienst Offenbach' !< Copyright notice
  CHARACTER(LEN=*), PARAMETER ::  LOG_FILE_NAME = 'inifor.log' !< Name of INIFOR's log file
- CHARACTER(LEN=*), PARAMETER ::  VERSION = '1.4.9'            !< INIFOR version number
+ CHARACTER(LEN=*), PARAMETER ::  VERSION = '1.4.10'           !< INIFOR version number
  
  END MODULE inifor_defs

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

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! bugfix: Replaced z_top array literal with array, fixes wrong z_top height with gfortran -O2/-O3
+! 
+! 
+! 3997 2019-05-23 12:35:57Z eckhard
 ! Read origin_z from static driver if given on the command line
 ! Warn if origin_z is specified twice (by static driver and --elevation)
@@ -206 +210 @@
     REAL(wp) ::  y0                = 0.0_wp       !< y coordinate of PALM-4U Earth tangent [m] 
     REAL(wp) ::  z0                = 0.0_wp       !< Elevation of the PALM-4U domain above sea level [m]
-    REAL(wp) ::  z_top             = 0.0_wp       !< height of the scalar top boundary [m]
-    REAL(wp) ::  zw_top            = 0.0_wp       !< height of the vertical velocity top boundary [m]
+    REAL(wp) ::  z_top(1)          = 0.0_wp       !< height of the scalar top boundary [m]
+    REAL(wp) ::  zw_top(1)         = 0.0_wp       !< height of the vertical velocity top boundary [m]
     REAL(wp) ::  lonmin_cosmo      = 0.0_wp       !< Minimunm longitude of COSMO-DE's rotated-pole grid [COSMO rotated-pole rad]
     REAL(wp) ::  lonmax_cosmo      = 0.0_wp       !< Maximum longitude of COSMO-DE's rotated-pole grid [COSMO rotated-pole rad]
@@ -750 +754 @@
                      dz_stretch_level_end=dz_stretch_level_end,             &
                      dz_stretch_factor_array=dz_stretch_factor_array)
-    z(1:nz) = z_column(1:nz)
-    z_top = z_column(nz+1)
+    z(1:nz)  = z_column(1:nz)
+    z_top(:) = z_column(nz+1)
 
 !
@@ -761 +765 @@
     CALL midpoints(z_column, zw_column)
     zw(1:nz-1) = zw_column(1:nz-1)
-    zw_top     = zw_column(nz)
+    zw_top(:)  = zw_column(nz)
 
 
@@ -864 +868 @@
                ymin =  0.5_wp * dy, ymax = ly - 0.5_wp * dy,                   &
                x0=x0, y0=y0, z0 = z0,                                          &
-               nx = nx, ny = ny, nz = 1, z=(/z_top/))
+               nx = nx, ny = ny, nz = 1, z=z_top)
 
        CALL init_grid_definition('boundary', grid=u_east_grid,                 &
@@ -894 +898 @@
                ymin = 0.5_wp * dy, ymax = ly - 0.5_wp * dy,                    &
                x0=x0, y0=y0, z0 = z0,                                          &
-               nx = nx-1, ny = ny, nz = 1, z=(/z_top/))
+               nx = nx-1, ny = ny, nz = 1, z=z_top)
 
        CALL init_grid_definition('boundary', grid=v_east_grid,                 &
@@ -954 +958 @@
                ymin = 0.5_wp * dy, ymax = ly - 0.5_wp * dy,                    &
                x0=x0, y0=y0, z0 = z0,                                          &
-               nx = nx, ny = ny, nz = 1, z=(/zw_top/))
+               nx = nx, ny = ny, nz = 1, z=zw_top)
 
        CALL init_grid_definition('boundary intermediate', grid=scalars_east_intermediate,   &