Changeset 3844 for palm/trunk

Timestamp:

Apr 1, 2019 12:34:01 PM (6 years ago)

Author:

suehring

Message:

Bugfix in one of the checks

File:

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

palm/trunk/SOURCE/netcdf_data_input_mod.f90

@@ -21 +21 @@
 ! -----------------
 ! 
+! 
 ! Former revisions:
 ! -----------------
 ! $Id$
+! Bugfix in one of the checks. Typo removed.
+! 
+! 3744 2019-02-15 18:38:58Z suehring
 ! Enable mesoscale offline nesting for chemistry variables as well as 
 ! initialization of chemistry via dynamic input file.
@@ -3892 +3896 @@
                            'soil_type and water_type are '//                   &
                            'required. If urban-surface model is applied, ' //  &
-                           'also building_type ist required'
+                           'also building_type is required'
           CALL message( 'netcdf_data_input_mod', 'PA0554', 1, 2, 0, 6, 0 )
        ENDIF
@@ -4019 +4023 @@
 !--          vegetation_type, pavement_type, building_type, or water_type
 !--          must be set to a non­missing value.
-             IF ( vegetation_type_f%var(j,i) == vegetation_type_f%fill  .AND.  &
-                  pavement_type_f%var(j,i)   == pavement_type_f%fill    .AND.  &
-                  building_type_f%var(j,i)   == building_type_f%fill    .AND.  &
-                  water_type_f%var(j,i)      == water_type_f%fill )  THEN
-                WRITE( message_string, * ) 'At least one of the parameters '// &
-                                 'vegetation_type, pavement_type, '     //     &
+             IF ( land_surface  .AND.  .NOT. urban_surface )  THEN
+                IF ( vegetation_type_f%var(j,i) == vegetation_type_f%fill  .AND.&
+                     pavement_type_f%var(j,i)   == pavement_type_f%fill    .AND.&
+                     water_type_f%var(j,i)      == water_type_f%fill )  THEN
+                   WRITE( message_string, * )                                  &
+                                    'At least one of the parameters '//        &
+                                    'vegetation_type, pavement_type, '     //  &
+                                    'or water_type must be set '//             &
+                                    'to a non-missing value. Grid point: ', j, i
+                   CALL message( 'netcdf_data_input_mod', 'PA0563', 2, 2, myid, 6, 0 )
+                ENDIF
+             ELSEIF ( land_surface  .AND.  urban_surface )  THEN
+                IF ( vegetation_type_f%var(j,i) == vegetation_type_f%fill  .AND.&
+                     pavement_type_f%var(j,i)   == pavement_type_f%fill    .AND.&
+                     building_type_f%var(j,i)   == building_type_f%fill    .AND.&
+                     water_type_f%var(j,i)      == water_type_f%fill )  THEN
+                   WRITE( message_string, * )                                  &
+                                 'At least one of the parameters '//           &
+                                 'vegetation_type, pavement_type, '  //        &
                                  'building_type, or water_type must be set '// &
                                  'to a non-missing value. Grid point: ', j, i
-                CALL message( 'netcdf_data_input_mod', 'PA0563', 2, 2, myid, 6, 0 )
+                   CALL message( 'netcdf_data_input_mod', 'PA0563', 2, 2, myid, 6, 0 )
+                ENDIF
              ENDIF
+                
 !
 !--          Note that a soil_type is required for each location (y,x) where