Changeset 3011 for trunk

Timestamp:

Jul 24, 2023, 9:13:45 AM (16 months ago)

Author:

emillour

Message:

Common physics auxiliary routines:
Add possibility to broadcast 5D and 6D fields.
EM

Location:

trunk/LMDZ.COMMON/libf/phy_common

Files:

• mod_phys_lmdz_mpi_transfert.F90 (modified) (4 diffs)
• mod_phys_lmdz_omp_transfert.F90 (modified) (4 diffs)
• mod_phys_lmdz_transfert_para.F90 (modified) (4 diffs)

trunk/LMDZ.COMMON/libf/phy_common/mod_phys_lmdz_mpi_transfert.F90

@@ -7 +7 @@
   INTERFACE bcast_mpi
     MODULE PROCEDURE bcast_mpi_c,                                                     &
-                     bcast_mpi_i,bcast_mpi_i1,bcast_mpi_i2,bcast_mpi_i3,bcast_mpi_i4, &
-                     bcast_mpi_r,bcast_mpi_r1,bcast_mpi_r2,bcast_mpi_r3,bcast_mpi_r4, &
-                     bcast_mpi_l,bcast_mpi_l1,bcast_mpi_l2,bcast_mpi_l3,bcast_mpi_l4
+                     bcast_mpi_i,bcast_mpi_i1,bcast_mpi_i2,bcast_mpi_i3,bcast_mpi_i4,bcast_mpi_i5,bcast_mpi_i6, &
+                     bcast_mpi_r,bcast_mpi_r1,bcast_mpi_r2,bcast_mpi_r3,bcast_mpi_r4,bcast_mpi_r5,bcast_mpi_r6, &
+                     bcast_mpi_l,bcast_mpi_l1,bcast_mpi_l2,bcast_mpi_l3,bcast_mpi_l4,bcast_mpi_l5,bcast_mpi_l6
   END INTERFACE
 
@@ -117 +117 @@
   END SUBROUTINE bcast_mpi_i4
 
+  SUBROUTINE bcast_mpi_i5(var)
+  IMPLICIT NONE
+    INTEGER,INTENT(INOUT) :: Var(:,:,:,:,:)
+   
+    CALL bcast_mpi_igen(Var,size(Var))
+
+  END SUBROUTINE bcast_mpi_i5
+
+  SUBROUTINE bcast_mpi_i6(var)
+  IMPLICIT NONE
+    INTEGER,INTENT(INOUT) :: Var(:,:,:,:,:,:)
+   
+    CALL bcast_mpi_igen(Var,size(Var))
+
+  END SUBROUTINE bcast_mpi_i6
+
 
 !! -- Les reels -- !!
@@ -164 +180 @@
   END SUBROUTINE bcast_mpi_r4
   
+  SUBROUTINE bcast_mpi_r5(var)
+  IMPLICIT NONE
+    REAL,INTENT(INOUT) :: Var(:,:,:,:,:)
+   
+    CALL bcast_mpi_rgen(Var,size(Var))
+
+  END SUBROUTINE bcast_mpi_r5
+  
+  SUBROUTINE bcast_mpi_r6(var)
+  IMPLICIT NONE
+    REAL,INTENT(INOUT) :: Var(:,:,:,:,:,:)
+   
+    CALL bcast_mpi_rgen(Var,size(Var))
+
+  END SUBROUTINE bcast_mpi_r6
+  
+
 !! -- Les booleans -- !!
 
@@ -210 +243 @@
   END SUBROUTINE bcast_mpi_l4
   
+  SUBROUTINE bcast_mpi_l5(var)
+  IMPLICIT NONE
+    LOGICAL,INTENT(INOUT) :: Var(:,:,:,:,:)
+   
+    CALL bcast_mpi_lgen(Var,size(Var))
+
+  END SUBROUTINE bcast_mpi_l5
+
+  SUBROUTINE bcast_mpi_l6(var)
+  IMPLICIT NONE
+    LOGICAL,INTENT(INOUT) :: Var(:,:,:,:,:,:)
+   
+    CALL bcast_mpi_lgen(Var,size(Var))
+
+  END SUBROUTINE bcast_mpi_l6
+  
+
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! Definition des Scatter   --> 4D   !!

trunk/LMDZ.COMMON/libf/phy_common/mod_phys_lmdz_omp_transfert.F90

@@ -23 +23 @@
   INTERFACE bcast_omp
     MODULE PROCEDURE bcast_omp_c,                                                     &
-                     bcast_omp_i,bcast_omp_i1,bcast_omp_i2,bcast_omp_i3,bcast_omp_i4, &
-                     bcast_omp_r,bcast_omp_r1,bcast_omp_r2,bcast_omp_r3,bcast_omp_r4, &
-                     bcast_omp_l,bcast_omp_l1,bcast_omp_l2,bcast_omp_l3,bcast_omp_l4
+                     bcast_omp_i,bcast_omp_i1,bcast_omp_i2,bcast_omp_i3,bcast_omp_i4,bcast_omp_i5,bcast_omp_i6, &
+                     bcast_omp_r,bcast_omp_r1,bcast_omp_r2,bcast_omp_r3,bcast_omp_r4,bcast_omp_r5,bcast_omp_r6, &
+                     bcast_omp_l,bcast_omp_l1,bcast_omp_l2,bcast_omp_l3,bcast_omp_l4,bcast_omp_l5,bcast_omp_l6
   END INTERFACE
 
@@ -176 +176 @@
 
 
+  SUBROUTINE bcast_omp_i5(var)
+  IMPLICIT NONE
+    INTEGER,INTENT(INOUT) :: Var(:,:,:,:,:)
+   
+    CALL check_buffer_i(size(Var))
+    CALL bcast_omp_igen(Var,size(Var),buffer_i)
+
+  END SUBROUTINE bcast_omp_i5
+
+
+  SUBROUTINE bcast_omp_i6(var)
+  IMPLICIT NONE
+    INTEGER,INTENT(INOUT) :: Var(:,:,:,:,:,:)
+   
+    CALL check_buffer_i(size(Var))
+    CALL bcast_omp_igen(Var,size(Var),buffer_i)
+
+  END SUBROUTINE bcast_omp_i6
+
+
 !! -- Les reels -- !!
 
@@ -231 +251 @@
 
   
+  SUBROUTINE bcast_omp_r5(var)
+  IMPLICIT NONE
+    REAL,INTENT(INOUT) :: Var(:,:,:,:,:)
+   
+    CALL check_buffer_r(size(Var))
+    CALL bcast_omp_rgen(Var,size(Var),buffer_r)
+
+  END SUBROUTINE bcast_omp_r5
+
+  
+  SUBROUTINE bcast_omp_r6(var)
+  IMPLICIT NONE
+    REAL,INTENT(INOUT) :: Var(:,:,:,:,:,:)
+   
+    CALL check_buffer_r(size(Var))
+    CALL bcast_omp_rgen(Var,size(Var),buffer_r)
+
+  END SUBROUTINE bcast_omp_r6
+
+  
 !! -- Les booleans -- !!
 
@@ -286 +326 @@
 
 
+  SUBROUTINE bcast_omp_l5(var)
+  IMPLICIT NONE
+    LOGICAL,INTENT(INOUT) :: Var(:,:,:,:,:)
+   
+    CALL check_buffer_l(size(Var))
+    CALL bcast_omp_lgen(Var,size(Var),buffer_l)
+
+  END SUBROUTINE bcast_omp_l5
+
+
+  SUBROUTINE bcast_omp_l6(var)
+  IMPLICIT NONE
+    LOGICAL,INTENT(INOUT) :: Var(:,:,:,:,:,:)
+   
+    CALL check_buffer_l(size(Var))
+    CALL bcast_omp_lgen(Var,size(Var),buffer_l)
+
+  END SUBROUTINE bcast_omp_l6
+
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

trunk/LMDZ.COMMON/libf/phy_common/mod_phys_lmdz_transfert_para.F90

@@ -11 +11 @@
   INTERFACE bcast
     MODULE PROCEDURE bcast_c,                                     &
-                     bcast_i,bcast_i1,bcast_i2,bcast_i3,bcast_i4, &
-                     bcast_r,bcast_r1,bcast_r2,bcast_r3,bcast_r4, &
-                     bcast_l,bcast_l1,bcast_l2,bcast_l3,bcast_l4
+                     bcast_i,bcast_i1,bcast_i2,bcast_i3,bcast_i4,bcast_i5,bcast_i6, &
+                     bcast_r,bcast_r1,bcast_r2,bcast_r3,bcast_r4,bcast_r5,bcast_r6, &
+                     bcast_l,bcast_l1,bcast_l2,bcast_l3,bcast_l4,bcast_l5,bcast_l6
   END INTERFACE
 
@@ -126 +126 @@
 
  
+  SUBROUTINE bcast_i5(var)
+  IMPLICIT NONE
+    INTEGER,INTENT(INOUT) :: Var(:,:,:,:,:)
+   
+!$OMP MASTER
+    CALL bcast_mpi(Var)
+!$OMP END MASTER
+    CALL bcast_omp(Var)
+    
+  END SUBROUTINE bcast_i5
+
+
+  SUBROUTINE bcast_i6(var)
+  IMPLICIT NONE
+    INTEGER,INTENT(INOUT) :: Var(:,:,:,:,:,:)
+   
+!$OMP MASTER
+    CALL bcast_mpi(Var)
+!$OMP END MASTER
+    CALL bcast_omp(Var)
+    
+  END SUBROUTINE bcast_i6
+
+
 !! -- Les reels -- !!
   
@@ -187 +211 @@
 
 
+  SUBROUTINE bcast_r5(var)
+  IMPLICIT NONE
+    REAL,INTENT(INOUT) :: Var(:,:,:,:,:)
+   
+!$OMP MASTER
+    CALL bcast_mpi(Var)
+!$OMP END MASTER
+    CALL bcast_omp(Var)
+    
+  END SUBROUTINE bcast_r5 
+
+
+  SUBROUTINE bcast_r6(var)
+  IMPLICIT NONE
+    REAL,INTENT(INOUT) :: Var(:,:,:,:,:,:)
+   
+!$OMP MASTER
+    CALL bcast_mpi(Var)
+!$OMP END MASTER
+    CALL bcast_omp(Var)
+    
+  END SUBROUTINE bcast_r6 
+
+
 !! -- Les booleens -- !!
   
@@ -245 +293 @@
     
   END SUBROUTINE bcast_l4
+
+
+  SUBROUTINE bcast_l5(var)
+  IMPLICIT NONE
+    LOGICAL,INTENT(INOUT) :: Var(:,:,:,:,:)
+   
+!$OMP MASTER
+    CALL bcast_mpi(Var)
+!$OMP END MASTER
+    CALL bcast_omp(Var)
+    
+  END SUBROUTINE bcast_l5
+
+
+  SUBROUTINE bcast_l6(var)
+  IMPLICIT NONE
+    LOGICAL,INTENT(INOUT) :: Var(:,:,:,:,:,:)
+   
+!$OMP MASTER
+    CALL bcast_mpi(Var)
+!$OMP END MASTER
+    CALL bcast_omp(Var)
+    
+  END SUBROUTINE bcast_l6