Changeset 2302
- Timestamp:
- Jul 3, 2017 2:07:20 PM (7 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/init_grid.f90
r2274 r2302 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Bugfixes in reading 3D topography from file 28 ! 29 ! 2274 2017-06-09 13:27:48Z Giersch 27 30 ! Changed error messages 28 31 ! … … 338 341 REAL(wp), DIMENSION(:,:), ALLOCATABLE :: topo_height !< input variable for topography height 339 342 343 INTEGER( KIND=1 ), DIMENSION(:,:,:), ALLOCATABLE :: topo_3d_read !< input variable for 3D topography 344 340 345 ! 341 346 !-- Calculation of horizontal array bounds including ghost layers … … 903 908 ELSEIF ( lod == 2 ) THEN 904 909 ! 910 !-- Allocate 1-byte integer dummy array to read 3D topography 911 ALLOCATE( topo_3d_read(nzb:nzt+1,nysg:nyng,nxlg:nxrg) ) 912 ! 905 913 !-- Read data PE-wise. Read yz-slices. 906 914 DO i = nxl, nxr 907 915 DO j = nys, nyn 908 916 CALL netcdf_get_variable( id_topo, 'buildings_0', & 909 i, j, topo_3d (:,j,i), 20 ) !Error number still need to be set properly917 i, j, topo_3d_read(:,j,i), 20 ) !Error number still need to be set properly 910 918 ENDDO 911 919 ENDDO … … 915 923 CALL message( 'init_grid', 'PA0457', 1, 2, 0, 6, 0 ) 916 924 ENDIF 925 ! 926 !-- On file, 3D topography grid points is classified with 1, 927 !-- atmosphere is classified with 0, contrary to the internal 928 !-- treatment. Hence, conversion is required. Moreover, set 929 !-- topography array to zero at lowest grid level. 930 topo_3d = MERGE( 0, 1, topo_3d_read == 1 ) 931 topo_3d(nzb,:,:) = 0 932 ! 933 !-- Deallocate dummy array 934 DEALLOCATE( topo_3d_read ) 917 935 ! 918 936 !-- Close topography input file -
palm/trunk/SOURCE/netcdf_interface_mod.f90
r2292 r2302 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Reading of 3D topography using NetCDF data type NC_BYTE 28 ! 29 ! 2292 2017-06-20 09:51:42Z schwenkel 27 30 ! Implementation of new microphysic scheme: cloud_scheme = 'morrison' 28 31 ! includes two more prognostic equations for cloud drop concentration (nc) … … 5598 5601 INTEGER(iwp) :: nz_file !< number of grid-points in file 5599 5602 5600 INTEGER( iwp), DIMENSION(nzb:nzt+1), INTENT(INOUT) :: var !< variable to be read5603 INTEGER( KIND = 1 ), DIMENSION(nzb:nzt+1), INTENT(INOUT) :: var !< variable to be read 5601 5604 ! 5602 5605 !-- Get dimension of z-axis
Note: See TracChangeset
for help on using the changeset viewer.