Changeset 3182 for palm/trunk/UTIL/inifor/tests/test-input-files.f90

Timestamp:

Jul 27, 2018 1:36:03 PM (6 years ago)

Author:

suehring

Message:

New Inifor features: grid stretching, improved command-interface, support start dates in different formats in both YYYYMMDD and YYYYMMDDHH, Ability to manually control input file prefixes (--radiation-prefix, --soil-preifx, --flow-prefix, --soilmoisture-prefix) for compatiblity with DWD forcast naming scheme; GNU-style short and long option; Prepared output of large-scale forcing profiles (no computation yet); Added preprocessor flag netcdf4 to switch output format between netCDF 3 and 4; Updated netCDF variable names and attributes to comply with PIDS v1.9; Inifor bugfixes: Improved compatibility with older Intel Intel compilers by avoiding implicit array allocation; Added origin_lon/_lat values and correct reference time in dynamic driver global attributes; corresponding PALM changes: adjustments to revised Inifor; variables names in dynamic driver adjusted; enable geostrophic forcing also in offline nested mode; variable names in LES-LES and COSMO offline nesting changed; lateral boundary flags for nesting, in- and outflow conditions renamed

File:

• palm/trunk/UTIL/inifor/tests/test-input-files.f90 (modified) (4 diffs)

palm/trunk/UTIL/inifor/tests/test-input-files.f90

@@ -21 +21 @@
 ! Current revisions:
 ! -----------------
-! 
+! New test for negative start_hour and greater-than-one step_hour
+!
 ! 
 ! Former revisions:
@@ -44 +45 @@
         ONLY :  PATH
     USE grid,                                                                  & 
-        ONLY :  input_file_list
+        ONLY :  get_input_file_list
     USE test_utils
     
     IMPLICIT NONE
 
-    CHARACTER(LEN=50)                              ::  title
+    CHARACTER(LEN=60)                              ::  title
     CHARACTER(LEN=PATH), ALLOCATABLE, DIMENSION(:) ::  file_list, ref_list
     LOGICAL                                        ::  res
-    INTEGER                                        ::  i     
+    INTEGER                                        ::  i
 
     title = "input files - daylight saving to standard time"
@@ -70 +71 @@
 
     ! Act
-    CALL input_file_list(start_date_string='2017102823',                       &
-                         start_hour=0, end_hour=5, step_hour=1,                &
-                         path='./', prefix="laf", suffix='-test',              &
-                         file_list=file_list)
+    CALL get_input_file_list(start_date_string='2017102823',                   &
+                             start_hour=0, end_hour=5, step_hour=1,            &
+                             path='./', prefix="laf", suffix='-test',          &
+                             file_list=file_list)
 
     ! Assert
@@ -95 +96 @@
 
     ! Act
-    CALL input_file_list(start_date_string='2016022823',                       &
-                         start_hour=0, end_hour=1, step_hour=1,                &
-                         path='./', prefix="laf", suffix='-test',              &
-                         file_list=file_list)
+    CALL get_input_file_list(start_date_string='2016022823',                   &
+                             start_hour=0, end_hour=1, step_hour=1,            &
+                             path='./', prefix="laf", suffix='-test',          &
+                             file_list=file_list)
+
+    ! Assert
+    DO i = 1, 2
+       res = res .AND. (TRIM(ref_list(i)) .EQ. TRIM(file_list(i)))
+    END DO
+
+    DEALLOCATE( ref_list, file_list )
+    CALL end_test(title, res)
+
+
+
+    title = "input files - negative start_hour and step_hour > 1 hour"
+    CALL begin_test(title, res)
+
+    ! Arange
+    ! ...a date range that inlcudes a leap day (29. Feb. 2016) which should be
+    ! inlcuded in UTC time stamps.
+    ALLOCATE( ref_list(4) )
+    ref_list(1)  = './laf2017102823-test.nc'
+    ref_list(2)  = './laf2017102901-test.nc'
+    ref_list(3)  = './laf2017102903-test.nc'
+    ref_list(4)  = './laf2017102904-test.nc'
+
+    ! Act
+    CALL get_input_file_list(start_date_string='2017102901',                   &
+                             start_hour=-2, end_hour=3, step_hour=2,           &
+                             path='./', prefix="laf", suffix='-test',          &
+                             file_list=file_list)
+
+    PRINT *, file_list
 
     ! Assert