Changeset 3883 for palm/trunk/SOURCE/pmc_particle_interface.f90

Timestamp:

Apr 10, 2019 12:51:50 PM (5 years ago)

Author:

hellstea

Message:

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

File:

• palm/trunk/SOURCE/pmc_particle_interface.f90 (modified) (9 diffs)

palm/trunk/SOURCE/pmc_particle_interface.f90

@@ -26 +26 @@
 ! -----------------! 
 ! $Id$
+! Function get_number_of_childs renamed to get_number_of_children and cg
+! renamed to pg according to their definitions in pmc_interface_mod
+! 
+! 3655 2019-01-07 16:51:22Z knoop
 ! unused variables removed
 ! 
@@ -102 +106 @@
 
    USE pmc_interface,                                                          &
-       ONLY: cpl_id, get_number_of_childs, nr_part,  part_adr, nested_run,     &
-             get_childid, get_child_edges, nr_partc,  part_adrc,               &
-             coarse_bound, coord_x, coord_y, cg,   get_child_gridspacing,      &
+       ONLY: cpl_id, get_number_of_children, nr_part, part_adr, nested_run,    &
+             get_childid, get_child_edges, nr_partc, part_adrc,                &
+             coarse_bound, coord_x, coord_y, pg, get_child_gridspacing,        &
              lower_left_coord_x, lower_left_coord_y
 
@@ -199 +203 @@
 #if defined( __parallel )
 
-    nr_childs = get_number_of_childs()
+    nr_childs = get_number_of_children()
 !
 !-- Check if the current model has child models
@@ -293 +297 @@
 !
 !-- If the model has child models prepare the structures for transfer
-    nr_childs = get_number_of_childs()
+    nr_childs = get_number_of_children()
     IF ( nr_childs > 0 )   THEN
        ALLOCATE( particle_win_parent(nr_childs) )
@@ -452 +456 @@
 !
 !--    compute number of fine grid cells in coarse grid (one direction)
-       xx = (cg%dx + eps) / dx ! +eps to avoid rounding error
-       yy = (cg%dy + eps) / dy
+       xx = ( pg%dx + eps ) / dx ! +eps to avoid rounding error
+       yy = ( pg%dy + eps ) / dy
        nr_fine_in_coarse = MAX( INT(xx), INT(yy) )
 
-       IF ( MOD( coord_x(0), cg%dx ) /= 0.0 .OR. MOD( coord_y(0), cg%dy ) /= 0.0 ) THEN
+       IF ( MOD( coord_x(0), pg%dx ) /= 0.0 .OR. MOD( coord_y(0), pg%dy ) /= 0.0 ) THEN
           nr_fine_in_coarse = nr_fine_in_coarse + 1
        ENDIF
@@ -555 +559 @@
     TYPE(pedef), POINTER ::  ape !< TO_DO Klaus: give a description and better name of the variable
 
-    DO  m = 1, get_number_of_childs()
+    DO  m = 1, get_number_of_children()
 
        child_id = get_childid(m)
@@ -664 +668 @@
 
 #if defined( __parallel )
-    DO  m = 1, get_number_of_childs()
+    DO  m = 1, get_number_of_children()
 
        child_id = get_childid(m)
@@ -728 +732 @@
     
 #if defined( __parallel )
-    DO  m = 1, get_number_of_childs()
+    DO  m = 1, get_number_of_children()
        CALL get_child_edges( m, lx_coord, lx_coord_b, rx_coord, rx_coord_b,    &
                                 sy_coord, sy_coord_b, ny_coord, ny_coord_b,    &
@@ -1047 +1051 @@
 
                    IF ( boundary_particle ) THEN                     
-                      ic = x / cg%dx                     !TODO anpassen auf Mehrfachnesting
-                      jc = y / cg%dy
+                      ic = x / pg%dx                     !TODO anpassen auf Mehrfachnesting
+                      jc = y / pg%dy
 
                       IF ( ic >= icl .AND. ic <= icr .AND. jc >= jcs .AND. jc <= jcn ) THEN