Changeset 4292 for branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90

Timestamp:

2013-11-20T17:28:04+01:00 (11 years ago)

Author:

cetlod

Message:

dev_MERGE_2013 : 1st step of the merge, see ticket #1185

File:

• branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90 (modified) (8 diffs)

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90

@@ -75 +75 @@
          & glamt,   &
          & gphit,   &
-         & gdept_0, &
+         & gdept_1d,&
          & tmask,   &
          & nproc
@@ -193 +193 @@
          &                 profdata%var(1)%vdep,                        &
          &                 glamt,                 gphit,                &
-         &                 gdept_0,               tmask,                &
+         &                 gdept_1d,              tmask,                &
          &                 profdata%nqc,          profdata%var(1)%nvqc, &
          &                 iosdtobs,              ilantobs,             &
@@ -213 +213 @@
          &                 profdata%var(2)%vdep,                        &
          &                 glamt,                 gphit,                &
-         &                 gdept_0,               tmask,                &
+         &                 gdept_1d,              tmask,                &
          &                 profdata%nqc,          profdata%var(2)%nvqc, &
          &                 iosdsobs,              ilansobs,             &
@@ -916 +916 @@
          & glamt, glamu, glamv,    &
          & gphit, gphiu, gphiv,    &
-         & gdept_0, &
+         & gdept_1d,             &
          & tmask, umask, vmask,  &
          & nproc
@@ -1032 +1032 @@
          &                 profdata%var(1)%vdep,                        &
          &                 glamu,                 gphiu,                &
-         &                 gdept_0,               umask,                &
+         &                 gdept_1d,              umask,                &
          &                 profdata%nqc,          profdata%var(1)%nvqc, &
          &                 iosduobs,              ilanuobs,             &
@@ -1052 +1052 @@
          &                 profdata%var(2)%vdep,                        &
          &                 glamv,                 gphiv,                &
-         &                 gdept_0,               vmask,                &
+         &                 gdept_1d,              vmask,                &
          &                 profdata%nqc,          profdata%var(2)%nvqc, &
          &                 iosdvobs,              ilanvobs,             &
@@ -1709 +1709 @@
       !! * Modules used
       USE dom_oce, ONLY : &       ! Geographical information
-         & gdepw_0                        
+         & gdepw_1d                        
 
       !! * Arguments
@@ -1826 +1826 @@
                &  .OR. ( pobsphi(jobs) >   90.         )       &
                &  .OR. ( pobsdep(jobsp) < 0.0          )       &
-               &  .OR. ( pobsdep(jobsp) > gdepw_0(kpk) ) ) THEN
+               &  .OR. ( pobsdep(jobsp) > gdepw_1d(kpk)) ) THEN
                kobsqc(jobsp) = kobsqc(jobsp) + 11
                kosdobs = kosdobs + 1