Changeset 15395

Timestamp:

2021-10-18T14:42:58+02:00 (20 months ago)

Author:

dford

Message:

Fix use of POTM/TEMP and grid type output.

Location:

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

Files:

• diaobs.F90 (modified) (2 diffs)
• obs_group_def.F90 (modified) (2 diffs)
• obs_read_prof.F90 (modified) (2 diffs)

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

@@ -243 +243 @@
                ENDIF
                !
+               sobsgroups(jgroup)%sprofdata%cgrid = sobsgroups(jgroup)%cgrid
+               !
                CALL obs_pre_prof( sobsgroups(jgroup)%sprofdata,     &
                   &               sobsgroups(jgroup)%sprofdataqc,   &
@@ -306 +308 @@
                   END DO
                ENDIF
+               !
+               sobsgroups(jgroup)%ssurfdata%cgrid = sobsgroups(jgroup)%cgrid
                !
                CALL obs_pre_surf( sobsgroups(jgroup)%ssurfdata,      &

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

@@ -57 +57 @@
       CHARACTER(LEN=128)                            :: cbiasvarname  !: Bias variable name in input file
       CHARACTER(LEN=128)                            :: caltbiasfile  !: Altimeter bias input file name
+      CHARACTER(LEN=1)                              :: cgrid         !: Grid type (T,U,V)
       !
       INTEGER,            DIMENSION(:), ALLOCATABLE :: nprofdavtypes !: Profile data types representing a daily average
@@ -316 +317 @@
                !
                IF (TRIM(sdobsgroup%cobstypes(itype)) == cobsname_uvel) THEN
+                  sdobsgroup%cgrid              = 'U'
                   sdobsgroup%rglam(:,:,itype)   = glamu(:,:)
                   sdobsgroup%rgphi(:,:,itype)   = gphiu(:,:)
                   sdobsgroup%rmask(:,:,:,itype) = umask(:,:,:)
                ELSEIF (TRIM(sdobsgroup%cobstypes(itype)) == cobsname_vvel) THEN
+                  sdobsgroup%cgrid              = 'V'
                   sdobsgroup%rglam(:,:,itype)   = glamv(:,:)
                   sdobsgroup%rgphi(:,:,itype)   = gphiv(:,:)
                   sdobsgroup%rmask(:,:,:,itype) = vmask(:,:,:)
                ELSE
+                  sdobsgroup%cgrid              = 'T'
                   sdobsgroup%rglam(:,:,itype)   = glamt(:,:)
                   sdobsgroup%rgphi(:,:,itype)   = gphit(:,:)

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

@@ -164 +164 @@
       LOGICAL :: lldavtimset
       LOGICAL :: llcycle
+      LOGICAL :: llpotm
       TYPE(obfbdata), POINTER, DIMENSION(:) :: &
          & inpfiles
@@ -867 +868 @@
                   
                   ! Extra variables
+                  ! Special consideration for if the extra variable is called TEMP
+                  ! and there's a regular variable called POTM. These are in situ
+                  ! and potential temperature respectively, and need the same QC checks
                   IF ( iextr > 0 ) THEN
                      profdata%vext%nepidx(ip3dt) = iprof
                      profdata%vext%nelidx(ip3dt) = ij
                      DO jext = 1, iextr
-                        profdata%vext%eobs(ip3dt,kextr+jext) = inpfiles(jj)%pext(ij,ji,jext)
+                        IF ( TRIM(inpfiles(jj)%cextname(jext)) == 'TEMP' ) THEN
+                           llpotm = .false.
+                           DO jvar = 1, kvars
+                              IF ( TRIM(inpfiles(jj)%cname(jvar)) == 'POTM' ) THEN
+                                 IF ( ( .NOT. BTEST(inpfiles(jj)%ivlqc(ij,ji,jvar),2) .AND. &
+                                    &   .NOT. BTEST(inpfiles(jj)%idqc(ij,ji),2) .AND. &
+                                    &    ldvar(jvar) ) ) THEN
+                                    profdata%vext%eobs(ip3dt,kextr+jext) = inpfiles(jj)%pext(ij,ji,jext)
+                                 ELSE
+                                    profdata%vext%eobs(ip3dt,kextr+jext) = fbrmdi
+                                 ENDIF
+                                 llpotm = .true.
+                                 EXIT
+                              ENDIF
+                           END DO
+                           IF ( .NOT. llpotm ) THEN
+                              profdata%vext%eobs(ip3dt,kextr+jext) = inpfiles(jj)%pext(ij,ji,jext)
+                           ENDIF
+                        ELSE
+                           profdata%vext%eobs(ip3dt,kextr+jext) = inpfiles(jj)%pext(ij,ji,jext)
+                        ENDIF
                      END DO
                   ENDIF