Changeset 15285 for NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/obs_readmdt.F90

Timestamp:

2021-09-24T12:33:16+02:00 (16 months ago)

Author:

dford

Message:

Some bug fixes.

File:

• NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/obs_readmdt.F90 (modified) (6 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/obs_readmdt.F90

@@ -31 +31 @@
    
    PUBLIC   obs_rea_mdt     ! called by dia_obs_init
-   PUBLIC   obs_offset_mdt  ! called by obs_rea_mdt
-
-   INTEGER , PUBLIC :: nn_msshc    = 1         ! MDT correction scheme
-   REAL(wp), PUBLIC :: rn_mdtcorr   = 1.61_wp  ! User specified MDT correction
-   REAL(wp), PUBLIC :: rn_mdtcutoff = 65.0_wp  ! MDT cutoff for computed correction
 
    !!----------------------------------------------------------------------
@@ -44 +39 @@
 CONTAINS
 
-   SUBROUTINE obs_rea_mdt( sladata, k2dint, kmdt )
+   SUBROUTINE obs_rea_mdt( sladata, k2dint, kmdt, nn_msshc, rn_mdtcorr, &
+                           rn_mdtcutoff )
       !!---------------------------------------------------------------------
       !!
@@ -57 +53 @@
       USE iom
       !
-      TYPE(obs_surf), INTENT(inout) ::   sladata   ! SLA data
-      INTEGER       , INTENT(in)    ::   k2dint    ! ?
-      INTEGER       , INTENT(in)    ::   kmdt      ! Index of MDT extra var
+      TYPE(obs_surf), INTENT(inout) :: sladata      ! SLA data
+      INTEGER       , INTENT(in)    :: k2dint       ! Interpolation type
+      INTEGER       , INTENT(in)    :: kmdt         ! Index of MDT extra var
+      INTEGER       , INTENT(in)    :: nn_msshc     ! MDT correction scheme
+      REAL(wp)      , INTENT(in)    :: rn_mdtcorr   ! User specified MDT correction
+      REAL(wp)      , INTENT(in)    :: rn_mdtcutoff ! MDT cutoff for computed correction
       !
       CHARACTER(LEN=12), PARAMETER ::   cpname  = 'obs_rea_mdt'
@@ -106 +105 @@
 
       ! Remove the offset between the MDT used with the sla and the model MDT
-      IF( nn_msshc == 1 .OR. nn_msshc == 2 ) &
-         & CALL obs_offset_mdt( jpi, jpj, z_mdt, zfill )
+      IF( nn_msshc == 1 .OR. nn_msshc == 2 ) THEN
+         CALL obs_offset_mdt( jpi, jpj, z_mdt, zfill, nn_msshc, &
+            &                 rn_mdtcorr, rn_mdtcutoff )
+      ENDIF
 
       ! Interpolate the MDT already on the model grid at the observation point
@@ -170 +171 @@
 
 
-   SUBROUTINE obs_offset_mdt( kpi, kpj, mdt, zfill )
+   SUBROUTINE obs_offset_mdt( kpi, kpj, mdt, zfill, nn_msshc, rn_mdtcorr, &
+                              rn_mdtcutoff )
       !!---------------------------------------------------------------------
       !!
@@ -184 +186 @@
       !!----------------------------------------------------------------------
       INTEGER, INTENT(IN) ::  kpi, kpj
-      REAL(wp), DIMENSION(kpi,kpj), INTENT(INOUT) ::   mdt     ! MDT used on the model grid
-      REAL(wp)                    , INTENT(IN   ) ::   zfill 
+      REAL(wp), DIMENSION(kpi,kpj), INTENT(INOUT) :: mdt          ! MDT used on the model grid
+      REAL(wp)                    , INTENT(IN   ) :: zfill        ! Fill value
+      INTEGER                     , INTENT(IN   ) :: nn_msshc     ! MDT correction scheme
+      REAL(wp)                    , INTENT(IN   ) :: rn_mdtcorr   ! User specified MDT correction
+      REAL(wp)                    , INTENT(IN   ) :: rn_mdtcutoff ! MDT cutoff for computed correction
       ! 
       INTEGER  :: ji, jj