Changeset 15356 for branches/UKMO/dev_r5518_obs_oper_update_DepthBug/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90

Timestamp:

2021-10-12T15:52:10+02:00 (2 years ago)

Author:

kingr

Message:

Chnages to fix test in obs_level_search to ensure index of level below obdepth is returned, and to obs_prep to remove code which altered obdepths, and to vertical interpolation routine to deal with obs in top half of top box or bottom half of bottom box.

File:

• branches/UKMO/dev_r5518_obs_oper_update_DepthBug/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_obs_oper_update_DepthBug/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90

@@ -1224 +1224 @@
       INTEGER :: iig, ijg           ! i,j of observation on model grid point.
       INTEGER :: jobs, jobsp, jk, ji, jj
-      REAL(KIND=wp) :: maxdept, maxdepw
+      REAL(KIND=wp) :: maxdepw
 
       ! Get grid point indices
@@ -1317 +1317 @@
 
             ! Calculate max T and W depths of 2x2 grid
-            maxdept=zgdept(1,1,NINT(zbathy(1,1,jobs)),jobs)
             maxdepw=zgdepw(1,1,NINT(zbathy(1,1,jobs))+1,jobs)
             DO jj = 1, 2
                DO ji = 1, 2
-                  IF ( zgdept(ji,jj,NINT(zbathy(ji,jj,jobs)),jobs) > maxdept ) THEN
-                     maxdept = zgdept(ji,jj,NINT(zbathy(ji,jj,jobs)),jobs)
-                  END IF
                   IF ( zgdepw(ji,jj,NINT(zbathy(ji,jj,jobs))+1,jobs) > maxdepw ) THEN
                      maxdepw = zgdepw(ji,jj,NINT(zbathy(ji,jj,jobs))+1,jobs)
@@ -1398 +1394 @@
                ENDIF
             ENDIF
-            
-            ! Set observation depth equal to that of the first model depth
-            IF ( pobsdep(jobsp) < MINVAL(zgdept(1:2,1:2,1,jobs) ) ) THEN
-               pobsdep(jobsp) = MINVAL(zgdept(1:2,1:2,1,jobs))
-            ENDIF
-
-            ! Set observation depth equal to that of the last wet T-point
-            IF ( ( pobsdep(jobsp) > maxdept ) .AND. &
-               & ( pobsdep(jobsp) < maxdepw ) ) THEN
-               pobsdep(jobsp) = maxdept
-            END IF
-            
+           
 #if defined key_bdy
             ! Flag if the observation falls close to the boundary rim