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

Timestamp:

Jan 17, 2019 2:12:17 PM (5 years ago)

Author:

eckhard

Message:

inifor: bugfix: avoid empty averaging regions, check if all input files are present

File:

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

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

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! bugfix: Avoid empty averaging regions for small PALM domains
+! change: moved get_input_file_list() to io module
+! 
+! 
+! 3618 2018-12-10 13:25:22Z eckhard
 ! Prefixed all INIFOR modules with inifor_, removed unused variables
 ! 
@@ -112 +117 @@
         ONLY:  get_netcdf_attribute, get_netcdf_dim_vector,                    &
                get_netcdf_variable, parse_command_line_arguments,              &
-               validate_config
+               get_input_file_list, validate_config
     USE inifor_transform,                                                      &
         ONLY:  average_2d, rotate_to_cosmo, find_horizontal_neighbours,&
@@ -1625 +1630 @@
        dlat = cosmo_lat(1) - cosmo_lat(0)
 
-       imin = CEILING( (avg_grid % lon(1) - cosmo_lon(0)) / dlon )
-       imax = FLOOR  ( (avg_grid % lon(2) - cosmo_lon(0)) / dlon )
-
-       jmin = CEILING( (avg_grid % lat(1) - cosmo_lat(0)) / dlat )
-       jmax = FLOOR  ( (avg_grid % lat(2) - cosmo_lat(0)) / dlat )
+       imin = FLOOR  ( (avg_grid % lon(1) - cosmo_lon(0)) / dlon )
+       imax = CEILING( (avg_grid % lon(2) - cosmo_lon(0)) / dlon )
+
+       jmin = FLOOR  ( (avg_grid % lat(1) - cosmo_lat(0)) / dlat )
+       jmax = CEILING( (avg_grid % lat(2) - cosmo_lat(0)) / dlat )
        
        message = "Averaging '" // TRIM(avg_grid % kind) // "' over "//         &
@@ -3641 +3646 @@
 
 
-    SUBROUTINE get_input_file_list(start_date_string, start_hour, end_hour,        &
-                                   step_hour, path, prefix, suffix, file_list)
-
-       CHARACTER (LEN=DATE), INTENT(IN) ::  start_date_string
-       CHARACTER (LEN=*),    INTENT(IN) ::  prefix, suffix, path
-       INTEGER,              INTENT(IN) ::  start_hour, end_hour, step_hour
-       CHARACTER(LEN=*), ALLOCATABLE, INTENT(INOUT) ::  file_list(:)
-
-       INTEGER             ::  number_of_intervals, hour, i
-       CHARACTER(LEN=DATE) ::  date_string
-
-       number_of_intervals = CEILING( REAL(end_hour - start_hour) / step_hour )
-       ALLOCATE( file_list(number_of_intervals + 1) )
-
-       DO i = 0, number_of_intervals
-          hour = start_hour + i * step_hour
-          date_string = add_hours_to(start_date_string, hour)
-
-          file_list(i+1) = TRIM(path) // TRIM(prefix) // TRIM(date_string) //    &
-                           TRIM(suffix) // '.nc'
-          message = "Set up input file name '" // TRIM(file_list(i+1)) //"'"
-          CALL report('input_file_list', message)
-       END DO
-
-    END SUBROUTINE get_input_file_list
-
-
 !------------------------------------------------------------------------------!
 ! Description: