Changeset 2808 for palm/trunk

Timestamp:

Feb 14, 2018 5:34:13 PM (7 years ago)

Author:

thiele

Message:

Bugfixes gfortran C_SIZEOF(zero_particle)

File:

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

palm/trunk/SOURCE/pmc_particle_interface.f90

@@ -26 +26 @@
 ! -----------------
 !
-! Bugfixes gfortran c_sizeof
+! Bugfixes gfortran C_SIZEOF(zero_particle)
+! 
+! 
 ! 
 ! 
@@ -312 +314 @@
     INTEGER(iwp) ::  nr   !< number of particles to receive from a parent box 
     
+    INTEGER(KIND=MPI_ADDRESS_KIND) ::  parsize !<
     INTEGER(KIND=MPI_ADDRESS_KIND) ::  target_disp !<
     
     TYPE(pedef), POINTER ::  ape !< TO_DO Klaus: give a description and better name of the variable
-    
-    TYPE(particle_type) ::  dummy_part !<
 
     IF ( cpl_id > 1 )  THEN
@@ -344 +345 @@
 
                  CALL check_and_alloc_coarse_particle (i, j, nr)
-
+#if defined( __gfortran )
+!
+!--       For the gfortran compiler the function c_sizeof produces strange erros 
+!--       which can probably be attributed to an error in the gfortran compiler.
+!--       Therefore the particle size in bytes is set manually. Attention: A 
+!--       change of the size of the particle type requires an adjustment of 
+!--       this value
+          parsize = 184
+#else
+          parsize = C_SIZEOF (zero_particle)
+#endif
                  target_disp = part_adrc(j,i) - 1
                  CALL MPI_WIN_LOCK( MPI_LOCK_SHARED , ip - 1, 0, particle_win_child, ierr )
                  CALL MPI_GET( coarse_particles(j,i)%parent_particles,         &
-                               nr * C_SIZEOF(dummy_part), MPI_BYTE, ip - 1,    &
-                               target_disp, nr * C_SIZEOF(dummy_part),         &
+                               nr * parsize, MPI_BYTE, ip - 1,    &
+                               target_disp, nr * parsize,         &
                                MPI_BYTE, particle_win_child, ierr )
                  CALL MPI_WIN_UNLOCK( ip - 1, particle_win_child, ierr )
@@ -386 +397 @@
     INTEGER(iwp) ::  pe_offset              !< offset index of the current PE
     
+    INTEGER(KIND=MPI_ADDRESS_KIND) ::  parsize !<
     INTEGER(KIND=MPI_ADDRESS_KIND) ::  target_disp !<
     
@@ -435 +447 @@
        max_nr_particle_per_pe = max_nr_particle_in_rma_win / ( n * n )
        disp_offset            = pe_offset * max_nr_particle_per_pe
-
+#if defined( __gfortran )
+!
+!--       For the gfortran compiler the function c_sizeof produces strange erros 
+!--       which can probably be attributed to an error in the gfortran compiler.
+!--       Therefore the particle size in bytes is set manually. Attention: A 
+!--       change of the size of the particle type requires an adjustment of 
+!--       this value
+          parsize = 184
+#else
+          parsize = C_SIZEOF (zero_particle)
+#endif
        DO  ip = 1, me%inter_npes
 
@@ -455 +477 @@
                 CALL MPI_WIN_LOCK( MPI_LOCK_SHARED , ip - 1, 0, particle_win_child, ierr )
                 CALL MPI_PUT( coarse_particles(j,i)%parent_particles,          &
-                              nr * C_SIZEOF(zero_particle), MPI_BYTE, ip - 1,     &
-                              target_disp, nr * C_SIZEOF(zero_particle) ,         &
+                              nr * parsize, MPI_BYTE, ip - 1,     &
+                              target_disp, nr * parsize ,         &
                               MPI_BYTE, particle_win_child, ierr )
                 CALL MPI_WIN_UNLOCK( ip - 1, particle_win_child, ierr )