Changeset 4507 for palm/trunk/SOURCE/netcdf_data_input_mod.f90

Timestamp:

Apr 22, 2020 6:21:45 PM (4 years ago)

Author:

gronemeier

Message:

netcdf_data_input_mod:

• bugfix: check terrain height for fill values directly after reading (PA0550)
• changes:
  • remove check for negative zt (PA0551)
  • add reference height from input file to PALM reference height (origin_z)

init_grid:

• update origin_z with shifting height of orography (oro_min)
• remove message PA0505

File:

• palm/trunk/SOURCE/netcdf_data_input_mod.f90 (modified) (5 diffs)

palm/trunk/SOURCE/netcdf_data_input_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! - bugfix: check terrain height for fill values directly after reading
+! - changes: 
+!   - remove check for negative zt
+!   - add reference height from input file upon PALM reference height (origin_z)
+! 
+! 4457 2020-03-11 14:20:43Z raasch
 ! use statement for exchange horiz added,
 ! bugfixes for calls of exchange horiz 2d
@@ -988 +994 @@
 !
 !--    Copy latitude, longitude, origin_z, rotation angle on init type
+!--    NOTE: A shifting height might have already been saved to orgin_z in
+!--    init_grid; therefore, do not override but add the reference height from
+!--    the input file.
        init_model%latitude        = input_file_atts%origin_lat
        init_model%longitude       = input_file_atts%origin_lon
@@ -993 +1002 @@
        init_model%origin_x        = input_file_atts%origin_x
        init_model%origin_y        = input_file_atts%origin_y
-       init_model%origin_z        = input_file_atts%origin_z  
+       init_model%origin_z        = init_model%origin_z + input_file_atts%origin_z
        init_model%rotation_angle  = input_file_atts%rotation_angle  
 
@@ -2553 +2562 @@
           ENDIF
        ENDIF
-!
-!--    In case no terrain height is provided by static input file, allocate
-!--    array nevertheless and set terrain height to 0, which simplifies
-!--    topography initialization.
-       IF ( .NOT. terrain_height_f%from_file )  THEN
+
+       IF ( terrain_height_f%from_file )  THEN
+!
+!--       Check orography for fill-values. 
+!--       For the moment, give an error message. More advanced methods, e.g. a 
+!--       nearest neighbor algorithm as used in GIS systems might be implemented
+!--       later.
+!--       NOTE: This check must be placed here as terrain_height_f is altered
+!--       within init_grid which is called before netcdf_data_input_check_static
+          IF ( ANY( terrain_height_f%var == terrain_height_f%fill ) )  THEN
+             message_string = 'NetCDF variable zt is not ' //                  &
+                              'allowed to have missing data'
+             CALL message( 'netcdf_data_input_mod', 'PA0550', 2, 2, myid, 6, 0 )
+          ENDIF
+       ELSE
+!
+!--       In case no terrain height is provided by static input file, allocate
+!--       array nevertheless and set terrain height to 0, which simplifies
+!--       topography initialization.
           ALLOCATE ( terrain_height_f%var(nys:nyn,nxl:nxr) )
           terrain_height_f%var = 0.0_wp
@@ -3161 +3184 @@
              CALL message( 'netcdf_data_input_mod', 'PA0580', 1, 2, 0, 6, 0 )
           ENDIF
-       ENDIF
-!
-!--    Check orography for fill-values. For the moment, give an error message.
-!--    More advanced methods, e.g. a nearest neighbor algorithm as used in GIS
-!--    systems might be implemented later.
-!--    Please note, if no terrain height is provided, it is set to 0.
-       IF ( ANY( terrain_height_f%var == terrain_height_f%fill ) )  THEN
-          message_string = 'NetCDF variable zt is not ' //                     &
-                           'allowed to have missing data'
-          CALL message( 'netcdf_data_input_mod', 'PA0550', 2, 2, myid, 6, 0 )
-       ENDIF
-!
-!--    Check for negative terrain heights
-       IF ( ANY( terrain_height_f%var < 0.0_wp ) )  THEN
-          message_string = 'NetCDF variable zt is not ' //                     &
-                           'allowed to have negative values'
-          CALL message( 'netcdf_data_input_mod', 'PA0551', 2, 2, myid, 6, 0 )
        ENDIF
 !