Changeset 15365

Timestamp:

2021-10-14T09:32:07+02:00 (3 years ago)

Author:

kingr

Message:

Updated logic to catch edge cases.

File:

• branches/UKMO/dev_r5518_obs_oper_update_DepthBug/NEMOGCM/NEMO/OPA_SRC/OBS/obsinter_z1d.h90 (modified) (2 diffs)

branches/UKMO/dev_r5518_obs_oper_update_DepthBug/NEMOGCM/NEMO/OPA_SRC/OBS/obsinter_z1d.h90

@@ -63 +63 @@
          z1dp = ( pobsdep(jdep)    - pdep(kkco(jdep)-1) )
          
-         ! Where ob is at or above top model T-point, use model top rather than extrapolate
-         IF ( pobsdep(jdep) <= pdep(kkco(jdep)-1) ) z1dp = 0.0_wp
+         ! Where both levels are masked, return a fill value
+         IF ( pobsmask(kkco(jdep)-1) == 0.0_wp ) .and. (pobsmask(kkco(jdep)) == 0.0_wp) THEN
+            pobs(jdep)  = 99999.
+         ELSE
          
-         ! Where ob is at or below bottom model T-point, use model bottom rather than extrapolate
-         IF ( pobsdep(jdep) >= pdep(kkco(jdep)) ) z1dm = 0.0_wp
-
-         ! Where deeper level is masked, only use higher level
-         IF ( pobsmask(kkco(jdep)) == 0.0_wp ) z1dp = 0.0_wp
-
-         zsum = z1dm + z1dp
+            ! Where upper level is masked (e.g., under ice cavity), only use deeper level
+            IF ( pobsmask(kkco(jdep)-1) == 0.0_wp ) z1dm = 0.0_wp
+
+            ! Where deeper level is masked (e.g., near sea bed), only use upper level
+            IF ( pobsmask(kkco(jdep)) == 0.0_wp ) z1dp = 0.0_wp
+
+            ! Where ob is at or above upper level model T-point, use upper model level 
+            ! rather than extrapolate, except where that level is masked 
+            IF ( pobsdep(jdep) <= pdep(kkco(jdep)-1) ) .and. &
+            &  ( pobsmask(kkco(jdep)-1) == 0.0_wp ) ) z1dp = 0.0_wp
+
+            ! Where ob is at or below deeper level model T-point, use deeper model level
+            ! rather than extrapolate, except where that level is masked 
+            IF ( pobsdep(jdep) >= pdep(kkco(jdep)) ) .and. &
+            &  ( pobsmask(kkco(jdep)) == 0.0_wp ) ) z1dm = 0.0_wp
+
+
+            zsum = z1dm + z1dp
          
-         IF ( zsum > 0.0_wp ) THEN
             IF ( k1dint == 0 ) THEN
 
@@ -97 +109 @@
 
             ENDIF
-         ELSE ! take value directly from the higher model level
-            pobs(jdep)  = pobsk(kkco(jdep)-1)
-         ENDIF
       END DO