Changeset 4186 for palm/trunk/SOURCE/init_3d_model.f90

Timestamp:

Aug 23, 2019 4:06:14 PM (5 years ago)

Author:

suehring

Message:

Enable limitation of Obukhov length so that it does not become zero; to read input data from netcdf in init_3d_model use provided module variables instead of defining local ones; tests updated because changes in Obukhov lengths causes small differences during the initial phase of the run

File:

• palm/trunk/SOURCE/init_3d_model.f90 (modified) (7 diffs)

palm/trunk/SOURCE/init_3d_model.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Design change, use variables defined in netcdf_data_input_mod to read netcd
+! variables rather than define local ones.
+! 
+! 4185 2019-08-23 13:49:38Z oliver.maas
 ! For initializing_actions = ' cyclic_fill':
 ! Overwrite u_init, v_init, pt_init, q_init and s_init with the 
@@ -160 +164 @@
                input_file_static,                                              &
                netcdf_data_input_init_3d,                                      &
+               num_var_pids,                                                   &
                open_read_file,                                                 &
-               real_2d
+               pids_id,                                                        &
+               real_2d,                                                        &
+               vars_pids
                
     USE nesting_offl_mod,                                                      &
@@ -213 +220 @@
 
     IMPLICIT NONE
-
-    CHARACTER(LEN=50), DIMENSION(:), ALLOCATABLE ::  vars_pids_static  !< variable names in static input file
     
     INTEGER(iwp) ::  i                    !< grid index in x direction
@@ -223 +228 @@
     INTEGER(iwp) ::  l                    !< running index over surface orientation   
     INTEGER(iwp) ::  m                    !< index of surface element in surface data type    
-    INTEGER(iwp) ::  num_vars_pids_static !< number of variables in static input file
     INTEGER(iwp) ::  nz_u_shift           !< topography-top index on u-grid, used to vertically shift initial profiles
     INTEGER(iwp) ::  nz_v_shift           !< topography-top index on v-grid, used to vertically shift initial profiles
@@ -233 +237 @@
     INTEGER(iwp) ::  nz_s_shift_l         !< topography-top index on scalar-grid, used to vertically shift initial profiles
     INTEGER(iwp) ::  nzt_l                !< index of top PE boundary for multigrid level
-    INTEGER(iwp) ::  pids_static_id       !< file id for static input file
     INTEGER(iwp) ::  sr                   !< index of statistic region
 
@@ -1541 +1544 @@
        CALL open_read_file( TRIM( input_file_static ) //                    &
                             TRIM( coupling_char ),                          &
-                            pids_static_id )
+                            pids_id )
                             
-       CALL inquire_num_variables( pids_static_id, num_vars_pids_static )
+       CALL inquire_num_variables( pids_id, num_var_pids )
 !
 !--    Allocate memory to store variable names and read them
-       ALLOCATE( vars_pids_static(1:num_vars_pids_static) )
-       CALL inquire_variable_names( pids_static_id, vars_pids_static )
+       ALLOCATE( vars_pids(1:num_var_pids) )
+       CALL inquire_variable_names( pids_id, vars_pids )
 !
 !--    Input roughness length. 
-       IF ( check_existence( vars_pids_static, 'z0' ) )  THEN
+       IF ( check_existence( vars_pids, 'z0' ) )  THEN
 !
 !--       Read _FillValue attribute
-          CALL get_attribute( pids_static_id, char_fill, tmp_2d%fill,          &
+          CALL get_attribute( pids_id, char_fill, tmp_2d%fill,          &
                               .FALSE., 'z0' )                                  
 !                                                                              
 !--       Read variable                                                        
-          CALL get_variable( pids_static_id, 'z0', tmp_2d%var,                 &
+          CALL get_variable( pids_id, 'z0', tmp_2d%var,                 &
                              nxl, nxr, nys, nyn )                              
 !                                                                              
@@ -1592 +1595 @@
 !
 !--    Finally, close the input file.
-       CALL close_input_file( pids_static_id )
+       CALL close_input_file( pids_id )
 #endif
        DEALLOCATE( tmp_2d%var )