Changeset 3182 for palm/trunk/UTIL/inifor/tests/util.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/util.f90 (modified) (4 diffs)

palm/trunk/UTIL/inifor/tests/util.f90

@@ -21 +21 @@
 ! Current revisions:
 ! -----------------
+! Expose error measure as parameter in assert_equal()
 ! 
 ! 
@@ -74 +75 @@
     END SUBROUTINE end_test
 
-    LOGICAL FUNCTION assert_equal(a, b, msg)
+    LOGICAL FUNCTION assert_equal(a, b, msg, ratio)
+       REAL, OPTIONAL, INTENT(IN)     ::  ratio
        REAL, DIMENSION(:), INTENT(IN) ::  a, b
-       CHARACTER(LEN=*), INTENT(IN)   :: msg
+       CHARACTER(LEN=*), INTENT(IN)   ::  msg
 
-       assert_equal = assert(a, b, 'eq')
+       IF ( PRESENT(ratio) )  THEN
+           assert_equal = assert(a, b, 'eq', ratio)
+       ELSE
+           assert_equal = assert(a, b, 'eq')
+       END IF
+
        IF (assert_equal .eqv. .TRUE.)  THEN
            PRINT *, "Equality assertion for ", msg, " was successful."
@@ -88 +95 @@
     END FUNCTION assert_equal
 
-    LOGICAL FUNCTION assert(a, b, mode, eps)
+    LOGICAL FUNCTION assert(a, b, mode, ratio)
 
        REAL, DIMENSION(:), INTENT(IN) ::  a, b
-       REAL, OPTIONAL, INTENT(IN)     ::  eps
+       REAL, OPTIONAL, INTENT(IN)     ::  ratio
        CHARACTER(LEN=*), INTENT(IN)   ::  mode
 
@@ -98 +105 @@
 
        max_rel_diff = 10 * EPSILON(1.0)
-       IF (PRESENT(eps)) max_rel_diff = eps
+       IF (PRESENT(ratio)) max_rel_diff = ratio
 
        SELECT CASE( TRIM(mode) )