Changeset 6027


Ignore:
Timestamp:
2015-12-09T12:40:24+01:00 (5 years ago)
Author:
kingr
Message:

Merged James' bugfix from obs_prep into my development branch.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r4650_general_vert_coord_obsoper/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90

    r5838 r6027  
    17571757      REAL(KIND=wp), DIMENSION(2,2,kpk,kprofno) :: & 
    17581758         & zgmsk              ! Grid mask 
     1759      REAL(KIND=wp), DIMENSION(2,2,kpk,kprofno) :: & 
     1760         & zgdepw          
    17591761      REAL(KIND=wp), DIMENSION(2,2,kprofno) :: & 
    17601762         & zglam, &           ! Model longitude at grid points 
     
    18031805      CALL obs_int_comm_2d( 2, 2, kprofno, igrdi, igrdj, plam, zglam ) 
    18041806      CALL obs_int_comm_2d( 2, 2, kprofno, igrdi, igrdj, pphi, zgphi ) 
     1807      ! Need to know the bathy depth for each observation for sco 
     1808      CALL obs_int_comm_3d( 2, 2, kprofno, kpk, igrdi, igrdj, fsdepw(:,:,:), & 
     1809      &                     zgdepw ) 
    18051810 
    18061811      DO jobs = 1, kprofno 
     
    18781883               ! Flag if the observation is deeper than the bathymetry  
    18791884               ! Or if it is within the mask  
    1880                IF ( ALL( fsdepw(iig-1:iig+1,ijg-1:ijg+1,kpk) < pobsdep(jobsp) ) &  
     1885               IF ( ALL( zgdepw(1:2,1:2,kpk,jobs) < pobsdep(jobsp) ) & 
    18811886                  &     .OR. &  
    18821887                  &  ( SUM( zgmsk(1:2,1:2,kobsk(jobsp)-1:kobsk(jobsp),jobs) ) &  
     
    19081913            ENDIF 
    19091914            
     1915            ! Flag if the observation falls is close to land 
     1916            IF ( MINVAL( zgmsk(1:2,1:2,kobsk(jobsp)-1:kobsk(jobsp),jobs) ) == & 
     1917               &  0.0_wp) THEN 
     1918               IF (ld_nea) kobsqc(jobsp) = kobsqc(jobsp) + 14 
     1919               knlaobs = knlaobs + 1 
     1920            ENDIF 
    19101921 
    19111922            ! Set observation depth equal to that of the first model depth 
Note: See TracChangeset for help on using the changeset viewer.