Changeset 15144 for NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/obs_oper.F90

Timestamp:

2021-07-26T16:46:48+02:00 (3 years ago)

Author:

dford

Message:

Initial implementation of generic OBS interface.

File:

• NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/obs_oper.F90 (modified) (2 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/obs_oper.F90

@@ -178 +178 @@
          ! Initialize daily mean for first timestep of the day
          IF ( idayend == 1 .OR. kt == 0 ) THEN
-            DO_3D( 1, 1, 1, 1, 1, jpk )
-               prodatqc%vdmean(ji,jj,jk,kvar) = 0.0
-            END_3D
-         ENDIF
-
-         DO_3D( 1, 1, 1, 1, 1, jpk )
-            ! Increment field 1 for computing daily mean
-            prodatqc%vdmean(ji,jj,jk,kvar) = prodatqc%vdmean(ji,jj,jk,kvar) &
-               &                           + pvar(ji,jj,jk)
-         END_3D
+            DO jk = 1, jpk
+               DO jj = 1, jpj
+                  DO ji = 1, jpi
+                     prodatqc%vdmean(ji,jj,jk,kvar) = 0.0
+                  END DO
+               END DO
+            END DO
+         ENDIF
+
+         DO jk = 1, jpk
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  ! Increment field 1 for computing daily mean
+                  prodatqc%vdmean(ji,jj,jk,kvar) = prodatqc%vdmean(ji,jj,jk,kvar) &
+                     &                           + pvar(ji,jj,jk)
+               END DO
+            END DO
+         END DO
 
          ! Compute the daily mean at the end of day
@@ -194 +202 @@
             IF (lwp) WRITE(numout,*) 'Calculating prodatqc%vdmean on time-step: ',kt
             CALL FLUSH(numout)
-            DO_3D( 1, 1, 1, 1, 1, jpk )
-               prodatqc%vdmean(ji,jj,jk,kvar) = prodatqc%vdmean(ji,jj,jk,kvar) &
-                  &                           * zdaystp
-            END_3D
+            DO jk = 1, jpk
+               DO jj = 1, jpj
+                  DO ji = 1, jpi
+                     prodatqc%vdmean(ji,jj,jk,kvar) = prodatqc%vdmean(ji,jj,jk,kvar) &
+                        &                           * zdaystp
+                  END DO
+               END DO
+            END DO
          ENDIF