Changeset 7508 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/SBC/albedo.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/OPA_SRC/SBC/albedo.F90 (modified) (2 diffs)

branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/SBC/albedo.F90

@@ -157 +157 @@
          END DO
 
-!$OMP WORKSHARE 
-         pa_ice_os(:,:,:) = pa_ice_cs(:,:,:) + rcloud       ! Oberhuber correction for overcast sky
-!$OMP END WORKSHARE NOWAIT
-!$OMP END PARALLEL 
+!$OMP DO schedule(static) private(jl, jj, ji)     
+         DO jl = 1, ijpl
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  pa_ice_os(ji,jj,jl) = pa_ice_cs(ji,jj,jl) + rcloud       ! Oberhuber correction for overcast sky
+               END DO
+            END DO
+         END DO
+!$OMP END PARALLEL
 
       !------------------------------------------
@@ -235 +240 @@
       !!
       REAL(wp) :: zcoef 
+      INTEGER  ::   ji, jj                                   ! dummy loop indices
       !!----------------------------------------------------------------------
       !
       zcoef = 0.05 / ( 1.1 * rmue**1.4 + 0.15 )   ! Parameterization of Briegled and Ramanathan, 1982
-!$OMP PARALLEL WORKSHARE 
-      pa_oce_cs(:,:) = zcoef 
-      pa_oce_os(:,:) = 0.06                       ! Parameterization of Kondratyev, 1969 and Payne, 1972
-!$OMP END PARALLEL WORKSHARE 
+!$OMP PARALLEL DO schedule(static) private(jj, ji)     
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            pa_oce_cs(ji,jj) = zcoef 
+            pa_oce_os(ji,jj) = 0.06                       ! Parameterization of Kondratyev, 1969 and Payne, 1972
+         END DO
+      END DO
       !
    END SUBROUTINE albedo_oce