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

Timestamp:

Jan 30, 2018 2:12:54 PM (6 years ago)

Author:

suehring

Message:

Nesting for chemical species implemented; Bugfix passive scalar boundary condition after anterpolation; Timeseries output of surface temperature; Enable initialization of 3D topography (was commented out so far)

File:

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

palm/trunk/SOURCE/netcdf_data_input_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! - Enable initialization with 3D topography.
+! - Move check for correct initialization in nesting mode to check_parameters.
+! 
+! 2772 2018-01-29 13:10:35Z suehring
 ! Initialization of simulation independent on land-surface model.
 ! 
@@ -1699 +1703 @@
 !--             If available, also read 3D building information. If both are
 !--             available, use 3D information.
-!                 IF ( check_existence( var_names, 'buildings_3D' ) )  THEN
-!                    buildings_f%from_file = .TRUE. 
-!                    CALL get_attribute( id_topo, char_lod, buildings_f%lod,     &
-!                                        .FALSE., 'buildings_3D' )     
-! 
-!                    CALL get_attribute( id_topo, char_fill,                     &
-!                                        buildings_f%fill2,                      &
-!                                        .FALSE., 'buildings_3D' )
-! 
-!                    CALL get_dimension_length( id_topo, buildings_f%nz, 'z' )
-!  
-!                    IF ( buildings_f%lod == 2 )  THEN
-!                       ALLOCATE( buildings_f%var_3d(nzb:buildings_f%nz,         &
-!                                                    nys:nyn,nxl:nxr) )
-!                       buildings_f%var_3d = 0
-! !
-! !--                   Read data PE-wise. Read yz-slices.
-!                       DO  i = nxl, nxr
-!                          DO  j = nys, nyn
-!                             CALL get_variable( id_topo, 'buildings_3D',        &
-!                                                i, j,                           &
-!                                                buildings_f%var_3d(:,j,i) )
-!                          ENDDO
-!                       ENDDO
-!                    ELSE 
-!                       message_string = 'NetCDF attribute lod ' //              &
-!                                        '(level of detail) is not set properly.'
-!                       CALL message( 'netcdf_data_input_mod', 'PA0999',         &
-!                                      1, 2, 0, 6, 0 )
-!                    ENDIF
-!                 ENDIF
+                IF ( check_existence( var_names, 'buildings_3D' ) )  THEN
+                   buildings_f%from_file = .TRUE. 
+                   CALL get_attribute( id_topo, char_lod, buildings_f%lod,     &
+                                       .FALSE., 'buildings_3D' )     
+
+                   CALL get_attribute( id_topo, char_fill,                     &
+                                       buildings_f%fill2,                      &
+                                       .FALSE., 'buildings_3D' )
+
+                   CALL get_dimension_length( id_topo, buildings_f%nz, 'z' )
+ 
+                   IF ( buildings_f%lod == 2 )  THEN
+                      ALLOCATE( buildings_f%var_3d(nzb:buildings_f%nz,         &
+                                                   nys:nyn,nxl:nxr) )
+                      buildings_f%var_3d = 0
+!
+!--                   Read data PE-wise. Read yz-slices.
+                      DO  i = nxl, nxr
+                         DO  j = nys, nyn
+                            CALL get_variable( id_topo, 'buildings_3D',        &
+                                               i, j,                           &
+                                               buildings_f%var_3d(:,j,i) )
+                         ENDDO
+                      ENDDO
+                   ELSE 
+                      message_string = 'NetCDF attribute lod ' //              &
+                                       '(level of detail) is not set properly.'
+                      CALL message( 'netcdf_data_input_mod', 'PA0999',         &
+                                     1, 2, 0, 6, 0 )
+                   ENDIF
+                ENDIF
 !
 !--             Read building IDs and its FillValue attribute. Further required 
@@ -2691 +2695 @@
            ONLY:  initializing_actions, forcing, message_string
 
-       USE pmc_interface,                                                      &
-           ONLY:  nested_run
-
        IMPLICIT NONE
-
-       LOGICAL      ::  check_nest !< flag indicating if a check passed 
 
 !
@@ -2714 +2713 @@
                            TRIM( coupling_char )
           CALL message( 'netcdf_data_input_mod', 'PA0430', 1, 2, 0, 6, 0 )
-       ENDIF
-!
-!--    In case of nested run assure that all domains are initialized the same
-!--    way, i.e. if at least at one domain is initialized with soil and 
-!--    atmospheric data provided by COSMO, all domains must be initialized the 
-!--    same way, to assure that soil and atmospheric quantities are 
-!--    consistent. 
-       IF ( nested_run )  THEN
-          check_nest = .TRUE.
-#if defined( __parallel )
-          CALL MPI_ALLREDUCE( TRIM( initializing_actions ) == 'inifor',        &
-                              check_nest, 1, MPI_LOGICAL,                      &
-                              MPI_LAND, MPI_COMM_WORLD, ierr )
-
-          IF ( TRIM( initializing_actions ) == 'inifor'  .AND.                 &
-               .NOT.  check_nest )  THEN
-             message_string = 'In case of nesting, if at least in one ' //     &
-                              'domain initializing_actions = inifor, '  //     &
-                              'all domains need to be initialized that way.'
-             CALL message( 'netcdf_data_input_mod', 'PA0430', 3, 2, 0, 6, 0 )
-          ENDIF
-#endif
        ENDIF