Changeset 15396

Timestamp:

2021-10-19T09:35:50+02:00 (3 years ago)

Author:

kingr

Message:

Corrected logic to avoid masked levels in obs_inter_z1d

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

@@ -62 +62 @@
          z1dm = ( pdep(kkco(jdep)) - pobsdep(jdep)      )
          z1dp = ( pobsdep(jdep)    - pdep(kkco(jdep)-1) )
+
          
          ! 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
+         IF ( ( pobsmask(kkco(jdep)-1) == 0.0_wp ) .AND. (pobsmask(kkco(jdep)) == 0.0_wp) ) THEN
             pobs(jdep)  = 99999.
          ELSE
          
             ! 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
+            ! otherwise where ob is at or above upper level model T-point, 
+            ! use upper model level rather than extrapolate
+            IF ( pobsmask(kkco(jdep)-1) == 0.0_wp ) THEN
+               z1dm = 0.0_wp
+            ELSE IF ( pobsdep(jdep) <= pdep(kkco(jdep)-1) ) THEN
+               z1dp = 0.0_wp   
+            END IF   
 
             ! 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
-
+            ! otherwise where ob is at or below deeper level model T-point, 
+            ! use deeper model level rather than extrapolate
+            IF ( pobsmask(kkco(jdep)) == 0.0_wp ) THEN
+               z1dp = 0.0_wp
+            ELSE IF ( pobsdep(jdep) >= pdep(kkco(jdep)) ) THEN
+               z1dm = 0.0_wp   
+            END IF   
 
             zsum = z1dm + z1dp
@@ -109 +111 @@
 
             ENDIF
+         ENDIF   
       END DO