Changeset 579

Timestamp:

10/13/17 15:25:25 (7 years ago)

Author:

dubos

Message:

devel : OpenMP fixes for NH diagnostics

File:

• codes/icosagcm/devel/src/diagnostics/observable.f90 (modified) (9 diffs)

codes/icosagcm/devel/src/diagnostics/observable.f90

@@ -5 +5 @@
 
   TYPE(t_field),POINTER, SAVE :: f_buf_i(:), &
-       f_buf_uh(:), & ! horizontal velocity, different from prognostic velocity if NH
+       f_buf_Fel(:), f_buf_uh(:), & ! horizontal velocity, different from prognostic velocity if NH
        f_buf_ulon(:), f_buf_ulat(:), &
        f_buf_u3d(:) ! unused, remove ?
@@ -28 +28 @@
     CALL allocate_field(f_buf_ulat,field_t,type_real,llm, name="buf_ulat")
     CALL allocate_field(f_buf_uh,  field_u,type_real,llm, name="buf_uh")
+    CALL allocate_field(f_buf_Fel, field_u,type_real,llm+1, name="buf_F_el")
     CALL allocate_field(f_buf_v,   field_z,type_real,llm, name="buf_v")
     CALL allocate_field(f_buf_s,   field_t,type_real, name="buf_s")
@@ -60 +61 @@
     
     IF(init) THEN
+       IF(is_master) PRINT *, 'Creating output files ...'
        scalar(1)=dt
        IF (is_omp_master) CALL xios_send_field("timestep", scalar)
@@ -74 +76 @@
 
        CALL output_field("phis",f_phis)
-       CALL output_field("Ai",geom%Ai)       
+       CALL output_field("Ai",geom%Ai) 
+       IF(is_master) PRINT *, '... done creating output files. Writing initial condition ...'
     END IF
 
@@ -120 +123 @@
        CALL output_field("geopot_init",f_geopot)
        CALL output_field("q_init",f_q)
+       IF(is_master) PRINT *, 'Done writing initial condition ...'
     ELSE
        CALL output_field("uz",f_buf_i)
@@ -165 +169 @@
          f_u(:), f_W(:), f_uz(:), &  ! IN
          f_uh(:)                         ! OUT
-    REAL(rstd),POINTER :: geopot(:,:), ps(:), rhodz(:,:), u(:,:), W(:,:), uh(:,:), uz(:,:)
+    REAL(rstd),POINTER :: geopot(:,:), ps(:), rhodz(:,:), u(:,:), W(:,:), uh(:,:), uz(:,:), F_el(:,:)
     INTEGER :: ind
     
@@ -177 +181 @@
        W = f_W(ind)
        uh  = f_uh(ind)
+       F_el  = f_buf_Fel(ind)
        IF(caldyn_eta==eta_mass) THEN
           ps=f_ps(ind)
@@ -182 +187 @@
        END IF
        uz = f_uz(ind)
-       CALL compute_prognostic_vel_to_horiz(geopot,rhodz,u,W,uh,uz)
+       !$OMP BARRIER
+       CALL compute_prognostic_vel_to_horiz(geopot,rhodz,u,W, F_el, uh,uz)
+       !$OMP BARRIER
     END DO
   END SUBROUTINE progonostic_vel_to_horiz
   
-  SUBROUTINE compute_prognostic_vel_to_horiz(Phi, rhodz, u, W, uh, uz)
+  SUBROUTINE compute_prognostic_vel_to_horiz(Phi, rhodz, u, W, F_el, uh, uz)
     USE omp_para
     REAL(rstd), INTENT(IN) :: Phi(iim*jjm,llm+1)
@@ -220 +227 @@
        END DO
 
+       ! We need a barrier here because we compute F_el above and do a vertical average below
+       !$OMP BARRIER
+
        DO l=ll_begin, ll_end ! compute on k levels (full levels)
           DO ij=ij_begin_ext, ij_end_ext