Ignore:
Timestamp:
Apr 10, 2019 12:51:50 PM (2 years ago)
Author:
hellstea
Message:

Checks and error messages improved and extended. Number of variables renamed etc

File:
1 edited

Legend:

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

    r3655 r3883  
    2626! -----------------!
    2727! $Id$
     28! Function get_number_of_childs renamed to get_number_of_children and cg
     29! renamed to pg according to their definitions in pmc_interface_mod
     30!
     31! 3655 2019-01-07 16:51:22Z knoop
    2832! unused variables removed
    2933!
     
    102106
    103107   USE pmc_interface,                                                          &
    104        ONLY: cpl_id, get_number_of_childs, nr_part,  part_adr, nested_run,     &
    105              get_childid, get_child_edges, nr_partc,  part_adrc,               &
    106              coarse_bound, coord_x, coord_y, cg,   get_child_gridspacing,      &
     108       ONLY: cpl_id, get_number_of_children, nr_part, part_adr, nested_run,    &
     109             get_childid, get_child_edges, nr_partc, part_adrc,                &
     110             coarse_bound, coord_x, coord_y, pg, get_child_gridspacing,        &
    107111             lower_left_coord_x, lower_left_coord_y
    108112
     
    199203#if defined( __parallel )
    200204
    201     nr_childs = get_number_of_childs()
     205    nr_childs = get_number_of_children()
    202206!
    203207!-- Check if the current model has child models
     
    293297!
    294298!-- If the model has child models prepare the structures for transfer
    295     nr_childs = get_number_of_childs()
     299    nr_childs = get_number_of_children()
    296300    IF ( nr_childs > 0 )   THEN
    297301       ALLOCATE( particle_win_parent(nr_childs) )
     
    452456!
    453457!--    compute number of fine grid cells in coarse grid (one direction)
    454        xx = (cg%dx + eps) / dx ! +eps to avoid rounding error
    455        yy = (cg%dy + eps) / dy
     458       xx = ( pg%dx + eps ) / dx ! +eps to avoid rounding error
     459       yy = ( pg%dy + eps ) / dy
    456460       nr_fine_in_coarse = MAX( INT(xx), INT(yy) )
    457461
    458        IF ( MOD( coord_x(0), cg%dx ) /= 0.0 .OR. MOD( coord_y(0), cg%dy ) /= 0.0 ) THEN
     462       IF ( MOD( coord_x(0), pg%dx ) /= 0.0 .OR. MOD( coord_y(0), pg%dy ) /= 0.0 ) THEN
    459463          nr_fine_in_coarse = nr_fine_in_coarse + 1
    460464       ENDIF
     
    555559    TYPE(pedef), POINTER ::  ape !< TO_DO Klaus: give a description and better name of the variable
    556560
    557     DO  m = 1, get_number_of_childs()
     561    DO  m = 1, get_number_of_children()
    558562
    559563       child_id = get_childid(m)
     
    664668
    665669#if defined( __parallel )
    666     DO  m = 1, get_number_of_childs()
     670    DO  m = 1, get_number_of_children()
    667671
    668672       child_id = get_childid(m)
     
    728732   
    729733#if defined( __parallel )
    730     DO  m = 1, get_number_of_childs()
     734    DO  m = 1, get_number_of_children()
    731735       CALL get_child_edges( m, lx_coord, lx_coord_b, rx_coord, rx_coord_b,    &
    732736                                sy_coord, sy_coord_b, ny_coord, ny_coord_b,    &
     
    10471051
    10481052                   IF ( boundary_particle ) THEN                     
    1049                       ic = x / cg%dx                     !TODO anpassen auf Mehrfachnesting
    1050                       jc = y / cg%dy
     1053                      ic = x / pg%dx                     !TODO anpassen auf Mehrfachnesting
     1054                      jc = y / pg%dy
    10511055
    10521056                      IF ( ic >= icl .AND. ic <= icr .AND. jc >= jcs .AND. jc <= jcn ) THEN
Note: See TracChangeset for help on using the changeset viewer.