Changeset 9045 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

Timestamp:

2017-12-14T13:03:31+01:00 (7 years ago)

Author:

timgraham

Message:

Add exlicit loops

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) (2 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -523 +523 @@
       ! Note that the "unclipped" bottom friction parameter is used even with explicit drag
       IF( ln_wd_il ) THEN
-        zu_frc(:,:) = zu_frc(:,:) + MAX(r1_hu_n(:,:) * zCdU_u(:,:),-1._wp / rdtbt) * zwx(:,:) *  wdrampu(:,:)
-        zv_frc(:,:) = zv_frc(:,:) + MAX(r1_hv_n(:,:) * zCdU_v(:,:),-1._wp / rdtbt) * zwy(:,:) *  wdrampv(:,:)
+         DO jj = 2, jpjm1
+            DO ji = fs_2, fs_jpim1   ! vector opt.
+               zu_frc(ji,jj) = zu_frc(ji,jj) + MAX(r1_hu_n(ji,jj) * zCdU_u(ji,jj),-1._wp / rdtbt) * zwx(ji,jj) *  wdrampu(ji,jj)
+               zv_frc(ji,jj) = zv_frc(ji,jj) + MAX(r1_hv_n(ji,jj) * zCdU_v(ji,jj),-1._wp / rdtbt) * zwy(ji,jj) *  wdrampv(ji,jj)
+            END DO
+         END DO
       ELSE
-        zu_frc(:,:) = zu_frc(:,:) + r1_hu_n(:,:) * zCdU_u(:,:) * zwx(:,:)
-        zv_frc(:,:) = zv_frc(:,:) + r1_hv_n(:,:) * zCdU_v(:,:) * zwy(:,:)
+         DO jj = 2, jpjm1
+            DO ji = fs_2, fs_jpim1   ! vector opt.
+               zu_frc(ji,jj) = zu_frc(ji,jj) + r1_hu_n(ji,jj) * zCdU_u(ji,jj) * zwx(ji,jj)
+               zv_frc(ji,jj) = zv_frc(ji,jj) + r1_hv_n(ji,jj) * zCdU_v(ji,jj) * zwy(ji,jj)
+            END DO
+         END DO
       END IF
       !
@@ -1036 +1044 @@
 !jth do implicitly instead
          IF ( .NOT. ll_wd ) THEN ! Revert to explicit for bit comparison tests in non wad runs
-            zu_trd(:,:) = zu_trd(:,:) + zCdU_u(:,:) * un_e(:,:) * hur_e(:,:)
-            zv_trd(:,:) = zv_trd(:,:) + zCdU_v(:,:) * vn_e(:,:) * hvr_e(:,:)
+            DO jj = 2, jpjm1
+               DO ji = fs_2, fs_jpim1   ! vector opt.
+                  zu_trd(ji,jj) = zu_trd(ji,jj) + zCdU_u(ji,jj) * un_e(ji,jj) * hur_e(ji,jj)
+                  zv_trd(ji,jj) = zv_trd(ji,jj) + zCdU_v(ji,jj) * vn_e(ji,jj) * hvr_e(ji,jj)
+               END DO
+            END DO
          ENDIF 
          !