Changeset 2258


Ignore:
Timestamp:
Jun 8, 2017 7:55:13 AM (4 years ago)
Author:
suehring
Message:

Bugfix, add pre-preprocessor directives to enable non-parrallel mode

Location:
palm/trunk/SOURCE
Files:
4 edited

Legend:

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

    r2233 r2258  
    2525! -----------------
    2626! $Id$
     27! Bugfix, add pre-preprocessor directives to enable non-parrallel mode
     28!
     29! 2233 2017-05-30 18:08:54Z suehring
    2730!
    2831! 2232 2017-05-30 17:47:52Z suehring
     
    353356    USE plant_canopy_model_mod,                                                &
    354357        ONLY:  pcm_header, plant_canopy
    355 
     358       
     359#if defined( __parallel )
    356360    USE pmc_handle_communicator,                                               &
    357361        ONLY:  pmc_get_model_info
     362#endif
    358363
    359364    USE pmc_interface,                                                         &
     
    547552       WRITE ( io, 600 )  TRIM( nesting_mode ),                                &
    548553                          TRIM( nesting_datatransfer_mode )
     554#if defined( __parallel )
    549555       CALL pmc_get_model_info( ncpl = ncpl, cpl_id = my_cpl_id )
    550556
     
    564570                             TRIM( cpl_name )
    565571       ENDDO
     572#endif
    566573    ENDIF
    567574    WRITE ( io, 99 )
  • palm/trunk/SOURCE/pmc_interface_mod.f90

    r2241 r2258  
    2626! -----------------
    2727! $Id$
     28! Bugfix, add pre-preprocessor directives to enable non-parrallel mode
     29!
     30! 2241 2017-06-01 13:46:13Z hellstea
    2831! A minor indexing error in pmci_init_loglaw_correction is corrected.
    2932!
     
    39543957
    39553958 SUBROUTINE pmci_set_swaplevel( swaplevel )
     3959
    39563960!
    39573961!-- After each Runge-Kutta sub-timestep, alternately set buffer one or buffer
     
    39663970    INTEGER(iwp)            ::  m           !:
    39673971
     3972#if defined( __parallel )
    39683973    DO  m = 1, SIZE( pmc_parent_for_child )-1
    39693974       child_id = pmc_parent_for_child(m)
    39703975       CALL pmc_s_set_active_data_array( child_id, swaplevel )
    39713976    ENDDO
    3972 
     3977#endif
    39733978 END SUBROUTINE pmci_set_swaplevel
    39743979
  • palm/trunk/SOURCE/timestep.f90

    r2131 r2258  
    2121! ------------------
    2222!
    23 !
     23! 
    2424! Former revisions:
    2525! -----------------
    2626! $Id$
     27! Bugfix, add pre-preprocessor directives to enable non-parrallel mode
     28!
     29! 2168 2017-03-06 13:08:38Z suehring
    2730!
    2831! 2130 2017-01-24 16:25:39Z raasch
     
    353356       IF ( nested_run )  THEN
    354357          stop_dt_local = stop_dt
     358#if defined( __parallel )
    355359          CALL MPI_ALLREDUCE( stop_dt_local, stop_dt, 1, MPI_LOGICAL, MPI_LOR, &
    356360                              MPI_COMM_WORLD, ierr )
     361#endif
    357362       ENDIF
    358363
  • palm/trunk/SOURCE/urban_surface_mod.f90

    r2233 r2258  
    2626! -----------------
    2727! $Id$
     28! Bugfix, add pre-preprocessor directives to enable non-parrallel mode
     29!
     30! 2233 2017-05-30 18:08:54Z suehring
    2831!
    2932! 2232 2017-05-30 17:47:52Z suehring
     
    299302    REAL(wp), DIMENSION(:), ALLOCATABLE            ::  crlens           !< array of crossing lengths of ray for particular grid boxes
    300303    INTEGER(iwp), DIMENSION(:), ALLOCATABLE        ::  lad_ip           !< array of numbers of process where lad is stored
     304#if defined( __parallel )
    301305    INTEGER(kind=MPI_ADDRESS_KIND), &
    302306                  DIMENSION(:), ALLOCATABLE        ::  lad_disp         !< array of displaycements of lad in local array of proc lad_ip
     307#endif
    303308    REAL(wp), DIMENSION(:), ALLOCATABLE            ::  lad_s_ray        !< array of received lad_s for appropriate gridboxes crossed by ray
    304309
     
    17971802        REAL(wp), DIMENSION(:,:,:), POINTER         :: lad_s_rma       !< fortran pointer, but lower bounds are 1
    17981803        TYPE(c_ptr)                                 :: lad_s_rma_p     !< allocated c pointer
     1804#if defined( __parallel )
    17991805        INTEGER(kind=MPI_ADDRESS_KIND)              :: size_lad_rma
     1806#endif
    18001807!   
    18011808!--     calculation of the SVF
Note: See TracChangeset for help on using the changeset viewer.