Changeset 15225 for NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/obs_field.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_field.F90 (modified) (5 diffs)

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

@@ -37 +37 @@
    
    ! Expected names for observation types with special behaviours (not needed for all observation types)
-   CHARACTER(LEN=8) :: cobsname_uvel3d = 'UVEL' ! Expected variable name for 3D zonal currents
-   CHARACTER(LEN=8) :: cobsname_vvel3d = 'VVEL' ! Expected variable name for 3D meridional currents
-   CHARACTER(LEN=8) :: cobsname_sla    = 'SLA'  ! Expected variable name for SLA
+   CHARACTER(LEN=8), PUBLIC :: cobsname_uvel = 'UVEL' ! Expected variable name for U velocity (2D or 3D)
+   CHARACTER(LEN=8), PUBLIC :: cobsname_vvel = 'VVEL' ! Expected variable name for V velocity (2D or 3D)
+   CHARACTER(LEN=8), PUBLIC :: cobsname_sla  = 'SLA'  ! Expected variable name for SLA
 
    !! * Type definition for observation groups
@@ -69 +69 @@
       LOGICAL  :: lsurf              !: Logical switch for surface data
       LOGICAL  :: lprof              !: Logical switch for profile data
-      LOGICAL  :: lvel3d             !: Logical switch for 3D velocity data
+      LOGICAL  :: lvel               !: Logical switch for velocity data
       LOGICAL  :: lsla               !: Logical switch for SLA data
       LOGICAL  :: laltbias           !: Logical switch for altimeter bias correction
@@ -231 +231 @@
          sdobsgroup%navtypes      = 0
          sdobsgroup%nobsbiasfiles = 0
-         sdobsgroup%lvel3d        = .false.
+         sdobsgroup%lvel          = .false.
          sdobsgroup%lsla          = .false.
          sdobsgroup%nadd_ssh      = 0
@@ -264 +264 @@
                itype = itype + 1
                sdobsgroup%cobstypes(itype) = TRIM(cn_obstypes(jtype))
-               IF ( (TRIM(sdobsgroup%cobstypes(itype)) == cobsname_uvel3d) .OR. &
-                  & (TRIM(sdobsgroup%cobstypes(itype)) == cobsname_vvel3d) ) THEN
-                  sdobsgroup%lvel3d = .true.
+               IF ( (TRIM(sdobsgroup%cobstypes(itype)) == cobsname_uvel) .OR. &
+                  & (TRIM(sdobsgroup%cobstypes(itype)) == cobsname_vvel) ) THEN
+                  sdobsgroup%lvel = .true.
                ELSEIF ( TRIM(sdobsgroup%cobstypes(itype)) == cobsname_sla ) THEN
                   sdobsgroup%lsla = .true.
@@ -277 +277 @@
                ENDIF
                !
-               IF (TRIM(sdobsgroup%cobstypes(itype)) == cobsname_uvel3d) THEN
+               IF (TRIM(sdobsgroup%cobstypes(itype)) == cobsname_uvel) THEN
                   sdobsgroup%rglam(:,:,itype)   = glamu(:,:)
                   sdobsgroup%rgphi(:,:,itype)   = gphiu(:,:)
                   sdobsgroup%rmask(:,:,:,itype) = umask(:,:,:)
-               ELSEIF (TRIM(sdobsgroup%cobstypes(itype)) == cobsname_vvel3d) THEN
+               ELSEIF (TRIM(sdobsgroup%cobstypes(itype)) == cobsname_vvel) THEN
                   sdobsgroup%rglam(:,:,itype)   = glamv(:,:)
                   sdobsgroup%rgphi(:,:,itype)   = gphiv(:,:)