Changeset 151 for palm/trunk/SOURCE/read_var_list.f90

Timestamp:

Mar 7, 2008 1:42:18 PM (17 years ago)

Author:

raasch

Message:

preliminary update for the turbulence recycling method

File:

• palm/trunk/SOURCE/read_var_list.f90 (modified) (10 diffs)

palm/trunk/SOURCE/read_var_list.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! +numprocs_previous_run, hor_index_bounds_previous_run,
+! +numprocs_previous_run, hor_index_bounds_previous_run, inflow_damping_factor,
+! inflow_damping_height, inflow_damping_width, mean_inflow_profiles,
+! recycling_width, turbulent_inflow,
 ! -cross_ts_*, npex, npey,
 ! hom_sum, volume_flow_area, volume_flow_initial moved from
@@ -279 +281 @@
           CASE ( 'hom_sum' )
              READ ( 13 )  hom_sum
+          CASE ( 'humidity' )
+             READ ( 13 )  humidity
+          CASE ( 'inflow_damping_factor' )
+             IF ( .NOT. ALLOCATED( inflow_damping_factor ) )  THEN
+                ALLOCATE( inflow_damping_factor(0:nz+1) )
+             ENDIF
+             READ ( 13 )  inflow_damping_factor
+          CASE ( 'inflow_damping_height' )
+             READ ( 13 )  inflow_damping_height
+          CASE ( 'inflow_damping_width' )
+             READ ( 13 )  inflow_damping_width
           CASE ( 'inflow_disturbance_begin' )
              READ ( 13 )  inflow_disturbance_begin
@@ -303 +316 @@
           CASE ( 'loop_optimization' )
              READ ( 13 )  loop_optimization
+          CASE ( 'mean_inflow_profiles' )
+             IF ( .NOT. ALLOCATED( mean_inflow_profiles ) )  THEN
+                ALLOCATE( mean_inflow_profiles(0:nz+1,5) )
+             ENDIF
+             READ ( 13 )  mean_inflow_profiles
           CASE ( 'mixing_length_1d' )
              READ ( 13 )  mixing_length_1d
-          CASE ( 'humidity' )
-             READ ( 13 )  humidity
           CASE ( 'momentum_advec' )
              READ ( 13 )  momentum_advec
@@ -381 +397 @@
           CASE ( 'random_heatflux' )
              READ ( 13 )  random_heatflux
+          CASE ( 'recycling_width' )
+             READ ( 13 )  recycling_width
           CASE ( 'rif_max' )
              READ ( 13 )  rif_max
@@ -467 +485 @@
           CASE ( 'tsc' )
              READ ( 13 )  tsc
+          CASE ( 'turbulent_inflow' )
+             READ ( 13 )  turbulent_inflow
           CASE ( 'u_init' )
              READ ( 13 )  u_init
@@ -552 +572 @@
 ! Skipping the global control variables from restart-file (binary format)
 ! except some informations needed when reading restart data from a previous
-! run which used a smaller total domain.
+! run which used a smaller total domain or/and a different domain decomposition.
 !------------------------------------------------------------------------------!
 
+    USE arrays_3d
     USE control_parameters
     USE indices
@@ -568 +589 @@
                 statistic_regions_on_file
 
+    REAL, DIMENSION(:,:,:),   ALLOCATABLE ::  hom_sum_on_file
     REAL, DIMENSION(:,:,:,:), ALLOCATABLE ::  hom_on_file
 
@@ -672 +694 @@
        SELECT CASE ( TRIM( variable_chr ) )
 
+          CASE ( 'average_count_pr' )
+             READ ( 13 )  average_count_pr
+             IF ( average_count_pr /= 0  .AND.  myid == 0 )  THEN
+                PRINT*, '+++ read_parts_of_var_list:'
+                PRINT*, '    WARNING: inflow profiles not temporally averaged.'
+                PRINT*, '    Averaging will be done now using ', &
+                        average_count_pr, ' samples.'
+             ENDIF
+
           CASE ( 'hom' )
              ALLOCATE( hom_on_file(0:nz+1,2,pr_palm+max_pr_user_on_file, &
@@ -678 +709 @@
              hom = hom_on_file(:,:,1:pr_palm+max_pr_user,0:statistic_regions)
              DEALLOCATE( hom_on_file )
+
+          CASE ( 'hom_sum' )
+             ALLOCATE( hom_sum_on_file(0:nz+1,pr_palm+max_pr_user_on_file, &
+                       0:statistic_regions_on_file) )
+             READ ( 13 )  hom_sum_on_file
+             hom_sum = hom_sum_on_file(:,1:pr_palm+max_pr_user, &
+                                       0:statistic_regions)
+             DEALLOCATE( hom_sum_on_file )
 
           CASE ( 'nx' )
@@ -710 +749 @@
     ENDDO
 
+!
+!-- Calculate the temporal average of vertical profiles, if neccessary
+    IF ( average_count_pr /= 0 )  THEN
+       hom_sum = hom_sum / REAL( average_count_pr )
+    ENDIF
+
 
  END SUBROUTINE read_parts_of_var_list