Changeset 15225 for NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/obs_read_prof.F90

Timestamp:

2021-09-02T17:52:53+02:00 (3 years ago)

Author:

dford

Message:

Improve handling of velocities, including adding surface currents.

File:

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

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

@@ -27 +27 @@
    USE lib_mpp                  ! For ctl_warn/stop
    USE obs_fbm                  ! Feedback routines
+   USE obs_field, ONLY : &      ! Velocity variable names
+      & cobsname_uvel,   &
+      & cobsname_vvel
 
    IMPLICIT NONE
@@ -104 +107 @@
       INTEGER :: jk
       INTEGER :: ij
+      INTEGER :: jind
       INTEGER :: jext
       INTEGER :: jvar
@@ -450 +454 @@
             END DO
 
+            ! Do grid search
             ! Assume anything other than velocity is on T grid
-            IF ( TRIM( inpfiles(jj)%cname(1) ) == 'UVEL' ) THEN
-               CALL obs_grid_search( inowin, zlam, zphi, iobsi(:,1), iobsj(:,1), &
-                  &                  iproc(:,1), 'U' )
-               CALL obs_grid_search( inowin, zlam, zphi, iobsi(:,2), iobsj(:,2), &
-                  &                  iproc(:,2), 'V' )
-            ELSE
-               CALL obs_grid_search( inowin, zlam, zphi, iobsi(:,1), iobsj(:,1), &
-                  &                  iproc(:,1), 'T' )
-               IF ( kvars > 1 ) THEN
-                  DO jvar = 2, kvars
-                     iobsi(:,jvar) = iobsi(:,1)
-                     iobsj(:,jvar) = iobsj(:,1)
-                     iproc(:,jvar) = iproc(:,1)
-                  END DO
-               ENDIF
-            ENDIF
+            ! Save resource by not repeating for the same grid
+            jind = 0
+            DO jvar = 1, kvars
+               IF ( TRIM(inpfiles(jj)%cname(jvar)) == cobsname_uvel ) THEN
+                  CALL obs_grid_search( inowin, zlam, zphi, iobsi(:,jvar), iobsj(:,jvar), &
+                     &                  iproc(:,jvar), 'U' )
+               ELSE IF ( TRIM(inpfiles(jj)%cname(jvar)) == cobsname_vvel ) THEN
+                  CALL obs_grid_search( inowin, zlam, zphi, iobsi(:,jvar), iobsj(:,jvar), &
+                     &                  iproc(:,jvar), 'V' )
+               ELSE
+                  IF ( jind > 0 ) THEN
+                     iobsi(:,jvar) = iobsi(:,jind)
+                     iobsj(:,jvar) = iobsj(:,jind)
+                     iproc(:,jvar) = iproc(:,jind)
+                  ELSE
+                     jind = jvar
+                     CALL obs_grid_search( inowin, zlam, zphi, iobsi(:,jvar), iobsj(:,jvar), &
+                        &                  iproc(:,jvar), 'T' )
+                  ENDIF
+               ENDIF
+            END DO
 
             inowin = 0