Changeset 1764 for palm/trunk/SOURCE/pmc_general.f90

Timestamp:

Feb 28, 2016 12:45:19 PM (8 years ago)

Author:

raasch

Message:

update of the nested domain system + some bugfixes

File:

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

palm/trunk/SOURCE/pmc_general.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-!
+! cpp-statement added (nesting can only be used in parallel mode),
+! all kinds given in PALM style
 !
 ! Former revisions:
@@ -35 +36 @@
 !------------------------------------------------------------------------------!
 
-
+#if defined( __parallel )
    use, intrinsic :: iso_c_binding
-   USE            :: MPI
+
+   USE kinds
+
+#if defined( __lc )
+    USE MPI
+#else
+    INCLUDE "mpif.h"
+#endif
 
    IMPLICIT none
@@ -65 +73 @@
       INTEGER                       :: dim_order                   ! Order of Dimensions: 2 = 2D array, 33 = 3D array
       TYPE (c_ptr)                  :: data                        ! Pointer of data in server space
-      INTEGER(kind=8)               :: BufIndex                    ! index in Send Buffer
+      INTEGER(idp)                  :: BufIndex                    ! index in Send Buffer
       INTEGER                       :: BufSize                     ! size in Send Buffer
       TYPE (c_ptr)                  :: SendBuf                     ! Pointer of Data in Send buffer
@@ -76 +84 @@
 
    TYPE, PUBLIC :: PeDef
-      INTEGER(KIND=8)                     :: NrEle                 ! Number of Elemets
+      INTEGER(idp)                        :: NrEle                 ! Number of Elemets
       TYPE (xy_ind), POINTER,DIMENSION(:) :: locInd                ! xy index local array for remote PE
       TYPE( ArrayDef), POINTER            :: Arrays                ! Pointer to Data Array List (Type ArrayDef)
@@ -83 +91 @@
 
    TYPE, PUBLIC :: ClientDef
-      INTEGER(KIND=8)               :: TotalBufferSize
+      INTEGER(idp)                  :: TotalBufferSize
       INTEGER                       :: model_comm                  ! Communicator of this model
       INTEGER                       :: inter_comm                  ! Inter communicator model and client
@@ -258 +266 @@
     END FUNCTION DA_List_next
 
+#endif
 end MODULE pmc_general