Changeset 15574 for NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/OBS/diaobs.F90

Timestamp:

2021-12-03T20:32:50+01:00 (3 years ago)

Author:

techene

Message:

#2605 #2715 trunk merged into dev_r14318_RK3_stage1

Location:

NEMO/branches/2021/dev_r14318_RK3_stage1

Files:

• . (modified) (1 prop)
• src/OCE/OBS/diaobs.F90 (modified) (8 diffs)

NEMO/branches/2021/dev_r14318_RK3_stage1

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/OBS/diaobs.F90

@@ -97 +97 @@
    TYPE(obs_prof), PUBLIC, POINTER, DIMENSION(:) ::   profdataqc   !: Profile data after quality control
 
-   CHARACTER(len=8), PUBLIC, DIMENSION(:), ALLOCATABLE ::   cobstypesprof, cobstypessurf   !: Profile & surface obs types
-
+   CHARACTER(len=lca), PUBLIC, DIMENSION(:), ALLOCATABLE ::   cobstypesprof, cobstypessurf   !: Profile & surface obs types
+
+#  include "domzgr_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
@@ -603 +604 @@
       !! ** Action  :
       !!----------------------------------------------------------------------
-      USE dom_oce, ONLY : gdept, gdept_1d     ! Ocean space domain variables (Kmm time-level only)
       USE phycst , ONLY : rday                ! Physical constants
       USE oce    , ONLY : ts, uu, vv, ssh     ! Ocean dynamics and tracers variables (Kmm time-level only)
@@ -623 +623 @@
       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 +634 @@
          & zglam,    &             ! Model longitudes for prof variables
          & zgphi                   ! Model latitudes for prof variables
+      REAL(wp), DIMENSION(:,:,:), ALLOCATABLE :: zdept, zdepw
 
       !-----------------------------------------------------------------------
@@ -650 +651 @@
 
       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 +694 @@
                   &               nit000, idaystp, jvar,                   &
                   &               zprofvar(:,:,:,jvar),                    &
-                  &               gdept(:,:,:,Kmm), gdepw(:,:,:,Kmm),      & 
+                  &               zdept(:,:,:), zdepw(:,:,:),      &
                   &               zprofmask(:,:,:,jvar),                   &
                   &               zglam(:,:,jvar), zgphi(:,:,jvar),        &
@@ -697 +704 @@
 
          END DO
+
+         DEALLOCATE( zdept, zdepw )
 
       ENDIF
@@ -1017 +1026 @@
       INTEGER, DIMENSION(ntypes), INTENT(OUT) :: &
          &                   ifiles      ! Out number of files for each type
-      CHARACTER(len=8), DIMENSION(ntypes), INTENT(IN) :: &
+      CHARACTER(len=lca), DIMENSION(ntypes), INTENT(IN) :: &
          &                   cobstypes   ! List of obs types
       CHARACTER(len=128), DIMENSION(ntypes, jpmaxnfiles), INTENT(IN) :: &

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+