Changeset 13295 for NEMO/trunk/src/OCE/OBS

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

Location:

NEMO/trunk/src/OCE/OBS

Files:

• obs_oper.F90 (modified) (6 diffs)
• obs_readmdt.F90 (modified) (1 diff)

NEMO/trunk/src/OCE/OBS/obs_oper.F90

@@ -189 +189 @@
          ! Initialize daily mean for first timestep of the day
          IF ( idayend == 1 .OR. kt == 0 ) THEN
-            DO_3D_11_11( 1, jpk )
+            DO_3D( 1, 1, 1, 1, 1, jpk )
                prodatqc%vdmean(ji,jj,jk,1) = 0.0
                prodatqc%vdmean(ji,jj,jk,2) = 0.0
@@ -195 +195 @@
          ENDIF
 
-         DO_3D_11_11( 1, jpk )
+         DO_3D( 1, 1, 1, 1, 1, jpk )
             ! Increment field 1 for computing daily mean
             prodatqc%vdmean(ji,jj,jk,1) = prodatqc%vdmean(ji,jj,jk,1) &
@@ -209 +209 @@
             IF (lwp) WRITE(numout,*) 'Calculating prodatqc%vdmean on time-step: ',kt
             CALL FLUSH(numout)
-            DO_3D_11_11( 1, jpk )
+            DO_3D( 1, 1, 1, 1, 1, jpk )
                prodatqc%vdmean(ji,jj,jk,1) = prodatqc%vdmean(ji,jj,jk,1) &
                   &                        * zdaystp
@@ -750 +750 @@
          ! Initialize night-time mean for first timestep of the day
          IF ( idayend == 1 .OR. kt == 0 ) THEN
-            DO_2D_11_11
+            DO_2D( 1, 1, 1, 1 )
                surfdataqc%vdmean(ji,jj) = 0.0
                zmeanday(ji,jj) = 0.0
@@ -761 +761 @@
          imask_night(:,:) = INT( zouttmp(:,:) )
 
-         DO_2D_11_11
+         DO_2D( 1, 1, 1, 1 )
             ! Increment the temperature field for computing night mean and counter
             surfdataqc%vdmean(ji,jj) = surfdataqc%vdmean(ji,jj)  &
@@ -773 +773 @@
          IF ( idayend == 0 ) THEN
             IF (lwp) WRITE(numout,*) 'Calculating surfdataqc%vdmean on time-step: ',kt
-            DO_2D_11_11
+            DO_2D( 1, 1, 1, 1 )
                ! Test if "no night" point
                IF ( icount_night(ji,jj) > 0 ) THEN

NEMO/trunk/src/OCE/OBS/obs_readmdt.F90

@@ -215 +215 @@
       zeta2 = 0.0
 
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
        zdxdy = e1e2t(ji,jj) * zpromsk(ji,jj)
        zarea = zarea + zdxdy