Ignore:
Timestamp:
Jan 17, 2008 1:08:34 PM (14 years ago)
Author:
raasch
Message:

further updates for turbulent inflow: PE-grid change for restart is working

File:
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/parin.f90

    r145 r146  
    44! Actual revisions:
    55! -----------------
    6 ! Allocation of hom_sum moved from init_3d_model to here
     6! Allocation of hom_sum moved from init_3d_model to here,
     7! npex, npey moved from inipar to d3par, setting of myid_char_14 removed,
     8! lad is allways allocated
    79!
    810! Former revisions:
     
    8789             lad_vertical_gradient, lad_vertical_gradient_level, &
    8890             long_filter_factor, loop_optimization, mixing_length_1d, &
    89              momentum_advec, netcdf_precision, npex, npey, nsor_ini, nx, ny, &
     91             momentum_advec, netcdf_precision, nsor_ini, nx, ny, &
    9092             nz, ocean, omega, outflow_damping_width, overshoot_limit_e, &
    9193             overshoot_limit_pt, overshoot_limit_u, overshoot_limit_v, &
     
    126128                       end_time, force_print_header, mg_cycles, &
    127129                       mg_switch_to_pe0_level, netcdf_64bit, netcdf_64bit_3d, &
    128                        ngsrb, normalizing_region, nsor, nz_do3d, omega_sor, &
     130                       ngsrb, normalizing_region, npex, npey, nsor, nz_do3d, &
     131                       omega_sor, &
    129132                       prandtl_number, precipitation_amount_interval, &
    130133                       profile_columns, profile_rows, psolver, &
     
    142145                       return_username, run_identifier, tasks_per_node, &
    143146                       write_binary
    144 
    145 
    146 #if defined( __parallel )
    147 !
    148 !-- Preliminary determination of processor-id which is needed here to open the
    149 !-- input files belonging to the corresponding processor and to produce
    150 !-- messages by PE0 only (myid and myid_char are later determined in
    151 !-- init_pegrid)
    152     CALL MPI_COMM_RANK( comm_palm, myid, ierr )
    153     WRITE (myid_char,'(''_'',I4.4)')  myid
    154 !
    155 !-- Since on IBM machines the process rank may be changed when the final
    156 !-- communicator is defined, save the preliminary processor-id for opening
    157 !-- the binary output file for restarts (unit 14), because otherwise
    158 !-- a mismatch occurs when reading this file in the next job
    159     myid_char_14 = myid_char
    160 #endif
    161147
    162148!
     
    186172!
    187173!-- If required, read control parameters from restart file (produced by
    188 !-- a prior run)
     174!-- a prior run). All PEs are reading from file created by PE0 (see check_open)
    189175 12 IF ( TRIM( initializing_actions ) == 'read_restart_data' )  THEN
    190176
    191177       CALL read_var_list
     178!
     179!--    The restart file will be reopened when reading the subdomain data
     180       CALL close_file( 13 )
     181
    192182!
    193183!--    Increment the run count
     
    242232       ENDIF
    243233
    244        ALLOCATE( ug(0:nz+1), vg(0:nz+1), &
    245                  pt_init(0:nz+1), q_init(0:nz+1), sa_init(0:nz+1),          &
    246                  u_init(0:nz+1), v_init(0:nz+1),                            &
    247                  hom(0:nz+1,2,pr_palm+max_pr_user,0:statistic_regions),     &
     234       ALLOCATE( lad(0:nz+1),pt_init(0:nz+1), q_init(0:nz+1), sa_init(0:nz+1), &
     235                 ug(0:nz+1), u_init(0:nz+1), v_init(0:nz+1), vg(0:nz+1),       &
     236                 hom(0:nz+1,2,pr_palm+max_pr_user,0:statistic_regions),        &
    248237                 hom_sum(0:nz+1,pr_palm+max_pr_user,0:statistic_regions) )
    249238       hom = 0.0
    250 
    251        IF ( plant_canopy ) THEN
    252           ALLOCATE( lad(0:nz+1) )
    253           lad(:) = 0.0
    254        ENDIF
    255239
    256240    ENDIF
Note: See TracChangeset for help on using the changeset viewer.