Changeset 3257 for palm/trunk

Timestamp:

Sep 17, 2018 5:11:46 PM (6 years ago)

Author:

suehring

Message:

Further adjustment of checks for building_type and building_id (required as type and id can be modified by the topography filtering)

File:

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

palm/trunk/SOURCE/netcdf_data_input_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Adjust checks for building_type and building_id, which is necessary after 
+! topography filtering (building_type and id can be modified by the filtering).
+! 
+! 3254 2018-09-17 10:53:57Z suehring
 ! Additional check for surface_fractions and and checks for building_id and 
 ! building_type extended.
@@ -3410 +3414 @@
                 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  .OR. &
-                        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 )  THEN
                       WRITE( message_string, * ) 'Each location where a ' //   &
                                          'building is set requires a type ' // &
@@ -3424 +3426 @@
                 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  .OR. &
-                        .NOT. 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 )  THEN
                       WRITE( message_string, * ) 'Each location where a ' //   &
                                          'building is set requires a type ' // &
@@ -3443 +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  .OR.    &
-                        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 )  THEN
                       WRITE( message_string, * ) 'Each location where a ' //   &
                                          'building is set requires an ID ' //  &
@@ -3454 +3452 @@
                 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  .OR.     &
-                        .NOT. 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 )  THEN
                       WRITE( message_string, * ) 'Each location where a ' //   &
                                          'building is set requires an ID ' //  &