Changeset 15187 for NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/obs_write.F90

Timestamp:

2021-08-13T11:34:58+02:00 (3 years ago)

Author:

dford

Message:

Update treatment of SLA and POTM additional/extra variables.

File:

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

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

@@ -91 +91 @@
       INTEGER :: ilevel
       INTEGER :: jvar
+      INTEGER :: jvar2
+      INTEGER :: jsal
       INTEGER :: jo
       INTEGER :: jk
@@ -145 +147 @@
          ENDIF
       END DO
-!fbdata%cextname(1)   = 'TEMP'
-!fbdata%cextlong(1)   = 'Insitu temperature'
-!fbdata%cextunit(1)   = 'Degrees centigrade'
 
       WRITE(clfname, FMT="(A,'fb_fdbk_',I4.4,'.nc')") TRIM(clfiletype), nproc
@@ -230 +229 @@
                   END DO
                ENDIF
-!IF ( ( jvar == 1 ) .AND. &
-!   & ( TRIM(profdata%cvars(1)) == 'POTM' ) ) THEN
-!   fbdata%pext(ik,jo,1) = profdata%var(jvar)%vext(jk,1)
-!ENDIF 
             END DO
          END DO
       END DO
 
-!IF ( TRIM(profdata%cvars(1)) == 'POTM' ) THEN
-!   ! Convert insitu temperature to potential temperature using the model
-!   ! salinity if no potential temperature
-!   DO jo = 1, fbdata%nobs
-!      IF ( fbdata%pphi(jo) < 9999.0 ) THEN
-!         DO jk = 1, fbdata%nlev
-!            IF ( ( fbdata%pob(jk,jo,1) >= 9999.0 ) .AND. &
-!               & ( fbdata%pdep(jk,jo) < 9999.0 ) .AND. &
-!               & ( fbdata%padd(jk,jo,1,2) < 9999.0 ) .AND. &
-!               & ( fbdata%pext(jk,jo,1) < 9999.0 ) ) THEN
-!               zpres = dep_to_p( REAL(fbdata%pdep(jk,jo),wp), &
-!                  &              REAL(fbdata%pphi(jo),wp) )
-!               fbdata%pob(jk,jo,1) = potemp( &
-!                  &                     REAL(fbdata%padd(jk,jo,1,2), wp),  &
-!                  &                     REAL(fbdata%pext(jk,jo,1), wp), &
-!                  &                     zpres, 0.0_wp )
-!            ENDIF
-!         END DO
-!      ENDIF
-!   END DO
-!ENDIF
+      ! Convert insitu temperature to potential temperature using the model
+      ! salinity if no potential temperature
+      IF (iext > 0) THEN
+         DO jvar = 1, profdata%nvar
+            IF ( TRIM(profdata%cvars(jvar)) == 'POTM' ) THEN
+               jsal = 0
+               DO jvar2 = 1, profdata%nvar
+                  IF ( TRIM(profdata%cvars(jvar2)) == 'PSAL' ) THEN
+                     jsal = jvar2
+                     EXIT
+                  ENDIF
+               END DO
+               IF (jsal > 0) THEN
+                  DO je = 1, iext
+                     IF ( TRIM(fbdata%cextname(je)) == 'TEMP' ) THEN
+                        DO jo = 1, fbdata%nobs
+                           IF ( fbdata%pphi(jo) < 9999.0 ) THEN
+                              DO jk = 1, fbdata%nlev
+                                 IF ( ( fbdata%pob(jk,jo,jvar)   >= 9999.0 ) .AND. &
+                                    & ( fbdata%pdep(jk,jo)        < 9999.0 ) .AND. &
+                                    & ( fbdata%padd(jk,jo,1,jsal) < 9999.0 ) .AND. &
+                                    & ( fbdata%pext(jk,jo,je)     < 9999.0 ) ) THEN
+                                    zpres = dep_to_p( REAL(fbdata%pdep(jk,jo),wp), &
+                                       &              REAL(fbdata%pphi(jo),wp) )
+                                    fbdata%pob(jk,jo,jvar) = potemp( &
+                                       &                     REAL(fbdata%padd(jk,jo,1,jsal), wp), &
+                                       &                     REAL(fbdata%pext(jk,jo,je), wp),     &
+                                       &                     zpres, 0.0_wp )
+                                 ENDIF
+                              END DO
+                           ENDIF
+                        END DO
+                        EXIT
+                     ENDIF
+                  END DO
+               ENDIF
+               EXIT
+            ENDIF
+         END DO
+      ENDIF
 
       ! Write the obfbdata structure