Changeset 4538 for palm/trunk/UTIL/inifor/src/inifor_grid.f90

Timestamp:

May 18, 2020 1:45:35 PM (4 years ago)

Author:

eckhard

Message:

inifor: Fix issue where --elevation/-z option was ignored, make it mandatory

File:

• palm/trunk/UTIL/inifor/src/inifor_grid.f90 (modified) (4 diffs)

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

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Modularize setup of PALM origin
+! 
+! 
+! 4523 2020-05-07 15:58:16Z eckhard
 ! respect integer working precision (iwp) specified in inifor_defs.f90
 ! 
@@ -166 +170 @@
                PIDS_ORIGIN_Z
     USE inifor_io,                                                             &
-        ONLY:  get_cosmo_grid, get_netcdf_attribute, get_netcdf_dim_vector,    &
-               get_netcdf_variable, parse_command_line_arguments,              &
-               get_input_file_list, validate_config
+        ONLY:  get_cosmo_grid, get_input_file_list, get_netcdf_attribute,      &
+               get_netcdf_dim_vector, get_netcdf_variable, set_palm_origin,    &
+               parse_command_line_arguments, validate_config
     USE inifor_transform,                                                      &
         ONLY:  average_2d, rotate_to_cosmo, find_horizontal_neighbours,        &
@@ -561 +565 @@
     CALL get_netcdf_variable(cfg%soiltyp_file, cosmo_var, soiltyp)
 
-    message = 'Reading PALM-4U origin from'
-    IF (TRIM(cfg%static_driver_file) .NE. '')  THEN
-
-       origin_lon = get_netcdf_attribute(cfg%static_driver_file, TRIM( PIDS_ORIGIN_LON ) )
-       origin_lat = get_netcdf_attribute(cfg%static_driver_file, TRIM( PIDS_ORIGIN_LAT ) )
-       z0         = get_netcdf_attribute(cfg%static_driver_file, TRIM( PIDS_ORIGIN_Z ) )
-
-
-       message = TRIM(message) // " static driver file '"                   &
-                               // TRIM(cfg%static_driver_file) // "'"
-
-
-    ELSE
-
-       origin_lon = longitude
-       origin_lat = latitude
-
-       message = TRIM(message) // " namlist file '"                         &
-                               // TRIM(cfg%namelist_file) // "'"
-
-    ENDIF
-    origin_lon = origin_lon * TO_RADIANS
-    origin_lat = origin_lat * TO_RADIANS
-
-    CALL report('setup_parameters', message)
-
-    IF ( cfg%z0_is_set .AND. TRIM( cfg%static_driver_file ) .NE. '' )  THEN
-
-       message = 'You specified both --static-driver/-t and --elevation/-z0. ' // &
-                 'Using the command line value (' // TRIM( real_to_str_f( cfg%z0 ) ) // &
-                 ') instead of static driver value (' // TRIM( real_to_str_f( z0 ) ) // ').'
-       CALL warn('setup_parameters', message)
-
-       z0 = cfg%z0
-
-    END IF
-
+    CALL set_palm_origin(cfg, longitude, latitude, origin_lon, origin_lat, z0)
     p0 = cfg%p0
 
@@ -3980 +3948 @@
              CASE DEFAULT
                 message = "Invalid averaging period '" // TRIM(str(dt)) // " hours"
+                message = "Invalid averaging period '" // TRIM(str(dt)) // " hours"
                 CALL inifor_abort('preprocess', message)