Changeset 14982 for NEMO/trunk/src/OCE/OBS

Timestamp:

2021-06-11T16:52:03+02:00 (3 years ago)

Author:

hadcv

Message:

#2665: Various fixes for code enabled with key_qco/key_linssh

Location:

NEMO/trunk/src/OCE/OBS

Files:

• diaobs.F90 (modified) (6 diffs)
• obs_prep.F90 (modified) (4 diffs)

NEMO/trunk/src/OCE/OBS/diaobs.F90

@@ -99 +99 @@
    CHARACTER(len=8), PUBLIC, DIMENSION(:), ALLOCATABLE ::   cobstypesprof, cobstypessurf   !: Profile & surface obs types
 
+#  include "domzgr_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
@@ -623 +624 @@
       INTEGER :: jtype             ! Data loop variable
       INTEGER :: jvar              ! Variable number
-      INTEGER :: ji, jj            ! Loop counters
+      INTEGER :: ji, jj, jk        ! Loop counters
       REAL(wp), DIMENSION(:,:,:,:), ALLOCATABLE :: &
          & zprofvar                ! Model values for variables in a prof ob
@@ -634 +635 @@
          & zglam,    &             ! Model longitudes for prof variables
          & zgphi                   ! Model latitudes for prof variables
+      REAL(wp), DIMENSION(:,:,:), ALLOCATABLE :: zdept, zdepw
 
       !-----------------------------------------------------------------------
@@ -650 +652 @@
 
       IF ( nproftypes > 0 ) THEN
+
+         ALLOCATE( zdept(jpi,jpj,jpk), zdepw(jpi,jpj,jpk) )
+         DO jk = 1, jpk
+            zdept(:,:,jk) = gdept(:,:,jk,Kmm)
+            zdepw(:,:,jk) = gdepw(:,:,jk,Kmm)
+         END DO
 
          DO jtype = 1, nproftypes
@@ -687 +695 @@
                   &               nit000, idaystp, jvar,                   &
                   &               zprofvar(:,:,:,jvar),                    &
-                  &               gdept(:,:,:,Kmm), gdepw(:,:,:,Kmm),      &
+                  &               zdept(:,:,:), zdepw(:,:,:),      &
                   &               zprofmask(:,:,:,jvar),                   &
                   &               zglam(:,:,jvar), zgphi(:,:,jvar),        &
@@ -697 +705 @@
 
          END DO
+
+         DEALLOCATE( zdept, zdepw )
 
       ENDIF

NEMO/trunk/src/OCE/OBS/obs_prep.F90

@@ -33 +33 @@
    PUBLIC   calc_month_len   ! Calculate the number of days in the months of a year
 
+#  include "domzgr_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
@@ -1074 +1075 @@
          & gdepw_1d,      &
          & gdepw_0,       &                       
-         & gdepw,         &
+         & gdepw, r3t,    &
          & gdept,         &
          & ln_zco,        &
@@ -1128 +1129 @@
          & zglam, &           ! Model longitude at grid points
          & zgphi              ! Model latitude at grid points
+      REAL(wp), DIMENSION(jpi,jpj,jpk) :: zdepw
       INTEGER, DIMENSION(2,2,kprofno) :: &
          & igrdi, &           ! Grid i,j
@@ -1186 +1188 @@
       CALL obs_int_comm_2d( 2, 2, kprofno, kpi, kpj, igrdi, igrdj, plam, zglam )
       CALL obs_int_comm_2d( 2, 2, kprofno, kpi, kpj, igrdi, igrdj, pphi, zgphi )
-      CALL obs_int_comm_3d( 2, 2, kprofno, kpi, kpj, kpk, igrdi, igrdj, gdepw(:,:,:,Kmm), &
-        &                     zgdepw )
+      DO jk = 1, jpk
+         zdepw(:,:,jk) = gdepw(:,:,jk,Kmm)
+      END DO
+      CALL obs_int_comm_3d( 2, 2, kprofno, kpi, kpj, kpk, igrdi, igrdj, zdepw(:,:,:), zgdepw )
 
       DO jobs = 1, kprofno