Changeset 222


Ignore:
Timestamp:
Jan 12, 2009 4:04:16 PM (13 years ago)
Author:
letzel
Message:
  • Bugfixes for nonparallel execution
Location:
palm/trunk/SOURCE
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/CURRENT_MODIFICATIONS

    r221 r222  
    1212
    1313User can check user parameters and deduce further quantities in user_check_parameters
     14
     15Check that PALM is called with mrun -K parallel for coupling
    1416
    1517check_for_restart, check_parameters, data_output_dvrp, init_dvrp, init_pegrid, local_stop, modules, package_parin, palm, surface_coupler, timestep, user_additional_routines
     
    5759------
    5860
     61Bugfixes for nonparallel execution (check_for_restart, cpu_statistics, inflow_turbulence, init_coupling, timestep)
     62
    5963Size of pf3d adjusted to the required output size (1 gridpoint less, along
    6064all three dimensions), because output of a subset of the data
     
    7882Bugfix: abort in case that absolute temperature is below zero (init_cloud_physics)
    7983
    80 advec_particles, combine_plot_fields, data_output_2d, header, init_cloud_physics, production_e, read_3d_binary
     84advec_particles, check_for_restart, combine_plot_fields, cpu_statistics, data_output_2d, header, inflow_turbulence, init_cloud_physics, init_coupling, production_e, read_3d_binary, timestep
  • palm/trunk/SOURCE/check_for_restart.f90

    r206 r222  
    55! -----------------
    66! Implementation of an MPI-1 coupling: replaced myid with target_id
     7! Bugfix for nonparallel execution
    78!
    89! Former revisions:
     
    8081
    8182       terminate_coupled = 3
     83#if defined( __parallel )
    8284       CALL MPI_SENDRECV( terminate_coupled,        1, MPI_INTEGER,          &
    8385                          target_id, 0,                                      &
     
    8587                          target_id, 0,                                      &
    8688                          comm_inter, status, ierr )
     89#endif
    8790    ENDIF
    8891
     
    125128                terminate_coupled = 5
    126129             ENDIF
     130#if defined( __parallel )
    127131             CALL MPI_SENDRECV( terminate_coupled,        1, MPI_INTEGER,    &
    128132                                target_id,  0,                               &
     
    130134                                target_id,  0,                               &
    131135                                comm_inter, status, ierr )
     136#endif
    132137          ENDIF
    133138       ELSE
  • palm/trunk/SOURCE/check_parameters.f90

    r217 r222  
    88! Implementation of an MPI-1 coupling: replaced myid with target_id,
    99! deleted __mpi2 directives
     10! Check that PALM is called with mrun -K parallel for coupling
    1011!
    1112! Former revisions:
     
    234235                                    0 )
    235236       ENDIF
     237#else
     238       WRITE( message_string, * ) 'coupling requires PALM to be called with', &
     239            ' ''mrun -K parallel'''
     240       CALL handle_palm_message( 'check_parameters', 'PA0141', 1, 2, 0, 6, 0 )
    236241#endif
    237242    ENDIF
  • palm/trunk/SOURCE/cpu_statistics.f90

    r198 r222  
    44! Actual revisions:
    55! -----------------
    6 !
     6! Bugfix for nonparallel execution
    77!
    88! Former revisions:
     
    125125!--    Write cpu-times sorted by size
    126126       CALL check_open( 18 )
     127#if defined( __parallel )
    127128       WRITE ( 18, 100 )  TRIM( run_description_header ),        &
    128129                          numprocs * threads_per_task, pdims(1), pdims(2), &
    129130                          threads_per_task
     131#else
     132       WRITE ( 18, 100 )  TRIM( run_description_header ),        &
     133                          numprocs * threads_per_task, 1, 1, &
     134                          threads_per_task
     135#endif
    130136       DO
    131137          ii = MAXLOC( sum )
  • palm/trunk/SOURCE/inflow_turbulence.f90

    r198 r222  
    44! Actual revisions:
    55! -----------------
    6 !
     6! Bugfix for nonparallel execution
    77!
    88! Former revisions:
     
    9292    i = recycling_plane
    9393
     94#if defined( __parallel )
    9495    IF ( myidx == id_recycling )  THEN
    9596
     
    107108
    108109    ENDIF
     110#else
     111    DO  j = nys-1, nyn+1
     112       DO  k = nzb, nzt+1
     113
     114          inflow_dist(k,j,1) = u(k,j,i+1) - avpr(k,1)
     115          inflow_dist(k,j,2) = v(k,j,i)   - avpr(k,2)
     116          inflow_dist(k,j,3) = w(k,j,i)   - avpr(k,3)
     117          inflow_dist(k,j,4) = pt(k,j,i)  - avpr(k,4)
     118          inflow_dist(k,j,5) = e(k,j,i)   - avpr(k,5)
     119
     120       ENDDO
     121    ENDDO
     122#endif
    109123
    110124!
  • palm/trunk/SOURCE/init_coupling.f90

    r206 r222  
    44! Actual revisions:
    55! -----------------
    6 !
     6! Bugfix for nonparallel execution
    77!
    88! Former revisions:
     
    4141!-- In this case, distribute PEs to 2 new communicators.
    4242!-- ATTENTION: numprocs will be reset according to the new communicators
     43#if defined ( __parallel )
    4344    IF ( myid == 0 )  THEN
    4445       READ (*,*,ERR=10,END=10)  coupling_mode, bc_data(1), bc_data(2)
     
    108109    ENDIF
    109110#endif
     111#endif
    110112
    111113    IF ( coupling_mode == 'ocean_to_atmosphere' )  coupling_char = '_O'
  • palm/trunk/SOURCE/timestep.f90

    r206 r222  
    55! -----------------
    66! Implementation of a MPI-1 Coupling: replaced myid with target_id
     7! Bugfix for nonparallel execution
    78!
    89! Former revisions:
     
    216217!--       and its reason, provided the remote model has not already been
    217218!--       informed of another termination reason (terminate_coupled > 0) before.
     219#if defined( __parallel )
    218220          IF ( coupling_mode /= 'uncoupled' .AND. terminate_coupled == 0 )  THEN
    219221             terminate_coupled = 2
     
    223225                  comm_inter, status, ierr )
    224226          ENDIF
    225 
     227#endif
    226228       ENDIF
    227229
Note: See TracChangeset for help on using the changeset viewer.