Changeset 581 for codes/icosagcm/trunk/src/initial

Timestamp:

10/13/17 16:00:58 (7 years ago)

Author:

dubos

Message:

trunk : upgrading to devel

File:

• codes/icosagcm/trunk/src/initial/etat0.f90 (modified) (13 diffs)

codes/icosagcm/trunk/src/initial/etat0.f90

@@ -1 +1 @@
 MODULE etat0_mod
   USE icosa
+  USE omp_para
   IMPLICIT NONE         
   PRIVATE
@@ -10 +11 @@
 
     PUBLIC :: etat0, init_etat0, etat0_type
+
+! Important notes for OpenMP
+! When etat0 is called, vertical OpenMP parallelism is deactivated. 
+! Therefore only the omp_level_master thread must work, i.e. :
+!   !$OMP BARRIER
+!    DO ind=1,ndomain
+!      IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master) CYCLE
+!      ...
+!    END DO
+!   !$OMP BARRIER
+! There MUST be NO OMP BARRIER inside the DO-LOOP or any routine it calls.
 
 CONTAINS
   
   SUBROUTINE init_etat0
-  USE etat0_database_mod, ONLY: init_etat0_database => init_etat0 
-  USE etat0_start_file_mod, ONLY: init_etat0_start_file => init_etat0 
-  USE etat0_heldsz_mod, ONLY: init_etat0_held_suarez => init_etat0 
-  IMPLICIT NONE
-
+    USE etat0_database_mod, ONLY: init_etat0_database => init_etat0 
+    USE etat0_start_file_mod, ONLY: init_etat0_start_file => init_etat0 
+    USE etat0_heldsz_mod, ONLY: init_etat0_held_suarez => init_etat0 
+    
     CALL getin("etat0",etat0_type)
 
@@ -75 +86 @@
     USE etat0_start_file_mod, ONLY : etat0_start_file=>etat0  
 
-    IMPLICIT NONE
     TYPE(t_field),POINTER :: f_ps(:)
     TYPE(t_field),POINTER :: f_mass(:)
@@ -160 +170 @@
     END SELECT
 
-!       !$OMP BARRIER
     IF(autoinit_mass) THEN
        DO ind=1,ndomain
-          IF (.NOT. assigned_domain(ind)) CYCLE
+          IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master) CYCLE
           CALL swap_dimensions(ind)
           CALL swap_geometry(ind)
@@ -175 +184 @@
   SUBROUTINE etat0_collocated(f_phis,f_ps,f_mass,f_theta_rhodz,f_u, f_geopot,f_W, f_q)
     USE theta2theta_rhodz_mod
-    IMPLICIT NONE
     TYPE(t_field),POINTER :: f_ps(:)
     TYPE(t_field),POINTER :: f_mass(:)
@@ -200 +208 @@
 
     DO ind=1,ndomain
-      IF (.NOT. assigned_domain(ind)) CYCLE
+      IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master) CYCLE
+!      IF (.NOT. assigned_domain(ind)) CYCLE
       CALL swap_dimensions(ind)
       CALL swap_geometry(ind)
@@ -232 +241 @@
     USE exner_mod
     USE omp_para
-    IMPLICIT NONE
     REAL(rstd),INTENT(IN)  :: ps(iim*jjm)
     REAL(rstd),INTENT(IN)  :: temp(iim*jjm,llm)
@@ -248 +256 @@
     CALL compute_pression(ps,p,offset)
     ! flush p
-    !$OMP BARRIER
     DO    l    = ll_begin, ll_end
        DO j=jj_begin-offset,jj_end+offset
@@ -278 +285 @@
        ENDDO
     ENDDO
-    !$OMP BARRIER  
   END SUBROUTINE compute_temperature2entropy
 
@@ -296 +302 @@
     USE etat0_dcmip2016_cyclone_mod, ONLY : compute_dcmip2016_cyclone => compute_etat0
     USE etat0_dcmip2016_supercell_mod, ONLY : compute_dcmip2016_supercell => compute_etat0
-    IMPLICIT NONE
     REAL(rstd),INTENT(INOUT) :: ps(iim*jjm)
     REAL(rstd),INTENT(INOUT) :: mass(iim*jjm,llm)
@@ -328 +333 @@
     autoinit_NH = .NOT. hydrostatic
     w(:,:) = 0
-
-    !$OMP BARRIER
 
     SELECT CASE (TRIM(etat0_type))
@@ -391 +394 @@
     END IF
 
-    !$OMP BARRIER
-
     CALL compute_wind_perp_from_lonlat_compound(ulon_e, ulat_e, u)
 
@@ -405 +406 @@
 
   SUBROUTINE compute_etat0_isothermal(ngrid, phis, ps, temp, ulon, ulat, q)
-    IMPLICIT NONE  
     INTEGER, INTENT(IN)    :: ngrid
     REAL(rstd),INTENT(OUT) :: phis(ngrid)