Changeset 7037 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90

Timestamp:

2016-10-18T15:32:04+02:00 (8 years ago)

Author:

mocavero

Message:

ORCA2_LIM_PISCES hybrid version update

File:

• branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90 (modified) (5 diffs)

branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90

@@ -225 +225 @@
          ENDIF
 
+!$OMP PARALLEL WORKSHARE
          tn_25h(:,:,:)        = tn_25h(:,:,:) + tsn(:,:,:,jp_tem)
          sn_25h(:,:,:)        = sn_25h(:,:,:) + tsn(:,:,:,jp_sal)
@@ -239 +240 @@
          rmxln_25h(:,:,:)      = rmxln_25h(:,:,:) + mxln(:,:,:)
 #endif
+!$OMP END PARALLEL WORKSHARE
          cnt_25h = cnt_25h + 1
 
@@ -255 +257 @@
             ENDIF
 
+!$OMP PARALLEL WORKSHARE
             tn_25h(:,:,:)        = tn_25h(:,:,:) / 25.0_wp
             sn_25h(:,:,:)        = sn_25h(:,:,:) / 25.0_wp
@@ -269 +272 @@
             rmxln_25h(:,:,:)       = rmxln_25h(:,:,:) / 25.0_wp
 #endif
+!$OMP END PARALLEL WORKSHARE
 
             IF (lwp)  WRITE(numout,*) 'dia_wri_tide : Mean calculated by dividing 25 hour sums and writing output'
             zmdi=1.e+20 !missing data indicator for masking
             ! write tracers (instantaneous)
+!$OMP PARALLEL WORKSHARE
             zw3d(:,:,:) = tn_25h(:,:,:)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
+!$OMP END PARALLEL WORKSHARE
             CALL iom_put("temper25h", zw3d)   ! potential temperature
+!$OMP PARALLEL WORKSHARE
             zw3d(:,:,:) = sn_25h(:,:,:)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
+!$OMP END PARALLEL WORKSHARE
             CALL iom_put( "salin25h", zw3d  )   ! salinity
+!$OMP PARALLEL WORKSHARE
             zw2d(:,:) = sshn_25h(:,:)*tmask(:,:,1) + zmdi*(1.0-tmask(:,:,1))
+!$OMP END PARALLEL WORKSHARE
             CALL iom_put( "ssh25h", zw2d )   ! sea surface 
 
 
             ! Write velocities (instantaneous)
+!$OMP PARALLEL WORKSHARE
             zw3d(:,:,:) = un_25h(:,:,:)*umask(:,:,:) + zmdi*(1.0-umask(:,:,:))
+!$OMP END PARALLEL WORKSHARE
             CALL iom_put("vozocrtx25h", zw3d)    ! i-current
+!$OMP PARALLEL WORKSHARE
             zw3d(:,:,:) = vn_25h(:,:,:)*vmask(:,:,:) + zmdi*(1.0-vmask(:,:,:))
+!$OMP END PARALLEL WORKSHARE
             CALL iom_put("vomecrty25h", zw3d  )   ! j-current
 
+!$OMP PARALLEL WORKSHARE
             zw3d(:,:,:) = wn_25h(:,:,:)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
+!$OMP END PARALLEL WORKSHARE
             CALL iom_put("vomecrtz25h", zw3d )   ! k-current
+!$OMP PARALLEL WORKSHARE
             zw3d(:,:,:) = avt_25h(:,:,:)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
+!$OMP END PARALLEL WORKSHARE
             CALL iom_put("avt25h", zw3d )   ! diffusivity
+!$OMP PARALLEL WORKSHARE
             zw3d(:,:,:) = avm_25h(:,:,:)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
+!$OMP END PARALLEL WORKSHARE
             CALL iom_put("avm25h", zw3d)   ! viscosity
 #if defined key_zdftke || defined key_zdfgls 
+!$OMP PARALLEL WORKSHARE
             zw3d(:,:,:) = en_25h(:,:,:)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
+!$OMP END PARALLEL WORKSHARE
             CALL iom_put("tke25h", zw3d)   ! tke
 #endif
 #if defined key_zdfgls 
+!$OMP PARALLEL WORKSHARE
             zw3d(:,:,:) = rmxln_25h(:,:,:)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
+!$OMP END PARALLEL WORKSHARE
             CALL iom_put( "mxln25h",zw3d)
 #endif
 
             ! After the write reset the values to cnt=1 and sum values equal current value 
+!$OMP PARALLEL WORKSHARE
             tn_25h(:,:,:) = tsn(:,:,:,jp_tem)
             sn_25h(:,:,:) = tsn(:,:,:,jp_sal)
@@ -317 +342 @@
             rmxln_25h(:,:,:) = mxln(:,:,:)
 #endif
+!$OMP END PARALLEL WORKSHARE
             cnt_25h = 1
             IF (lwp)  WRITE(numout,*) 'dia_wri_tide : After 25hr mean write, reset sum to current value and cnt_25h to one for overlapping average',cnt_25h