Changeset 7753 for trunk/NEMOGCM/NEMO/OPA_SRC/SBC/albedo.F90

Timestamp:

2017-03-03T12:46:59+01:00 (7 years ago)

Author:

mocavero

Message:

Reverting trunk to remove OpenMP

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/SBC/albedo.F90 (modified) (5 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/SBC/albedo.F90

@@ -115 +115 @@
          
          !  Computation of ice albedo (free of snow)
-!$OMP PARALLEL DO schedule(static) private(jl,jj,ji)
-         DO jl = 1, ijpl
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  IF ( ph_snw(ji,jj,jl) == 0._wp .AND. pt_ice(ji,jj,jl) >= rt0_ice ) THEN
-                     zalb(ji,jj,jl) = ralb_im
-                  ELSE
-                     zalb(ji,jj,jl) = ralb_if
-                  END IF
-               END DO
-            END DO
-         END DO
+         WHERE     ( ph_snw == 0._wp .AND. pt_ice >= rt0_ice )   ;   zalb(:,:,:) = ralb_im
+         ELSE WHERE                                              ;   zalb(:,:,:) = ralb_if
+         END  WHERE
       
          WHERE     ( 1.5  < ph_ice                     )  ;  zalb_it = zalb
@@ -135 +126 @@
          ELSE WHERE                                       ;  zalb_it = 0.1    + 3.6    * ph_ice
          END WHERE
-!$OMP PARALLEL
-!$OMP DO schedule(static) private(jl, jj, ji,zswitch,zalb_sf,zalb_sm,zalb_st)
+     
          DO jl = 1, ijpl
             DO jj = 1, jpj
@@ -166 +156 @@
          END DO
 
-!$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
+         pa_ice_os(:,:,:) = pa_ice_cs(:,:,:) + rcloud       ! Oberhuber correction for overcast sky
 
       !------------------------------------------
@@ -211 +193 @@
          z1_c2 = 1. / 0.03
          !  Computation of the snow/ice albedo
-!$OMP PARALLEL DO schedule(static) private(jl, jj, ji,zswitch,zalb_sf,zalb_sm,zalb_st)     
          DO jl = 1, ijpl
             DO jj = 1, jpj
@@ -249 +230 @@
       !!
       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 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
+      pa_oce_cs(:,:) = zcoef 
+      pa_oce_os(:,:) = 0.06                       ! Parameterization of Kondratyev, 1969 and Payne, 1972
       !
    END SUBROUTINE albedo_oce