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

Timestamp:

Jul 27, 2018 1:36:03 PM (7 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-interpolation.f90 (modified) (6 diffs)

palm/trunk/UTIL/inifor/tests/test-interpolation.f90

@@ -21 +21 @@
 ! Current revisions:
 ! -----------------
-! 
+! Updated test for new grid_definition
+!
 ! 
 ! Former revisions:
@@ -76 +77 @@
                               xmin = -5.0 * TO_RADIANS, xmax = 5.5 * TO_RADIANS, &
                               ymin = -5.0 * TO_RADIANS, ymax = 6.5 * TO_RADIANS, &
-                              zmin =  0.0, zmax = 10.0,                        &
                               x0 = 0.0, y0 = 0.0, z0 = 0.0,                    &
                               nx = nlon-1, ny = nlat-1, nz = nlev-1)
@@ -86 +86 @@
     res = assert_equal( (/cosmo_grid%lat(0), cosmo_grid % lon(0),              &
                           cosmo_grid%lat(2), cosmo_grid % lon(2),              &
-                          cosmo_grid%dx*TO_DEGREES, cosmo_grid%dy*TO_DEGREES/),&
+                          (cosmo_grid%lon(1) - cosmo_grid%lon(0))*TO_DEGREES,  &
+                          (cosmo_grid%lat(1) - cosmo_grid%lat(0))*TO_DEGREES/),&
                         (/-5.0 * TO_RADIANS, -5.0 * TO_RADIANS,                &
                            6.5 * TO_RADIANS,  5.5 * TO_RADIANS,                &
@@ -97 +98 @@
                               xmin = 0.0, xmax = 1.0,                          &
                               ymin = 0.0, ymax = 1.0,                          &
-                              zmin = 0.0, zmax = 1.0,                          &
                               x0 = 0.0, y0 = 0.0, z0 = 0.0,                    &
                               nx = 1, ny = 1, nz = 1)
@@ -127 +127 @@
     ! Act
     CALL find_horizontal_neighbours(cosmo_grid % lat, cosmo_grid % lon,        &
-       cosmo_grid % dxi, cosmo_grid % dyi, palm_grid % clat, palm_grid % clon, &
-       palm_grid % ii, palm_grid % jj)
+                                    palm_grid % clat, palm_grid % clon,        &
+                                    palm_grid % ii, palm_grid % jj)
 
     ! Assert
@@ -178 +178 @@
     ! Act
     CALL find_horizontal_neighbours(cosmo_grid % lat, cosmo_grid % lon,        &
-       cosmo_grid % dxi, cosmo_grid % dyi, palm_grid % clat, palm_grid % clon, &
-       palm_grid % ii, palm_grid % jj)
+                                    palm_grid % clat, palm_grid % clon,        &
+                                    palm_grid % ii, palm_grid % jj)
 
     CALL compute_horizontal_interp_weights(cosmo_grid % lat, cosmo_grid % lon, &
-       cosmo_grid % dxi, cosmo_grid % dyi, palm_grid % clat,                   &
-       palm_grid % clon, palm_grid % ii, palm_grid % jj, palm_grid % w_horiz)
+                                           palm_grid % clat, palm_grid % clon, &
+                                           palm_grid % ii, palm_grid % jj,     &
+                                           palm_grid % w_horiz)
 
     ! Assert