Changeset 145 for palm/trunk

Timestamp:

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

Author:

raasch

Message:

second preliminary update for turbulent inflow

Location:

palm/trunk

Files:

• DOC/tec/topography_flags.html (added)
• SCRIPTS/mrun (modified) (1 diff)
• SOURCE/CURRENT_MODIFICATIONS (modified) (1 diff)
• SOURCE/init_grid.f90 (modified) (2 diffs)
• SOURCE/init_pegrid.f90 (modified) (3 diffs)
• SOURCE/modules.f90 (modified) (2 diffs)
• SOURCE/parin.f90 (modified) (1 diff)
• SOURCE/read_3d_binary.f90 (modified) (3 diffs)
• SOURCE/read_var_list.f90 (modified) (5 diffs)
• SOURCE/user_interface.f90 (modified) (4 diffs)
• SOURCE/write_3d_binary.f90 (modified) (1 diff)
• SOURCE/write_var_list.f90 (modified) (4 diffs)

palm/trunk/SCRIPTS/mrun

@@ -207 +207 @@
  read_from_config=""
  restart_run=false
- return_addres=$(nslookup `hostname` 2>&1 | grep "Address:" | tail -1 | awk '{print $2}')
+# return_addres=$(nslookup `hostname` 2>&1 | grep "Address:" | tail -1 | awk '{print $2}')
  if [[ $return_addres = 130.75.105.158 ]]
  then

palm/trunk/SOURCE/CURRENT_MODIFICATIONS

@@ -17 +17 @@
 User-defined spectra.
 
-calc_spectra, check_open, data_output_spectra, netcdf, read_var_list, read_3d_binary, user_interface, write_3d_binary
+calc_spectra, check_open, data_output_spectra, init_pegrid, modules, netcdf, read_var_list, read_3d_binary, user_interface, write_var_list, write_3d_binary
 
 

palm/trunk/SOURCE/init_grid.f90

@@ -428 +428 @@
 !
 !-- Test output of nzb_local -1:ny+1,-1:nx+1
-    WRITE (9,*)  '*** nzb_local ***'
-    DO  j = ny+1, -1, -1
-       WRITE (9,'(194(1X,I2))')  ( nzb_local(j,i), i = -1, nx+1 )
-    ENDDO
+!    WRITE (9,*)  '*** nzb_local ***'
+!    DO  j = ny+1, -1, -1
+!       WRITE (9,'(194(1X,I2))')  ( nzb_local(j,i), i = -1, nx+1 )
+!    ENDDO
 
 !
@@ -865 +865 @@
 !
 !--       Test output of flag arrays
-          i = nxl_l
-          WRITE (9,*)  ' '
-          WRITE (9,*)  '*** mg level ', l, ' ***', mg_switch_to_pe0_level
-          WRITE (9,*)  '    inc=', inc, '  i =', nxl_l
-          WRITE (9,*)  '    nxl_l',nxl_l,' nxr_l=',nxr_l,' nys_l=',nys_l,' nyn_l=',nyn_l
-          DO  k = nzt_l+1, nzb, -1
-             WRITE (9,'(194(1X,I2))')  ( flags(k,j,i), j = nys_l-1, nyn_l+1 )
-          ENDDO
+!          i = nxl_l
+!          WRITE (9,*)  ' '
+!          WRITE (9,*)  '*** mg level ', l, ' ***', mg_switch_to_pe0_level
+!          WRITE (9,*)  '    inc=', inc, '  i =', nxl_l
+!          WRITE (9,*)  '    nxl_l',nxl_l,' nxr_l=',nxr_l,' nys_l=',nys_l,' nyn_l=',nyn_l
+!          DO  k = nzt_l+1, nzb, -1
+!             WRITE (9,'(194(1X,I2))')  ( flags(k,j,i), j = nys_l-1, nyn_l+1 )
+!          ENDDO
 
           inc = inc * 2

palm/trunk/SOURCE/init_pegrid.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! 
+! Collect on PE0 horizontal index bounds from all other PEs
 ! TEST OUTPUT (TO BE REMOVED) logging mpi2 ierr values
 !
@@ -458 +458 @@
     DEALLOCATE( nxlf , nxrf , nynf , nysf )
 
+!
+!-- Collect index bounds from other PEs (to be written to restart file later)
+    ALLOCATE( hor_index_bounds(4,0:numprocs-1) )
+
+    IF ( myid == 0 )  THEN
+
+       hor_index_bounds(1,0) = nxl
+       hor_index_bounds(2,0) = nxr
+       hor_index_bounds(3,0) = nys
+       hor_index_bounds(4,0) = nyn
+
+!
+!--    Receive data from all other PEs
+       DO  i = 1, numprocs-1
+          CALL MPI_RECV( ibuf, 4, MPI_INTEGER, i, MPI_ANY_TAG, comm2d, status, &
+                         ierr )
+          hor_index_bounds(:,i) = ibuf(1:4)
+       ENDDO
+
+    ELSE
+!
+!--    Send index bounds to PE0
+       ibuf(1) = nxl
+       ibuf(2) = nxr
+       ibuf(3) = nys
+       ibuf(4) = nyn
+       CALL MPI_SEND( ibuf, 4, MPI_INTEGER, 0, myid, comm2d, ierr )
+
+    ENDIF
+
 #if defined( __print )
 !
@@ -606 +636 @@
     nzta = nz
     nnz  = nz
+
+    ALLOCATE( hor_index_bounds(4,0:0) )
+    hor_index_bounds(1,0) = nxl
+    hor_index_bounds(2,0) = nxr
+    hor_index_bounds(3,0) = nys
+    hor_index_bounds(4,0) = nyn
 
 !

palm/trunk/SOURCE/modules.f90

@@ -5 +5 @@
 ! Actual revisions:
 ! -----------------
-! 
+! +hor_index_bounds, hor_index_bounds_previous_run, numprocs_previous_run
 !
 ! Former revisions:
@@ -959 +959 @@
     CHARACTER(LEN=5)       ::  myid_char = '', myid_char_14 = ''
     INTEGER                ::  myid=0, npex = -1, npey = -1, numprocs = 1, &
+                               numprocs_previous_run = -1,                 &
                                tasks_per_node = -9999, threads_per_task = 1
+
+    INTEGER, DIMENSION(:,:), ALLOCATABLE ::  hor_index_bounds, &
+                                             hor_index_bounds_previous_run
 
 #if defined( __parallel )

palm/trunk/SOURCE/parin.f90

@@ -246 +246 @@
                  u_init(0:nz+1), v_init(0:nz+1),                            &
                  hom(0:nz+1,2,pr_palm+max_pr_user,0:statistic_regions),     &
-                 hom_sum(nzb:nzt+1,pr_palm+max_pr_user,0:statistic_regions) )
+                 hom_sum(0:nz+1,pr_palm+max_pr_user,0:statistic_regions) )
        hom = 0.0
 

palm/trunk/SOURCE/read_3d_binary.f90

@@ -5 +5 @@
 ! -----------------
 ! Restart file has to be re-opened on all PEs except PE0
+! +call of user_read_restart_data,
 ! -dopr_time_count,
-! hom_sum moved, volume_flow_area, volume_flow_initial moved to read_var_list,
+! hom_sum, volume_flow_area, volume_flow_initial moved to read_var_list,
 ! reading of old profil parameters (cross_..., dopr_crossindex, profile_***)
 ! removed
@@ -73 +74 @@
 !-- First compare the version numbers
     READ ( 13 )  version_on_file
-    binary_version = '3.0'
+    binary_version = '3.1'
     IF ( TRIM( version_on_file ) /= TRIM( binary_version ) )  THEN
        IF ( myid == 0 )  THEN
@@ -405 +406 @@
 
 !
+!-- Read user-defined restart data
+    CALL user_read_restart_data
+
+!
 !-- End of time measuring for reading binary data
     CALL cpu_log( log_point_s(14), 'read_3d_binary', 'stop' )

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

palm/trunk/SOURCE/user_interface.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! new subroutine user_spectra
+! +routines user_read_restart_data, user_spectra
 !
 ! Former revisions:
@@ -177 +177 @@
 
 
- SUBROUTINE user_init
-
-!------------------------------------------------------------------------------!
-!
-! Description:
-! ------------
-! Execution of user-defined initializing actions
+ SUBROUTINE user_read_restart_data
+
+!------------------------------------------------------------------------------!
+!
+! Description:
+! ------------
+! Reading restart data from file(s)
 !------------------------------------------------------------------------------!
 
     USE control_parameters
     USE indices
-    USE netcdf_control
     USE pegrid
     USE user
@@ -196 +195 @@
     CHARACTER (LEN=20) :: field_char
 !
-!-- Here the user-defined initializing actions follow:
+!-- Here the reading of user-defined restart data follows:
 !-- Sample for user-defined output
 !    ALLOCATE( u2(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) )
@@ -224 +223 @@
 !    ENDIF
 
-!
+ END SUBROUTINE user_read_restart_data
+
+
+
+ SUBROUTINE user_init
+
+!------------------------------------------------------------------------------!
+!
+! Description:
+! ------------
+! Execution of user-defined initializing actions
+!------------------------------------------------------------------------------!
+
+    USE control_parameters
+    USE indices
+    USE netcdf_control
+    USE pegrid
+    USE user
+
+    IMPLICIT NONE
+
+    CHARACTER (LEN=20) :: field_char
+!
+!-- Here the user-defined initializing actions follow:
 !-- Sample for user-defined time series
 !-- For each time series quantity you have to give a label and a unit,

palm/trunk/SOURCE/write_3d_binary.f90

@@ -69 +69 @@
 !
 !-- Write arrays.
-    binary_version = '3.0'
+    binary_version = '3.1'
 
     WRITE ( 14 )  binary_version

palm/trunk/SOURCE/write_var_list.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! -cross_ts_*,
+! +numprocs, hor_index_bounds, -cross_ts_*, npex, npey
 ! hom_sum, volume_flow_area, volume_flow_initial moved from write_3d_binary
 ! to here
@@ -44 +44 @@
 ! Description:
 ! ------------
-! Writing values of control variables to restart-file (binary format)
+! Writing values of control variables to restart-file (binary format).
+! These informations are only written to the file opened by PE0.
 !------------------------------------------------------------------------------!
 
@@ -63 +64 @@
 
 
-
-    binary_version = '3.1'
-
-    WRITE ( 14 )  binary_version    ! opened in write_3d_binary
-
+    binary_version = '3.2'
+
+    WRITE ( 14 )  binary_version
+
+    WRITE ( 14 )  'numprocs                      '
+    WRITE ( 14 )  numprocs
+    WRITE ( 14 )  'hor_index_bounds              '
+    WRITE ( 14 )  hor_index_bounds
     WRITE ( 14 )  'nz                            '
     WRITE ( 14 )  nz
@@ -227 +231 @@
     WRITE ( 14 )  'netcdf_precision              '
     WRITE ( 14 )  netcdf_precision
-    WRITE ( 14 )  'npex                          '
-    WRITE ( 14 )  npex
-    WRITE ( 14 )  'npey                          '
-    WRITE ( 14 )  npey
     WRITE ( 14 )  'nsor_ini                      '
     WRITE ( 14 )  nsor_ini