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

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

@@ -21 +21 @@
 ! Current revisions:
 ! -----------------
+! Updated test for new PALM grid strechting
 ! 
 ! 
@@ -41 +42 @@
  PROGRAM test_grid
 
-    USE grid, ONLY :  grid_definition, init_grid_definition
+    USE grid, ONLY :  grid_definition, init_grid_definition, dx, dy, dz
     USE test_utils
     
@@ -49 +50 @@
     LOGICAL                     ::  res
 
-    TYPE(grid_definition) ::  mygrid
-    INTEGER               ::  i
-    INTEGER, PARAMETER    ::  nx = 9,   ny = 19,   nz = 29
-    REAL, PARAMETER       ::  lx = 100., ly = 200., lz = 300.
-    REAL, DIMENSION(0:nx) ::  x, xu
-    REAL, DIMENSION(0:ny) ::  y, yv
-    REAL, DIMENSION(0:nz) ::  z, zw
+    TYPE(grid_definition)   ::  mygrid
+    INTEGER                 ::  i
+    INTEGER, PARAMETER      ::  nx = 9,   ny = 19,   nz = 29
+    REAL, PARAMETER         ::  lx = 100., ly = 200., lz = 300.
+    REAL, DIMENSION(0:nx)   ::  x, xu
+    REAL, DIMENSION(0:ny)   ::  y, yv
+    REAL, DIMENSION(1:nz)   ::  z
+    REAL, DIMENSION(1:nz-1) ::  zw
 
     CALL begin_test(title, res)
 
     ! Arange
+    dx = lx / (nx + 1)
+    DO i = 0, nx
+       xu(i) = real(i) / (nx+1) * lx
+       x(i)  = 0.5*dx + xu(i)
+    END DO
+
+    dy = ly / (ny + 1)
+    DO i = 0, ny
+       yv(i) = real(i) / (ny+1) * ly
+       y(i)  = 0.5*dy + yv(i)
+    END DO
+
+    dz(:) = lz / (nz + 1)
+    DO i = 1, nz
+       IF (i < nz)  zw(i) = real(i) / (nz+1) * lz
+       z(i) = 0.5*dz(1) + zw(i)
+    END DO
+
+    ! Act
     CALL init_grid_definition('palm', grid = mygrid,                           &
                               xmin = 0., xmax = lx,                            &
                               ymin = 0., ymax = ly,                            &
-                              zmin = 0., zmax = lz,                            &
                               x0 = 0.0, y0 = 0.0, z0 = 0.0,                    &
-                              nx = nx, ny = ny, nz = nz)
-
-    ! Act
-    DO i = 0, nx
-       xu(i) = real(i) / (nx+1) * lx
-       x(i)  = 0.5*mygrid%dx + xu(i)
-    END DO
-    DO i = 0, ny
-       yv(i) = real(i) / (ny+1) * ly
-       y(i)  = 0.5*mygrid%dy + yv(i)
-    END DO
-    DO i = 0, nz
-       zw(i) = real(i) / (nz+1) * lz
-       z(i)  = 0.5*mygrid%dz + zw(i)
-    END DO
+                              nx = nx, ny = ny, nz = nz,                       &
+                              z = z, zw = zw)
 
     ! Assert coordinates match
@@ -85 +92 @@
     res = res .AND. assert_equal(xu(1:), mygrid%xu, "xu")
     res = res .AND. assert_equal(y,      mygrid%y,  "y" )
-    res = res .AND. assert_equal(yv(1:), mygrid%yv, "yu")
+    res = res .AND. assert_equal(yv(1:), mygrid%yv, "yv")
     res = res .AND. assert_equal(z,      mygrid%z,  "z" )
-    res = res .AND. assert_equal(zw(1:), mygrid%zw, "zu")
+    res = res .AND. assert_equal(zw(1:), mygrid%zw, "zw")
 
     CALL end_test(title, res)