Changeset 4319 for palm

Timestamp:

Dec 3, 2019 6:14:41 PM (5 years ago)

Author:

suehring

Message:

Further revise check for surface fractions

File:

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

palm/trunk/SOURCE/netcdf_data_input_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Further revise check for surface fractions
+! 
+! 4313 2019-11-27 14:07:00Z suehring
 ! Checks for surface fractions revised
 ! 
@@ -3714 +3717 @@
                 ENDIF
 !
-!--             Sum of relative fractions must be 1. Note, due to type 
-!--             type conversions due to reading, the sum of surface fractions 
+!--             Sum of relative fractions must be 1. Note, attributed to type 
+!--             conversions due to reading, the sum of surface fractions 
 !--             might be not exactly 1. Hence, the sum is check with a
 !--             tolerance. Later, in the land-surface model, the relative 
-!--             fractions are normalized to one.
-                IF ( ANY( surface_fraction_f%frac(:,j,i) /=                    &
-                          surface_fraction_f%fill ) )  THEN
+!--             fractions are normalized to one. Actually, surface fractions
+!--             shall be _FillValue at building grid points, however, in order
+!--             to relax this requirement and allow that surface-fraction can
+!--             also be zero at these grid points, only perform this check
+!--             at locations where some vegetation, pavement or water is defined.
+                IF ( vegetation_type_f%var(j,i) /= vegetation_type_f%fill  .OR.&
+                     pavement_type_f%var(j,i)   /= pavement_type_f%fill    .OR.&
+                     water_type_f%var(j,i)      /= water_type_f%fill )  THEN
                    IF ( SUM ( surface_fraction_f%frac(0:2,j,i) ) >             &
                         1.0_wp + 1E-8_wp  .OR.                                 &
@@ -3727 +3735 @@
                       WRITE( message_string, * )                               &
                                     'The sum of all land-surface fractions ' //&
-                                    'must equal 1. ', i, j
+                                    'must equal 1. (i, j) = ', i, j
                       CALL message( 'netcdf_data_input_mod', 'PA0566',         &
                                      2, 2, myid, 6, 0 )