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

Timestamp:

Jan 9, 2008 8:17:38 AM (16 years ago)

Author:

raasch

Message:

second preliminary update for turbulent inflow

File:

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

palm/trunk/SOURCE/read_var_list.f90

@@ -5 +5 @@
 ! -----------------
 ! After reading the global variables, unit 13 is closed for all PEs except PE0
-! -cross_ts_*,
-! hom_sum moved, volume_flow_area, volume_flow_initial moved from
+! +numprocs_previous_run, hor_index_bounds_previous_run,
+! -cross_ts_*, npex, npey,
+! hom_sum, volume_flow_area, volume_flow_initial moved from
 ! read_3d_binary to here
 !
@@ -72 +73 @@
 !-- Make version number check first
     READ ( 13 )  version_on_file
-    binary_version = '3.1'
+    binary_version = '3.2'
     IF ( TRIM( version_on_file ) /= TRIM( binary_version ) )  THEN
        IF ( myid == 0 )  THEN
@@ -84 +85 @@
        CALL local_stop
     ENDIF
+
+!
+!-- Read number of PEs and horizontal index bounds of all PEs used in previous
+!-- run
+    READ ( 13 )  variable_chr
+    IF ( TRIM( variable_chr ) /= 'numprocs' )  THEN
+       PRINT*, '+++ read_var_list: numprocs not found in data from prior run', &
+                    ' on PE ', myid
+       CALL local_stop
+    ENDIF
+    READ ( 13 )  numprocs_previous_run
+
+    ALLOCATE( hor_index_bounds_previous_run(4,0:numprocs_previous_run-1) )
+
+    READ ( 13 )  variable_chr
+    IF ( TRIM( variable_chr ) /= 'hor_index_bounds' )  THEN
+       PRINT*, '+++ read_var_list: hor_index_bounds not found in data from ', &
+                    'prior run on PE ', myid
+       CALL local_stop
+    ENDIF
+    READ ( 13 )  hor_index_bounds_previous_run
 
 !
@@ -124 +146 @@
     READ ( 13 )  statistic_regions
     ALLOCATE( ug(0:nz+1), u_init(0:nz+1), vg(0:nz+1), v_init(0:nz+1), & 
-              pt_init(0:nz+1), q_init(0:nz+1), sa_init(0:nz+1), &
-              hom(0:nz+1,2,pr_palm+max_pr_user,0:statistic_regions) )
+              pt_init(0:nz+1), q_init(0:nz+1), sa_init(0:nz+1),       &
+              hom(0:nz+1,2,pr_palm+max_pr_user,0:statistic_regions),  &
+              hom_sum(0:nz+1,pr_palm+max_pr_user,0:statistic_regions) )
 
 !
@@ -283 +306 @@
           CASE ( 'netcdf_precision' )
              READ ( 13 )  netcdf_precision
-          CASE ( 'npex' )
-             READ ( 13 )  npex
-          CASE ( 'npey' )
-             READ ( 13 )  npey
           CASE ( 'nsor_ini' )
              READ ( 13 )  nsor_ini