Changeset 4877 for palm/trunk

Timestamp:

Feb 17, 2021 4:17:35 PM (4 years ago)

Author:

suehring

Message:

Bugfix in initialization of vertical surfaces with roughness and surface heat fluxes

Location:

palm/trunk/SOURCE

Files:

• Makefile (modified) (2 diffs)
• init_3d_model.f90 (modified) (7 diffs)
• netcdf_data_input_mod.f90 (modified) (4 diffs)
• surface_mod.f90 (modified) (2 diffs)

palm/trunk/SOURCE/Makefile

@@ -25 +25 @@
 # -----------------
 # $Id$
+# add dependency for init_3d_model
+#
+# 4828 2021-01-05 11:21:41Z Giersch
 # Add depedency for indoor model
 #
@@ -720 +723 @@
         cpulog_mod.o \
         disturb_heatflux.o \
+        exchange_horiz_mod.o \
         large_scale_forcing_nudging_mod.o \
         model_1d_mod.o \

palm/trunk/SOURCE/init_3d_model.f90

@@ -24 +24 @@
 ! -----------------
 ! $Id$
+! Bugfix in initialization of vertical surfaces with roughness and surface heat fluxes
+!
+! 4848 2021-01-21 15:51:51Z gronemeier
 ! replaced use_syn_turb_gen by syn_turb_gen
 !
@@ -166 +169 @@
 
     USE control_parameters
+
+    USE exchange_horiz_mod,                                                                        &
+        ONLY:  exchange_horiz_2d
 
     USE grid_variables,                                                                            &
@@ -207 +213 @@
                pids_id,                                                                            &
                real_2d,                                                                            &
+               resize_array,                                                                       &
                vars_pids
 
@@ -1508 +1515 @@
 !--       Read variable
           CALL get_variable( pids_id, 'z0', tmp_2d%var, nxl, nxr, nys, nyn )
+          CALL resize_array( tmp_2d%var, nys, nyn, nxl, nxr )
+          CALL exchange_horiz_2d( tmp_2d%var )
 !
 !--       Initialize roughness length. Note, z0 will be only initialized at default-type surfaces.
@@ -1534 +1543 @@
 !--       Read variable
           CALL get_variable( pids_id, 'shf', tmp_2d%var, nxl, nxr, nys, nyn )
+          CALL resize_array( tmp_2d%var, nys, nyn, nxl, nxr )
+          CALL exchange_horiz_2d( tmp_2d%var )
 !
 !--       Initialize heat flux. Note, shf will be only initialized at default-type surfaces. At
@@ -1561 +1572 @@
 !--          Read variable
              CALL get_variable( pids_id, 'qsws', tmp_2d%var, nxl, nxr, nys, nyn )
+             CALL resize_array( tmp_2d%var, nys, nyn, nxl, nxr )
+             CALL exchange_horiz_2d( tmp_2d%var )
 !
 !--          Initialize latent heat flux. Note, qsws will be only initialized at default-type surfaces.
@@ -1590 +1603 @@
 !--          Read variable
              CALL get_variable( pids_id, 'ssws', tmp_2d%var, nxl, nxr, nys, nyn )
+             CALL resize_array( tmp_2d%var, nys, nyn, nxl, nxr )
+             CALL exchange_horiz_2d( tmp_2d%var )
 !
 !--          Initialize passive scalar flux. Initialize horizontal surface elements.

palm/trunk/SOURCE/netcdf_data_input_mod.f90

@@ -24 +24 @@
 ! -----------------
 ! $Id$
+! Add interface for resize_array and add subroutine to resize 2d-real arrays
+!
+! 4828 2021-01-05 11:21:41Z Giersch
 ! Check if netCDF file actually exists before opening it for reading.
 !
@@ -787 +790 @@
     END INTERFACE get_attribute
 
+    INTERFACE resize_array
+       MODULE PROCEDURE resize_array_2d_int8
+       MODULE PROCEDURE resize_array_2d_int32
+       MODULE PROCEDURE resize_array_2d_real
+       MODULE PROCEDURE resize_array_3d_int8
+       MODULE PROCEDURE resize_array_3d_real
+       MODULE PROCEDURE resize_array_4d_real
+    END INTERFACE resize_array
+
 !
 !-- Public data structures
@@ -867 +879 @@
            netcdf_data_input_surface_data,                                                         &
            netcdf_data_input_topo,                                                                 &
-           open_read_file
+           open_read_file,                                                                         &
+           resize_array
 
 
@@ -3427 +3440 @@
 
  END SUBROUTINE resize_array_2d_int32
+
+!--------------------------------------------------------------------------------------------------!
+! Description:
+! ------------
+!> Resize 2D float array: (nys:nyn,nxl:nxr) -> (nysg:nyng,nxlg:nxrg)
+!--------------------------------------------------------------------------------------------------!
+ SUBROUTINE resize_array_2d_real( var, js, je, is, ie )
+
+    IMPLICIT NONE
+
+    INTEGER(iwp) ::  ie  !< upper index bound along x direction
+    INTEGER(iwp) ::  is  !< lower index bound along x direction
+    INTEGER(iwp) ::  je  !< upper index bound along y direction
+    INTEGER(iwp) ::  js  !< lower index bound along y direction
+
+    REAL(wp), DIMENSION(:,:), ALLOCATABLE ::  var     !< treated variable
+    REAL(wp), DIMENSION(:,:), ALLOCATABLE ::  var_tmp !< temporary copy
+!
+!-- Allocate temporary variable
+    ALLOCATE( var_tmp(js-nbgp:je+nbgp,is-nbgp:ie+nbgp) )
+!
+!-- Temporary copy of the variable
+    var_tmp(js:je,is:ie) = var(js:je,is:ie)
+!
+!-- Resize the array
+    DEALLOCATE( var )
+    ALLOCATE( var(js-nbgp:je+nbgp,is-nbgp:ie+nbgp) )
+!
+!-- Transfer temporary copy back to original array
+    var(js:je,is:ie) = var_tmp(js:je,is:ie)
+
+ END SUBROUTINE resize_array_2d_real
 
 

palm/trunk/SOURCE/surface_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! bugfix in init_single_surface_properties for vertical surfaces
+!
+! 4850 2021-01-21 17:59:25Z suehring
 ! +t_prev
 !
@@ -3106 +3109 @@
 
     REAL(wp), DIMENSION(1:ns) ::  var_surf  !< 1D surface variable that should be initialized
-    REAL(wp), DIMENSION(nys:nyn,nxl:nxr) ::  var_2d  !< input variable
+    REAL(wp), DIMENSION(nysg:nyng,nxlg:nxrg) ::  var_2d  !< input variable
 
     DO  m = 1, ns