Changeset 14215 for NEMO/trunk/src/OCE/SBC/sbcice_cice.F90

Timestamp:

2020-12-18T14:49:22+01:00 (4 years ago)

Author:

acc

Message:

trunk changes to swap the order of arguments to the DO LOOP macros. These changes result in a more natural i-j-k ordering as explained in #2595. SETTE is passed before and after these changes and results are unchanged. This fixes #2595

File:

• NEMO/trunk/src/OCE/SBC/sbcice_cice.F90 (modified) (5 diffs)

NEMO/trunk/src/OCE/SBC/sbcice_cice.F90

@@ -312 +312 @@
 ! x comp of wind stress (CI_1)
 ! U point to F point
-         DO_2D( 1, 0, 1, 1 )
+         DO_2D( 1, 1, 1, 0 )
             ztmp(ji,jj) = 0.5 * (  fr_iu(ji,jj) * utau(ji,jj)      &
                                  + fr_iu(ji,jj+1) * utau(ji,jj+1) ) * fmask(ji,jj,1)
@@ -320 +320 @@
 ! y comp of wind stress (CI_2)
 ! V point to F point
-         DO_2D( 1, 1, 1, 0 )
+         DO_2D( 1, 0, 1, 1 )
             ztmp(ji,jj) = 0.5 * (  fr_iv(ji,jj) * vtau(ji,jj)      &
                                  + fr_iv(ji+1,jj) * vtau(ji+1,jj) ) * fmask(ji,jj,1)
@@ -437 +437 @@
 ! x comp and y comp of surface ocean current
 ! U point to F point
-      DO_2D( 1, 0, 1, 1 )
+      DO_2D( 1, 1, 1, 0 )
          ztmp(ji,jj)=0.5*(ssu_m(ji,jj)+ssu_m(ji,jj+1))*fmask(ji,jj,1)
       END_2D
@@ -443 +443 @@
 
 ! V point to F point
-      DO_2D( 1, 1, 1, 0 )
+      DO_2D( 1, 0, 1, 1 )
          ztmp(ji,jj)=0.5*(ssv_m(ji,jj)+ssv_m(ji+1,jj))*fmask(ji,jj,1)
       END_2D
@@ -513 +513 @@
 ! F point to V point
 
-      DO_2D( 1, 0, 0, 0 )
+      DO_2D( 0, 0, 1, 0 )
          ss_iov(ji,jj) = 0.5 * ( ztmp1(ji-1,jj) + ztmp1(ji,jj) ) * vmask(ji,jj,1)
       END_2D