- Timestamp:
- 2019-11-22T15:29:17+01:00 (4 years ago)
- Location:
- NEMO/branches/2019/dev_r11943_MERGE_2019/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r11943_MERGE_2019/src
- Property svn:mergeinfo deleted
-
NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/OBS/obs_readmdt.F90
r10425 r11949 25 25 & tmask, tmask_i, e1e2t, gphit, glamt 26 26 USE obs_const, ONLY : obfillflt ! Fillvalue 27 USE oce , ONLY : ssh n! Model variables27 USE oce , ONLY : ssh ! Model variables 28 28 29 29 IMPLICIT NONE … … 44 44 CONTAINS 45 45 46 SUBROUTINE obs_rea_mdt( sladata, k2dint )46 SUBROUTINE obs_rea_mdt( sladata, k2dint, Kmm ) 47 47 !!--------------------------------------------------------------------- 48 48 !! … … 59 59 TYPE(obs_surf), INTENT(inout) :: sladata ! SLA data 60 60 INTEGER , INTENT(in) :: k2dint ! ? 61 INTEGER , INTENT(in) :: Kmm ! ? 61 62 ! 62 63 CHARACTER(LEN=12), PARAMETER :: cpname = 'obs_rea_mdt' … … 106 107 ! Remove the offset between the MDT used with the sla and the model MDT 107 108 IF( nn_msshc == 1 .OR. nn_msshc == 2 ) & 108 & CALL obs_offset_mdt( jpi, jpj, z_mdt, zfill )109 & CALL obs_offset_mdt( jpi, jpj, z_mdt, zfill, Kmm ) 109 110 110 111 ! Intepolate the MDT already on the model grid at the observation point … … 169 170 170 171 171 SUBROUTINE obs_offset_mdt( kpi, kpj, mdt, zfill )172 SUBROUTINE obs_offset_mdt( kpi, kpj, mdt, zfill, Kmm ) 172 173 !!--------------------------------------------------------------------- 173 174 !! … … 183 184 !!---------------------------------------------------------------------- 184 185 INTEGER, INTENT(IN) :: kpi, kpj 186 INTEGER, INTENT(IN) :: Kmm 185 187 REAL(wp), DIMENSION(kpi,kpj), INTENT(INOUT) :: mdt ! MDT used on the model grid 186 188 REAL(wp) , INTENT(IN ) :: zfill … … 216 218 zarea = zarea + zdxdy 217 219 zeta1 = zeta1 + mdt(ji,jj) * zdxdy 218 zeta2 = zeta2 + ssh n (ji,jj) * zdxdy220 zeta2 = zeta2 + ssh(ji,jj,Kmm) * zdxdy 219 221 END DO 220 222 END DO
Note: See TracChangeset
for help on using the changeset viewer.