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

Timestamp:

Mar 11, 2020 2:20:43 PM (4 years ago)

Author:

raasch

Message:

ghost point exchange modularized, bugfix for wrong 2d-exchange

File:

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

palm/trunk/SOURCE/netcdf_data_input_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! use statement for exchange horiz added,
+! bugfixes for calls of exchange horiz 2d
+! 
+! 4435 2020-03-03 10:38:41Z raasch
 ! temporary bugfix to avoid compile problems with older NetCDFD libraries on IMUK machines
 ! 
@@ -1532 +1536 @@
            ONLY:  land_surface, urban_surface
 
+       USE exchange_horiz_mod,                                                 &
+           ONLY:  exchange_horiz_2d, exchange_horiz_2d_byte, exchange_horiz_2d_int
+
        USE indices,                                                            &
            ONLY:  nbgp, nxl, nxr, nyn, nys
@@ -2053 +2060 @@
                                      nys, nyn, nxl, nxr )
           DO  k = 0, nz_soil
-             CALL exchange_horiz_2d_int(                                       &  
+             CALL exchange_horiz_2d_byte(                                       &
                         soil_type_f%var_3d(k,:,:), nys, nyn, nxl, nxr, nbgp )
           ENDDO
@@ -2063 +2070 @@
                                      nys, nyn, nxl, nxr )
           DO  k = 0, surface_fraction_f%nf-1
-             CALL exchange_horiz_2d( surface_fraction_f%frac(k,:,:), nbgp )
+             CALL exchange_horiz_2d( surface_fraction_f%frac(k,:,:) )
           ENDDO
        ENDIF
@@ -2072 +2079 @@
                                      nys, nyn, nxl, nxr )
           DO  k = 0, building_pars_f%np-1
-             CALL exchange_horiz_2d( building_pars_f%pars_xy(k,:,:), nbgp )
+             CALL exchange_horiz_2d( building_pars_f%pars_xy(k,:,:) )
           ENDDO
        ENDIF
@@ -2081 +2088 @@
                                      nys, nyn, nxl, nxr )
           DO  k = 0, albedo_pars_f%np-1
-             CALL exchange_horiz_2d( albedo_pars_f%pars_xy(k,:,:), nbgp )
+             CALL exchange_horiz_2d( albedo_pars_f%pars_xy(k,:,:) )
           ENDDO
        ENDIF
@@ -2090 +2097 @@
                                      nys, nyn, nxl, nxr )
           DO  k = 0, pavement_pars_f%np-1
-             CALL exchange_horiz_2d( pavement_pars_f%pars_xy(k,:,:), nbgp )
+             CALL exchange_horiz_2d( pavement_pars_f%pars_xy(k,:,:) )
           ENDDO
        ENDIF
@@ -2099 +2106 @@
                                      nys, nyn, nxl, nxr )
           DO  k = 0, vegetation_pars_f%np-1
-             CALL exchange_horiz_2d( vegetation_pars_f%pars_xy(k,:,:), nbgp )
+             CALL exchange_horiz_2d( vegetation_pars_f%pars_xy(k,:,:) )
           ENDDO
        ENDIF
@@ -2108 +2115 @@
                                      nys, nyn, nxl, nxr )
           DO  k = 0, water_pars_f%np-1
-             CALL exchange_horiz_2d( water_pars_f%pars_xy(k,:,:), nbgp )
+             CALL exchange_horiz_2d( water_pars_f%pars_xy(k,:,:) )
           ENDDO
        ENDIF
@@ -2117 +2124 @@
                                      nys, nyn, nxl, nxr )
           DO  k = 0, root_area_density_lsm_f%nz-1
-             CALL exchange_horiz_2d( root_area_density_lsm_f%var(k,:,:), nbgp )
+             CALL exchange_horiz_2d( root_area_density_lsm_f%var(k,:,:) )
           ENDDO
        ENDIF
@@ -2128 +2135 @@
                                         nys, nyn, nxl, nxr )
              DO  k = 0, soil_pars_f%np-1
-                CALL exchange_horiz_2d( soil_pars_f%pars_xy(k,:,:), nbgp )
+                CALL exchange_horiz_2d( soil_pars_f%pars_xy(k,:,:) )
              ENDDO
              
@@ -2139 +2146 @@
              DO  k2 = 0, soil_pars_f%nz-1
                 DO  k = 0, soil_pars_f%np-1
-                   CALL exchange_horiz_2d( soil_pars_f%pars_xyz(k,k2,:,:),     &
-                                           nbgp )
+                   CALL exchange_horiz_2d( soil_pars_f%pars_xyz(k,k2,:,:) )
                 ENDDO
              ENDDO
@@ -2155 +2161 @@
              DO  k = 0, pavement_subsurface_pars_f%np-1
                 CALL exchange_horiz_2d(                                        &
-                           pavement_subsurface_pars_f%pars_xyz(k,k2,:,:), nbgp )
+                           pavement_subsurface_pars_f%pars_xyz(k,k2,:,:) )
              ENDDO
           ENDDO
@@ -2287 +2293 @@
        USE control_parameters,                                                 &
            ONLY:  message_string, topography
+
+       USE exchange_horiz_mod,                                                 &
+           ONLY:  exchange_horiz_2d_byte, exchange_horiz_2d_int
 
        USE grid_variables,                                                     &