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

Timestamp:

2021-08-13T11:34:58+02:00 (3 years ago)

Author:

dford

Message:

Update treatment of SLA and POTM additional/extra variables.

File:

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

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

@@ -44 +44 @@
 CONTAINS
 
-   SUBROUTINE obs_rea_mdt( sladata, k2dint )
+   SUBROUTINE obs_rea_mdt( sladata, k2dint, kmdt )
       !!---------------------------------------------------------------------
       !!
@@ -59 +59 @@
       TYPE(obs_surf), INTENT(inout) ::   sladata   ! SLA data
       INTEGER       , INTENT(in)    ::   k2dint    ! ?
+      INTEGER       , INTENT(in)    ::   kmdt      ! Index of MDT extra var
       !
       CHARACTER(LEN=12), PARAMETER ::   cpname  = 'obs_rea_mdt'
@@ -148 +149 @@
          CALL obs_int_h2d( 1, 1, zweig, zmdtl(:,:,jobs),  zext )
 
-! FIGURE OUT THIS ASSIGNMENT 
-!         sladata%rext(jobs,2) = zext(1)
+         sladata%rext(jobs,kmdt) = zext(1)
 
 ! mark any masked data with a QC flag
@@ -247 +247 @@
          WRITE(numout,*) '               zcorr         = ', zcorr
          WRITE(numout,*) '               nn_msshc        = ', nn_msshc
+
+         IF ( nn_msshc == 0 ) WRITE(numout,*) '           MSSH correction is not applied'
+         IF ( nn_msshc == 1 ) WRITE(numout,*) '           MSSH correction is applied'
+         IF ( nn_msshc == 2 ) WRITE(numout,*) '           User defined MSSH correction' 
       ENDIF
-
-      IF ( nn_msshc == 0 ) WRITE(numout,*) '           MSSH correction is not applied'
-      IF ( nn_msshc == 1 ) WRITE(numout,*) '           MSSH correction is applied'
-      IF ( nn_msshc == 2 ) WRITE(numout,*) '           User defined MSSH correction' 
 
       !