Changeset 4292 for branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/OBS

Timestamp:

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

Author:

cetlod

Message:

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

Location:

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/OBS

Files:

• diaobs.F90 (modified) (4 diffs)
• obs_prep.F90 (modified) (8 diffs)
• obs_read_prof.F90 (modified) (1 diff)
• obs_read_vel.F90 (modified) (1 diff)

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

@@ -976 +976 @@
       USE dom_oce, ONLY : &             ! Ocean space and time domain variables
          & rdt,           &                       
-         & gdept_0,       &             
+         & gdept_1d,       &             
          & tmask, umask, vmask                            
       USE phycst, ONLY : &              ! Physical constants
@@ -1038 +1038 @@
                   &              kstp, jpi, jpj, jpk, nit000, idaystp,   &
                   &              tsn(:,:,:,jp_tem), tsn(:,:,:,jp_sal),   &
-                  &              gdept_0, tmask, n1dint, n2dint,         &
+                  &              gdept_1d, tmask, n1dint, n2dint,        &
                   &              kdailyavtypes = endailyavtypes )
             ELSE
@@ -1044 +1044 @@
                   &              kstp, jpi, jpj, jpk, nit000, idaystp,   &
                   &              tsn(:,:,:,jp_tem), tsn(:,:,:,jp_sal),   &
-                  &              gdept_0, tmask, n1dint, n2dint               )
+                  &              gdept_1d, tmask, n1dint, n2dint              )
             ENDIF
          END DO
@@ -1088 +1088 @@
            ! zonal component of velocity
            CALL obs_vel_opt( veldatqc(jveloset), kstp, jpi, jpj, jpk, &
-              &              nit000, idaystp, un, vn, gdept_0, umask, vmask, &
+              &              nit000, idaystp, un, vn, gdept_1d, umask, vmask, &
                              n1dint, n2dint, ld_velav(jveloset) )
          END DO

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

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

@@ -793 +793 @@
       !-----------------------------------------------------------------------
       IF ( ldt3d ) THEN
-         CALL obs_level_search( jpk, gdept_0, &
+         CALL obs_level_search( jpk, gdept_1d, &
             & profdata%nvprot(1), profdata%var(1)%vdep, &
             & profdata%var(1)%mvk )
       ENDIF
       IF ( lds3d ) THEN
-         CALL obs_level_search( jpk, gdept_0, &
+         CALL obs_level_search( jpk, gdept_1d, &
             & profdata%nvprot(2), profdata%var(2)%vdep, &
             & profdata%var(2)%mvk )

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

@@ -614 +614 @@
       ! Model level search
       !-----------------------------------------------------------------------
-      CALL obs_level_search( jpk, gdept_0, &
+      CALL obs_level_search( jpk, gdept_1d,          &
          & profdata%nvprot(1), profdata%var(1)%vdep, &
          & profdata%var(1)%mvk )
-      CALL obs_level_search( jpk, gdept_0, &
+      CALL obs_level_search( jpk, gdept_1d,          &
          & profdata%nvprot(2), profdata%var(2)%vdep, &
          & profdata%var(2)%mvk )