Changeset 7508 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/LIM_SRC_2/limthd_2.F90

Timestamp:

2016-12-19T13:15:59+01:00 (7 years ago)

Author:

mocavero

Message:

changes on code duplication and workshare construct

File:

• branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/LIM_SRC_2/limthd_2.F90 (modified) (4 diffs)

branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/LIM_SRC_2/limthd_2.F90

@@ -76 +76 @@
       INTEGER, INTENT(in) ::   kt     ! number of iteration
       !
-      INTEGER  ::   ji, jj               ! dummy loop indices
+      INTEGER  ::   ji, jj, jk           ! dummy loop indices
       INTEGER  ::   nbpb                 ! nb of icy pts for thermo. cal.
       INTEGER  ::   nbpac                ! nb of pts for lateral accretion 
@@ -121 +121 @@
       
 !!gm needed?  yes at least for some of these arrays 
+      ztr_fram     = 0.e0   ! sea-ice transport through Fram strait
 !$OMP PARALLEL
-!$OMP WORKSHARE
-      zdvosif(:,:) = 0.e0   ! variation of ice volume at surface
-      zdvobif(:,:) = 0.e0   ! variation of ice volume at bottom
-      zdvolif(:,:) = 0.e0   ! total variation of ice volume
-      zdvonif(:,:) = 0.e0   ! transformation of snow to sea-ice volume
-      zlicegr(:,:) = 0.e0   ! lateral variation of ice volume
-      zdvomif(:,:) = 0.e0   ! variation of ice volume at bottom due to melting only
-      ztr_fram     = 0.e0   ! sea-ice transport through Fram strait
-      fstric (:,:) = 0.e0   ! part of solar radiation absorbing inside the ice
-      fscmbq (:,:) = 0.e0   ! linked with fstric
-      ffltbif(:,:) = 0.e0   ! linked with fstric
-      qfvbq  (:,:) = 0.e0   ! linked with fstric
-      rdm_snw(:,:) = 0.e0   ! variation of snow mass over 1 time step
-      rdq_snw(:,:) = 0.e0   ! heat content associated with rdm_snw
-      rdm_ice(:,:) = 0.e0   ! variation of ice mass over 1 time step
-      rdq_ice(:,:) = 0.e0   ! heat content associated with rdm_ice
-      zmsk (:,:,:) = 0.e0
-!$OMP END WORKSHARE NOWAIT
+!$OMP DO schedule(static) private(jj,ji)
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            zdvosif(ji,jj) = 0.e0   ! variation of ice volume at surface
+            zdvobif(ji,jj) = 0.e0   ! variation of ice volume at bottom
+            zdvolif(ji,jj) = 0.e0   ! total variation of ice volume
+            zdvonif(ji,jj) = 0.e0   ! transformation of snow to sea-ice volume
+            zlicegr(ji,jj) = 0.e0   ! lateral variation of ice volume
+            zdvomif(ji,jj) = 0.e0   ! variation of ice volume at bottom due to melting only
+            fstric (ji,jj) = 0.e0   ! part of solar radiation absorbing inside the ice
+            fscmbq (ji,jj) = 0.e0   ! linked with fstric
+            ffltbif(ji,jj) = 0.e0   ! linked with fstric
+            qfvbq  (ji,jj) = 0.e0   ! linked with fstric
+            rdm_snw(ji,jj) = 0.e0   ! variation of snow mass over 1 time step
+            rdq_snw(ji,jj) = 0.e0   ! heat content associated with rdm_snw
+            rdm_ice(ji,jj) = 0.e0   ! variation of ice mass over 1 time step
+            rdq_ice(ji,jj) = 0.e0   ! heat content associated with rdm_ice
+         END DO
+      END DO
+!$OMP END DO NOWAIT
+!$OMP DO schedule(static) private(jk,jj,ji)
+      DO jk = 1, jpk
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               zmsk (ji,jj,jk) = 0.e0
+            END DO
+         END DO
+      END DO
+!$OMP END DO NOWAIT
 
       ! set to zero snow thickness smaller than epsi04
@@ -434 +446 @@
             fr_i  (ji,jj) = 1.0 - frld(ji,jj)  
             hicifp(ji,jj) = hicif(ji,jj) * fr_i(ji,jj) - hicifp(ji,jj)
+            ztmp(ji,jj) = 1. - pfrld(ji,jj)                              ! fraction of ice after the dynamic, before the thermodynamic
          END DO
       END DO
@@ -439 +452 @@
       ! Outputs
       !--------------------------------------------------------------------------------
-      ztmp(:,:) = 1. - pfrld(:,:)                                ! fraction of ice after the dynamic, before the thermodynamic
       IF( iom_use('ist_cea'    ) )   CALL iom_put( 'ist_cea', (sist(:,:) - rt0) * ztmp(:,:) )   ! Ice surface temperature   [Celius]
       IF( iom_use('qsr_ai_cea' ) )   CALL iom_put( 'qsr_ai_cea', qsr_ice(:,:,1) * ztmp(:,:) )   ! Solar flux over the ice     [W/m2]