Changeset 2302 for palm/trunk

Timestamp:

Jul 3, 2017 2:07:20 PM (7 years ago)

Author:

suehring

Message:

Reading of 3D topography using NetCDF data type NC_BYTE; bugfixes in reading 3D topography from file

Location:

palm/trunk/SOURCE

Files:

• init_grid.f90 (modified) (4 diffs)
• netcdf_interface_mod.f90 (modified) (2 diffs)

palm/trunk/SOURCE/init_grid.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfixes in reading 3D topography from file
+! 
+! 2274 2017-06-09 13:27:48Z Giersch
 ! Changed error messages
 ! 
@@ -338 +341 @@
     REAL(wp), DIMENSION(:,:), ALLOCATABLE ::  topo_height   !< input variable for topography height
 
+    INTEGER( KIND=1 ), DIMENSION(:,:,:), ALLOCATABLE ::  topo_3d_read !< input variable for 3D topography
+
 !
 !-- Calculation of horizontal array bounds including ghost layers
@@ -903 +908 @@
                    ELSEIF ( lod == 2 )  THEN
 !
+!--                   Allocate 1-byte integer dummy array to read 3D topography
+                      ALLOCATE( topo_3d_read(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
+!
 !--                   Read data PE-wise. Read yz-slices.
                       DO  i = nxl, nxr
                          DO  j = nys, nyn
                             CALL netcdf_get_variable( id_topo, 'buildings_0',  &
-                                                      i, j, topo_3d(:,j,i), 20 )  !Error number still need to be set properly 
+                                                      i, j, topo_3d_read(:,j,i), 20 )  !Error number still need to be set properly 
                          ENDDO
                       ENDDO
@@ -915 +923 @@
                       CALL message( 'init_grid', 'PA0457', 1, 2, 0, 6, 0 )
                    ENDIF
+!
+!--                On file, 3D topography grid points is classified with 1, 
+!--                atmosphere is classified with 0, contrary to the internal 
+!--                treatment. Hence, conversion is required. Moreover, set 
+!--                topography array to zero at lowest grid level. 
+                   topo_3d = MERGE( 0, 1, topo_3d_read == 1 )
+                   topo_3d(nzb,:,:) = 0 
+!
+!--                Deallocate dummy array
+                   DEALLOCATE( topo_3d_read )
 !
 !--                Close topography input file

palm/trunk/SOURCE/netcdf_interface_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Reading of 3D topography using NetCDF data type NC_BYTE
+! 
+! 2292 2017-06-20 09:51:42Z schwenkel
 ! Implementation of new microphysic scheme: cloud_scheme = 'morrison' 
 ! includes two more prognostic equations for cloud drop concentration (nc)  
@@ -5598 +5601 @@
     INTEGER(iwp)                  ::  nz_file         !< number of grid-points in file
 
-    INTEGER(iwp), DIMENSION(nzb:nzt+1), INTENT(INOUT) ::  var  !< variable to be read
+    INTEGER( KIND = 1 ), DIMENSION(nzb:nzt+1), INTENT(INOUT) ::  var  !< variable to be read
 !
 !-- Get dimension of z-axis