Changeset 3254 for palm/trunk/SOURCE/netcdf_data_input_mod.f90

Timestamp:

Sep 17, 2018 10:53:57 AM (6 years ago)

Author:

suehring

Message:

Additional checks for surface_fractions and building_id; Remove redundant subroutine argument in surface_mod

File:

• palm/trunk/SOURCE/netcdf_data_input_mod.f90 (modified) (9 diffs)

palm/trunk/SOURCE/netcdf_data_input_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Additional check for surface_fractions and and checks for building_id and 
+! building_type extended.
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -37 +41 @@
 ! 
 ! 3209 2018-08-27 16:58:37Z suehring
-! Read zsoil dimension lenght only if soil variables are provided
+! Read zsoil dimension length only if soil variables are provided
 ! 
 ! 3183 2018-07-27 14:25:55Z suehring
@@ -3040 +3044 @@
        ENDIF
 !
+!--    Check for correct dimension of surface_fractions, should run from 0-2.
+       IF ( surface_fraction_f%from_file )  THEN
+          IF ( surface_fraction_f%nf-1 > 2 )  THEN
+             message_string = 'nsurface_fraction must not be larger than 3.' 
+             CALL message( 'netcdf_data_input_mod', 'PA0580', 1, 2, 0, 6, 0 )
+          ENDIF
+       ENDIF
+!
 !--    Check orography for fill-values. For the moment, give an error message.
 !--    More advanced methods, e.g. a nearest neighbor algorithm as used in GIS
@@ -3398 +3410 @@
                 IF ( buildings_f%lod == 1 )  THEN
                    IF ( buildings_f%var_2d(j,i)  /= buildings_f%fill1  .AND.   &
-                        building_type_f%var(j,i) == building_type_f%fill )  THEN
-
+                        building_type_f%var(j,i) == building_type_f%fill  .OR. &
+                        buildings_f%var_2d(j,i)  == buildings_f%fill1  .AND.   &
+                        building_type_f%var(j,i) /= building_type_f%fill )  THEN
                       WRITE( message_string, * ) 'Each location where a ' //   &
                                          'building is set requires a type ' // &
@@ -3411 +3424 @@
                 IF ( buildings_f%lod == 2 )  THEN
                    IF ( ANY( buildings_f%var_3d(:,j,i) == 1 )  .AND.           &
-                        building_type_f%var(j,i) == building_type_f%fill )  THEN
+                        building_type_f%var(j,i) == building_type_f%fill  .OR. &
+                        .NOT. ANY( buildings_f%var_3d(:,j,i) == 1 )  .AND.     &
+                        building_type_f%var(j,i) /= building_type_f%fill)  THEN
                       WRITE( message_string, * ) 'Each location where a ' //   &
                                          'building is set requires a type ' // &
@@ -3428 +3443 @@
                 IF ( buildings_f%lod == 1 )  THEN
                    IF ( buildings_f%var_2d(j,i) /= buildings_f%fill1  .AND.    &
-                        building_id_f%var(j,i)  == building_id_f%fill )  THEN
+                        building_id_f%var(j,i)  == building_id_f%fill  .OR.    &
+                        buildings_f%var_2d(j,i) == buildings_f%fill1  .AND.    &
+                        building_id_f%var(j,i)  /= building_id_f%fill )  THEN
                       WRITE( message_string, * ) 'Each location where a ' //   &
                                          'building is set requires an ID ' //  &
@@ -3437 +3454 @@
                 ELSEIF ( buildings_f%lod == 2 )  THEN
                    IF ( ANY( buildings_f%var_3d(:,j,i) == 1 )  .AND.           &
-                        building_id_f%var(j,i) == building_id_f%fill )  THEN
+                        building_id_f%var(j,i) == building_id_f%fill  .OR.     &
+                        .NOT. ANY( buildings_f%var_3d(:,j,i) == 1 )  .AND.     &
+                        building_id_f%var(j,i) /= building_id_f%fill )  THEN
                       WRITE( message_string, * ) 'Each location where a ' //   &
                                          'building is set requires an ID ' //  &
@@ -3447 +3466 @@
              ENDIF
 !
-!--          Check if at each location where a building ID or a -type is set
-!--          also a bulding is defined.
+!--          Check if building ID is set where a bulding is defined.
              IF ( buildings_f%from_file )  THEN
                 IF ( buildings_f%lod == 1 )  THEN
-                   IF ( buildings_f%var_2d(j,i)  /= buildings_f%fill1  .AND.   &
-                        building_id_f%var(j,i) == building_id_f%fill )  THEN
+                   IF ( buildings_f%var_2d(j,i) /= buildings_f%fill1  .AND.   &
+                        building_id_f%var(j,i)  == building_id_f%fill )  THEN
                       WRITE( message_string, * ) 'Each building grid point '// &
                                                  'requires an ID.', i, j
@@ -3459 +3477 @@
                    ENDIF
                 ELSEIF ( buildings_f%lod == 2 )  THEN
-                   IF ( ANY( buildings_f%var_3d(:,j,i) == 1 )                  &
-                  .AND. building_id_f%var(j,i) == building_id_f%fill )  THEN
+                   IF ( ANY( buildings_f%var_3d(:,j,i) == 1 )  .AND.           &
+                        building_id_f%var(j,i) == building_id_f%fill )  THEN
                       WRITE( message_string, * ) 'Each building grid point '// &
                                                  'requires an ID.', i, j