Changeset 8723 for branches/2017/dev_r8657_UKMO_OBSoper/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90

Timestamp:

2017-11-16T13:18:57+01:00 (6 years ago)

Author:

mattmartin

Message:

Commit changes to obs operator to work with SST bias correction and with the horizontal averaging operator.

File:

• branches/2017/dev_r8657_UKMO_OBSoper/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 (modified) (11 diffs)

branches/2017/dev_r8657_UKMO_OBSoper/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90

@@ -26 +26 @@
       & obs_int_z1d,    &
       & obs_int_z1d_spl
-   USE obs_const,  ONLY :     &
-      & obfillflt      ! Fillvalue   
+   USE obs_const,  ONLY :    &    ! Obs fill value
+      & obfillflt
    USE dom_oce,       ONLY : &
       & glamt, glamf, &
-      & gphit, gphif, & 
-      & gdept_n, gdept_0 
-   USE lib_mpp,       ONLY : &
+      & gphit, gphif
+   USE lib_mpp,       ONLY : &    ! Warning and stopping routines
       & ctl_warn, ctl_stop
+   USE sbcdcy,        ONLY : &    ! For calculation of where it is night-time
+      & sbc_dcy, nday_qsr
    USE obs_grid,      ONLY : & 
       & obs_level_search     
-   USE sbcdcy,        ONLY : &    ! For calculation of where it is night-time
-      & sbc_dcy, nday_qsr
 
    IMPLICIT NONE
@@ -58 +57 @@
 CONTAINS
 
+
    SUBROUTINE obs_prof_opt( prodatqc, kt, kpi, kpj, kpk,          &
       &                     kit000, kdaystp,                      &
-      &                     pvar1, pvar2, pgdept, pmask1, pmask2, &
+      &                     pvar1, pvar2, pgdept, pgdepw,         &
+      &                     pmask1, pmask2,                       &  
       &                     plam1, plam2, pphi1, pphi2,           &
       &                     k1dint, k2dint, kdailyavtypes )
@@ -111 +112 @@
       !!      ! 07-03 (K. Mogensen) General handling of profiles
       !!      ! 15-02 (M. Martin) Combined routine for all profile types
+      !!      ! 17-02 (M. Martin) Include generalised vertical coordinate changes
       !!-----------------------------------------------------------------------
 
@@ -140 +142 @@
          & pphi1,    &               ! Model latitudes for variable 1
          & pphi2                     ! Model latitudes for variable 2
-      REAL(KIND=wp), INTENT(IN), DIMENSION(kpk) :: &
-         & pgdept                    ! Model array of depth levels
+      REAL(KIND=wp), INTENT(IN), DIMENSION(kpi,kpj,kpk) :: & 
+         & pgdept, &                 ! Model array of depth T levels 
+         & pgdepw                    ! Model array of depth W levels 
       INTEGER, DIMENSION(imaxavtypes), OPTIONAL :: &
          & kdailyavtypes             ! Types for daily averages
@@ -156 +159 @@
       INTEGER ::   iend
       INTEGER ::   iobs
+      INTEGER ::   iin, ijn, ikn, ik   ! looping indices over interpolation nodes 
+      INTEGER ::   inum_obs
       INTEGER, DIMENSION(imaxavtypes) :: &
          & idailyavtypes
@@ -163 +168 @@
          & igrdj1, &
          & igrdj2
+      INTEGER, ALLOCATABLE, DIMENSION(:) :: iv_indic
+
       REAL(KIND=wp) :: zlam
       REAL(KIND=wp) :: zphi
@@ -171 +178 @@
          & zobsk,    &
          & zobs2k
-      REAL(KIND=wp), DIMENSION(2,2,kpk) :: &
+      REAL(KIND=wp), DIMENSION(2,2,1) :: &
          & zweig1, &
-         & zweig2
+         & zweig2, &
+         & zweig
       REAL(wp), DIMENSION(:,:,:,:), ALLOCATABLE :: &
          & zmask1, &
          & zmask2, &
-         & zint1, &
-         & zint2, &
-         & zinm1, &
-         & zinm2
+         & zint1,  &
+         & zint2,  &
+         & zinm1,  &
+         & zinm2,  &
+         & zgdept, & 
+         & zgdepw
       REAL(wp), DIMENSION(:,:,:), ALLOCATABLE :: &
          & zglam1, &
@@ -186 +196 @@
          & zgphi1, &
          & zgphi2
+      REAL(KIND=wp), DIMENSION(1) :: zmsk_1, zmsk_2   
+      REAL(KIND=wp), DIMENSION(:,:,:), ALLOCATABLE :: interp_corner
+
       LOGICAL :: ld_dailyav
 
@@ -266 +279 @@
          & zmask1(2,2,kpk,ipro),  &
          & zmask2(2,2,kpk,ipro),  &
-         & zint1(2,2,kpk,ipro),  &
-         & zint2(2,2,kpk,ipro)   &
+         & zint1(2,2,kpk,ipro),   &
+         & zint2(2,2,kpk,ipro),   &
+         & zgdept(2,2,kpk,ipro),  & 
+         & zgdepw(2,2,kpk,ipro)   & 
          & )
 
@@ -411 +426 @@
                ENDIF !idayend
 
-            ELSE 
+            ELSE   
 
                ! Point data 
@@ -476 +491 @@
 
                         ENDIF 
+
                      ENDDO depth_loop1