Changeset 13295 for NEMO/trunk/src/OCE/SBC/fldread.F90

Timestamp:

2020-07-10T20:24:21+02:00 (4 years ago)

Author:

acc

Message:

Replace do-loop macros in the trunk with alternative forms with greater flexibility for extra halo applications. This alters a lot of routines but does not change any behaviour or results. do_loop_substitute.h90 is greatly simplified by this change. SETTE results are identical to those with the previous revision

File:

• NEMO/trunk/src/OCE/SBC/fldread.F90 (modified) (7 diffs)

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

@@ -1169 +1169 @@
             WRITE(clname,'(a3,i2.2)') 'src',jn
             CALL iom_get ( inum, jpdom_global, clname, data_tmp(:,:), cd_type = 'Z' )   !  no call to lbc_lnk
-            DO_2D_00_00
+            DO_2D( 0, 0, 0, 0 )
                isrc = NINT(data_tmp(ji,jj)) - 1
                ref_wgts(nxt_wgt)%data_jpi(ji,jj,jn) = 1 + MOD(isrc,  ref_wgts(nxt_wgt)%ddims(1))
@@ -1179 +1179 @@
             WRITE(clname,'(a3,i2.2)') 'wgt',jn
             CALL iom_get ( inum, jpdom_global, clname, data_tmp(:,:), cd_type = 'Z' )   !  no call to lbc_lnk
-            DO_2D_00_00
+            DO_2D( 0, 0, 0, 0 )
                ref_wgts(nxt_wgt)%data_wgt(ji,jj,jn) = data_tmp(ji,jj)
             END_2D
@@ -1442 +1442 @@
       dta(:,:,:) = 0._wp
       DO jn = 1,4
-         DO_3D_00_00( 1,ipk )
+         DO_3D( 0, 0, 0, 0, 1,ipk )
             ni = ref_wgts(kw)%data_jpi(ji,jj,jn) + 1
             nj = ref_wgts(kw)%data_jpj(ji,jj,jn) + 1
@@ -1486 +1486 @@
          !
 !!$         DO jn = 1,4
-!!$            DO_3D_00_00( 1,ipk )
+!!$            DO_3D( 0, 0, 0, 0, 1,ipk )
 !!$               ni = ref_wgts(kw)%data_jpi(ji,jj,jn) + 1
 !!$               nj = ref_wgts(kw)%data_jpj(ji,jj,jn) + 1
@@ -1504 +1504 @@
          !
          DO jn = 1,4
-            DO_3D_00_00( 1,ipk )
+            DO_3D( 0, 0, 0, 0, 1,ipk )
                ni = ref_wgts(kw)%data_jpi(ji,jj,jn)
                nj = ref_wgts(kw)%data_jpj(ji,jj,jn)
@@ -1513 +1513 @@
          END DO
          DO jn = 1,4
-            DO_3D_00_00( 1,ipk )
+            DO_3D( 0, 0, 0, 0, 1,ipk )
                ni = ref_wgts(kw)%data_jpi(ji,jj,jn)
                nj = ref_wgts(kw)%data_jpj(ji,jj,jn)
@@ -1522 +1522 @@
          END DO
          DO jn = 1,4
-            DO_3D_00_00( 1,ipk )
+            DO_3D( 0, 0, 0, 0, 1,ipk )
                ni = ref_wgts(kw)%data_jpi(ji,jj,jn)
                nj = ref_wgts(kw)%data_jpj(ji,jj,jn)