Changeset 1315 for trunk/LMDZ.COMMON

Timestamp:

Jul 11, 2014, 4:15:06 PM (10 years ago)

Author:

milmd

Message:

LMDZ.GENERIC. OpenMP directives added in generic physic. When running in pure OpenMP or hybrid OpenMP/MPI, may have some bugs with condense_cloud and wstats routines.

Location:

trunk/LMDZ.COMMON/libf

Files:

• bibio/ioipsl_getincom_p.F90 (added)
• dyn3d_common/cpdet_mod.F90 (modified) (4 diffs)
• dyn3dpar/gcm.F (modified) (1 diff)
• dyn3dpar/sponge_mod_p.F90 (modified) (1 diff)

trunk/LMDZ.COMMON/libf/dyn3d_common/cpdet_mod.F90

@@ -142 +142 @@
 ! Parallel version of t2tpot, for an arbitrary number of columns
       USE control_mod, only : planet_type
+      USE parallel_lmdz, only : OMP_CHUNK
       IMPLICIT none
 
@@ -179 +180 @@
 ! Parallel version of t2tpot, over the full dynamics (scalar) grid
 ! (more efficient than multiple calls to t2tpot_p() with slices of data)
-      USE parallel_lmdz, only : jj_begin,jj_end
+      USE parallel_lmdz, only : jj_begin,jj_end,OMP_CHUNK
       USE control_mod, only : planet_type
       IMPLICIT none
@@ -223 +224 @@
 ! Parallel version of tpot2t, for an arbitrary number of columns
       USE control_mod, only : planet_type
+      USE parallel_lmdz, only : OMP_CHUNK
       IMPLICIT none
 ! for cpp, nu_venus and t0_venus:
@@ -259 +261 @@
 ! Parallel version of tpot2t, over the full dynamics (scalar) grid
 ! (more efficient than multiple calls to tpot2t_p() with slices of data)
-      USE parallel_lmdz, only : jj_begin,jj_end
+      USE parallel_lmdz, only : jj_begin,jj_end,OMP_CHUNK
       USE control_mod, only : planet_type
       IMPLICIT none

trunk/LMDZ.COMMON/libf/dyn3dpar/gcm.F

@@ -599 +599 @@
 c       write(78,*) 'q',q
 
-c$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/,/logici/,/logicl/)
+!c$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/,/logici/,/logicl/)
+!variable temps no longer exists
+c$OMP PARALLEL DEFAULT(SHARED)
+c$OMP1 COPYIN(/temps_r/,/temps_i/,/temps_c/,/logici/,/logicl/)
       CALL leapfrog_p(ucov,vcov,teta,ps,masse,phis,q,
      .              time_0)

trunk/LMDZ.COMMON/libf/dyn3dpar/sponge_mod_p.F90

@@ -31 +31 @@
 
       USE Write_Field_p
-      use parallel_lmdz, only: pole_sud,pole_nord,jj_begin,jj_end
+      use parallel_lmdz, only: pole_sud,pole_nord,jj_begin,jj_end,OMP_CHUNK
       implicit none
 #include "dimensions.h"