Changeset 4048

Timestamp:

2013-10-02T18:32:18+02:00 (11 years ago)

Author:

djlea

Message:

Cleaning and debugging of the observation operator. Turn off the night time averaging of SST data by default, but add a namelist option to switch it on.

Location:

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO

Files:

• OOO_SRC/off_data.F90 (modified) (4 diffs)
• OOO_SRC/off_oper.F90 (modified) (2 diffs)
• OOO_SRC/off_read.F90 (modified) (7 diffs)
• OOO_SRC/off_write.F90 (modified) (7 diffs)
• OPA_SRC/OBS/diaobs.F90 (modified) (7 diffs)
• OPA_SRC/OBS/obs_fbm.F90 (modified) (9 diffs)
• OPA_SRC/OBS/obs_oper.F90 (modified) (1 diff)

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO/OOO_SRC/off_data.F90

@@ -3 +3 @@
    IMPLICIT NONE
    INTEGER, PARAMETER :: MaxNumFiles = 1000
+
    !! Class 4 file settings
    INTEGER :: &
-           &  cl4_fclen, &            !: number of forecast days
-           &  jimatch, &              !: current match
-           &  n_match                 !: number of matches
+           & cl4_fcst_idx(MaxNumFiles), & !: forecast indices
+           & cl4_match_len, &             !: number of match types
+           & cl4_fcst_len                 !: number of forecast days
    CHARACTER(len=lc) :: &
-           & cl4_vars(MaxNumFiles), & !: class 4 variables
-           & cl4_sys, &               !: class 4 system
-           & cl4_cfg, &               !: class 4 configuration
-           & cl4_date, &              !: class 4 date
-           & cl4_vn,  &               !: class 4 version
-           & cl4_prefix, &            !: class 4 prefix
-           & cl4_contact, &           !: class 4 contact
-           & cl4_inst                 !: class 4 institute
-   REAL ::   cl4_modjuld              !: model Julian day
+           & cl4_vars(MaxNumFiles), &  !: class 4 variables
+           & cl4_sys, &                !: class 4 system
+           & cl4_cfg, &                !: class 4 configuration
+           & cl4_date, &               !: class 4 date
+           & cl4_vn,  &                !: class 4 version
+           & cl4_prefix, &             !: class 4 prefix
+           & cl4_contact, &            !: class 4 contact
+           & cl4_inst                  !: class 4 institute
+   REAL ::   cl4_modjuld               !: model Julian day
    REAL :: &
-      & cl4_leadtime(MaxNumFiles)     !: Lead time data
+      & cl4_leadtime(MaxNumFiles)      !: Lead time data
+
    !! Offline obs_oper settings
    CHARACTER(len=lc) :: &
-      & model_files(MaxNumFiles)      !: model files
+      & off_files(MaxNumFiles)         !: model files
    INTEGER            :: &
-      & nn_modindex(MaxNumFiles), &   !: model file indices
-      & nn_forecast(MaxNumFiles)      !: forecast indices
+      & jifile, &                      !: current file list index
+      & n_files, &                     !: number of files
+      & jimatch, &                     !: current match
+      & nn_off_idx(MaxNumFiles), &     !: time_counter indices
+      & nn_off_freq                    !: read frequency in time steps
    CHARACTER(len=128) :: &
-      & alt_file                      !: altimeter file
+      & alt_file                       !: altimeter file
 CONTAINS
    SUBROUTINE off_data_init( ld_cl4 )
@@ -44 +49 @@
 
       ! Standard offline obs_oper information
-      NAMELIST/namoff/model_files, nn_modindex, nn_forecast
+      NAMELIST/namoff/off_files, nn_off_idx, nn_off_freq
 
       ! Class 4 file specifiers
       NAMELIST/namcl4/cl4_vars, cl4_sys, cl4_cfg, cl4_date, cl4_vn, &
          &            cl4_prefix, cl4_contact, cl4_inst, cl4_leadtime, &
-         &            cl4_fclen
+         &            cl4_fcst_idx, cl4_fcst_len, cl4_match_len
 
       ! Standard offline obs_oper initialisation
-      jimatch = 0                   !: match iteration variable 
-      n_match = 0                   !: number of matches to perform
-      model_files(:) = ''           !: list of files to read in
-      nn_modindex(:) = 0            !: list of indices inside each file
+      jimatch = 0                   !: match-up iteration variable 
+      jifile = 1                    !: input file iteration variable 
+      n_files = 0                   !: number of files to cycle through
+      off_files(:) = ''             !: list of files to read in
+      nn_off_idx(:) = 0             !: list of indices inside each file
+      nn_off_freq = -1              !: input frequency in time steps
 
       ! Class 4 initialisation
       cl4_leadtime(:) = 0           !: Lead time axis value for each file
-      cl4_fclen = 0                 !: Length of the forecast dimension
+      cl4_fcst_len = 0              !: Length of the forecast dimension
+      cl4_match_len = 1             !: Number of match types
+      cl4_fcst_idx(:) = 0           !: output file forecast index
       cl4_vars(:) = ''              !: output file variable names
       cl4_sys = ''                  !: output file system
@@ -77 +86 @@
       ENDIF
 
-      ! count forecast/persistence files
+      ! count input files
       lmask(:) = .FALSE.
-      WHERE (model_files(:) /= '') lmask(:) = .TRUE.
-      n_match = COUNT(lmask)
+      WHERE (off_files(:) /= '') lmask(:) = .TRUE.
+      n_files = COUNT(lmask)
 
+      !! Initialise sub obs window frequency
+      IF (nn_off_freq == -1) THEN
+         !! Run length
+         nn_off_freq = nitend - nit000 + 1
+      ENDIF
+
+      !! Print summary of settings
       IF(lwp) THEN
          WRITE(numout,*)
@@ -87 +103 @@
          WRITE(numout,*) '~~~~~~~~~~~~~~~~~'
          WRITE(numout,*) '   Namelist namoff : set offline obs_oper parameters' 
-         DO jf = 1, n_match
+         DO jf = 1, n_files
             WRITE(numout,'(1X,2A)') '   Input forecast file name          forecastfile = ', &
-               TRIM(model_files(jf))
+               TRIM(off_files(jf))
             WRITE(numout,*) '   Input forecast file index        forecastindex = ', &
-               nn_modindex(jf)
-            WRITE(numout,*) '   Input forecast leadtime index    leadtimeindex = ', &
-               nn_forecast(jf)
-            WRITE(numout,*) '   Input forecast leadtime value    leadtimevalue = ', &
+               nn_off_idx(jf)
+            WRITE(numout,*) '   Output forecast leadtime index   leadtimeindex = ', &
+               cl4_fcst_idx(jf)
+            WRITE(numout,*) '   Output forecast leadtime value   leadtimevalue = ', &
                cl4_leadtime(jf)
             WRITE(numout,'(1X,2A)') '   Input class 4 variable       class 4 parameter = ', &

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO/OOO_SRC/off_oper.F90

@@ -40 +40 @@
          CALL off_oper_init
          !! Loop over various model counterparts
-         DO jimatch = 1, n_match
+         DO jimatch = 1, cl4_match_len
             IF (jimatch .GT. 1) THEN
                !! Initialise obs_oper
                CALL dia_obs_init
             END IF
-            !! Read next model counterpart
-            CALL off_rea_dri
             !! Interpolate to observation space
             CALL off_oper_interp
@@ -64 +62 @@
          !! ** Purpose : To interpolate the model as if it were running online.
          !!
+         !! ** Method : 1. Populate model counterparts
+         !!             2. Call dia_obs at appropriate time steps
          !!----------------------------------------------------------------------
          IMPLICIT NONE
          INTEGER :: istp ! time step index
+         !! Loop over entire run
          istp = nit000
          nstop = 0
          DO WHILE ( istp <= nitend .AND. nstop == 0 )
-            CALL dia_obs(istp)
+            IF (jifile <= n_files + 1) THEN
+               IF ( MOD(istp, nn_off_freq) == nit000 ) THEN
+                  !! Read next model counterpart
+                  CALL off_rea_dri(jifile)
+                  jifile = jifile + 1
+               ENDIF
+               !! Interpolate single time step
+               CALL dia_obs(istp)
+            ENDIF
+            !! Increment model step
             istp = istp + 1
          END DO

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO/OOO_SRC/off_read.F90

@@ -23 +23 @@
 
 CONTAINS
-   SUBROUTINE off_rea_dri
+   SUBROUTINE off_rea_dri(kfile)
       IMPLICIT NONE
+      INTEGER, INTENT(IN) :: &
+              & kfile         !: File number
       CHARACTER(len=lc) :: &
               & cdfilename, & !: File name
@@ -30 +32 @@
       INTEGER :: &
               & kindex       !: File index to read
-      cdfilename = TRIM(model_files(jimatch))
-      cmatchname = TRIM(cl4_vars(jimatch))
-      kindex = nn_modindex(jimatch)
-      IF (TRIM(cmatchname) == 'forecast') THEN
-         CALL off_read_dailymean(TRIM(cdfilename), kindex)
-         CALL off_read_juld(TRIM(cdfilename), kindex, cl4_modjuld)
-      ELSE IF (TRIM(cmatchname) == 'persistence') THEN
-         CALL off_read_dailymean(TRIM(cdfilename), kindex)
+ 
+      !! Filename, index and match-up kind
+      cdfilename = TRIM(off_files(kfile))
+      cmatchname = TRIM(cl4_vars(kfile))
+      kindex = nn_off_idx(kfile)
+
+      !! Update model fields
+      !! Class 4 variables: forecast, persistence,
+      !!                    nrt_analysis, best_estimate
+      !! Feedback variables: empty string
+      IF ( (TRIM(cmatchname) == 'forecast') .OR. &
+         & (TRIM(cmatchname) == 'persistence') .OR. &
+         & (TRIM(cmatchname) == 'nrt_analysis') .OR. &
+         & (TRIM(cmatchname) == 'best_estimate').OR. &
+         & (TRIM(cmatchname) == '') ) THEN
+         CALL off_read_file(TRIM(cdfilename), kindex)
          CALL off_read_juld(TRIM(cdfilename), kindex, cl4_modjuld)
       ELSE IF (TRIM(cmatchname) == 'climatology') THEN
@@ -44 +54 @@
          CALL off_read_altbias(TRIM(cdfilename))
          CALL off_read_juld(TRIM(cdfilename), kindex, cl4_modjuld)
-      ELSE IF (TRIM(cmatchname) == '') THEN
-         ! Feedback file settings
-         CALL off_read_dailymean(TRIM(cdfilename), kindex)
-         CALL off_read_juld(TRIM(cdfilename), kindex, cl4_modjuld)
       END IF
+
    END SUBROUTINE off_rea_dri
 
@@ -83 +90 @@
       ELSE
          ! Open Netcdf file to find dimension id
-         istat = nf90_open(trim(filename),nf90_noclobber,ncid)
+         istat = nf90_open(trim(filename),nf90_nowrite,ncid)
          istat = nf90_inq_dimid(ncid,'x',xdim)
          istat = nf90_inq_dimid(ncid,'y',ydim)
@@ -127 +134 @@
    END SUBROUTINE off_read_altbias
 
-   SUBROUTINE off_read_dailymean(filename, ifcst)
+   SUBROUTINE off_read_file(filename, ifcst)
       IMPLICIT NONE
       !------------------------------------------------------------------------
       !
-      !             ** off_read_dailymean **
+      !             ** off_read_file **
       !
       ! Purpose : To fill tn and sn with dailymean field from netcdf files
@@ -255 +262 @@
          istat = nf90_close(ncid)
       END IF
-   END SUBROUTINE off_read_dailymean
+   END SUBROUTINE off_read_file
 
    SUBROUTINE off_read_juld(filename, ifcst, julian)
@@ -291 +298 @@
       time_str=''
       !! Read in time_counter and remainder seconds
-      istat = nf90_open(trim(filename),nf90_noclobber,ncid)
+      istat = nf90_open(trim(filename),nf90_nowrite,ncid)
       istat = nf90_inq_dimid(ncid,'time_counter',dimid)
       IF (istat /= nf90_noerr) THEN

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO/OOO_SRC/off_write.F90

@@ -23 +23 @@
 
    INTERFACE off_wri_extra
-      MODULE PROCEDURE off_wri_extra_3d, off_wri_extra_4d, off_wri_extra_4d_index
+      MODULE PROCEDURE off_wri_extra_3d_index, off_wri_extra_4d, off_wri_extra_4d_index
    END INTERFACE
 
    CONTAINS
 
-      SUBROUTINE off_wri_extra_3d(cdfilename, cdvarname, ndeps, nvars, &
-                               &  nobs, pdata)
+      SUBROUTINE off_wri_extra_3d_index(cdfilename, cdvarname, ndeps, nvars, &
+                               &  nobs, kstart, kcount, pdata)
          !!----------------------------------------------------------------------
          !!                    ***  ROUTINE off_wri_extra_3d  ***
@@ -43 +43 @@
                  & cdfilename, & !: netcdf file name
                  & cdvarname     !: netcdf variable name
+         INTEGER, DIMENSION(3), INTENT(IN) :: &
+                 & kstart, &     !: start indices
+                 & kcount        !: count indices
          REAL(KIND=cldp), DIMENSION(ndeps, nvars, nobs), INTENT(IN) :: &
                  & pdata         !: 3d data
@@ -54 +57 @@
          ! Write data
          CALL chkerr(nf90_inq_varid(ncid,TRIM(cdvarname), varid),cpname, __LINE__ )
-         CALL chkerr(nf90_put_var(ncid, varid, pdata),cpname, __LINE__ )
+         CALL chkerr(nf90_put_var(ncid, varid, pdata, kstart, kcount),cpname, __LINE__ )
          ! Close netcdf file
          CALL chkerr(nf90_close(ncid), cpname, __LINE__ )
-      END SUBROUTINE off_wri_extra_3d
+      END SUBROUTINE off_wri_extra_3d_index
 
       SUBROUTINE off_wri_extra_4d_index(cdfilename, cdvarname, ndeps, nfcst, &
@@ -249 +252 @@
       END SUBROUTINE off_wri_default
 
-      SUBROUTINE off_wri_init(cconf, csys, ckind, cversion, cdate, &
-                            & nproc, nobs, nvars, ndeps, nfcst, &
-                            & cdfilename)
+      SUBROUTINE off_wri_init(cconf, csys, ckind, cversion, ccont, &
+                            & cinst, cdate, nproc, nobs, nvars, &
+                            & ndeps, nfcst, cdfilename)
          !!----------------------------------------------------------------------
          !!                    ***  ROUTINE off_wri_init  ***
@@ -265 +268 @@
                  & ckind, &      !: observation kind e.g. profile
                  & cversion, &   !: model version e.g. 12.0
+                 & ccont, &      !: contact email
+                 & cinst, &      !: institution description
                  & cdate         !: e.g. yyyymmdd
          INTEGER, INTENT(IN) :: &
@@ -358 +363 @@
                & TRIM(ref_date) ), cpname, __LINE__ )
             CALL chkerr( nf90_put_att(ncid, nf90_global, 'contact', &
-               & 'andrew.ryan@metoffice.gov.uk' ), cpname, __LINE__ )
+               & TRIM(ccont) ), cpname, __LINE__ )
             CALL chkerr( nf90_put_att(ncid, nf90_global, 'obs_type', &
                & TRIM(ckind) ), cpname, __LINE__ )
@@ -365 +370 @@
             CALL chkerr( nf90_put_att(ncid, nf90_global, 'configuration', &
                & TRIM(cconf) ), cpname, __LINE__ ) 
-           CALL chkerr( nf90_put_att(ncid, nf90_global, 'institution', &
-              & 'UK Met Office' ), cpname, __LINE__ ) 
+            CALL chkerr( nf90_put_att(ncid, nf90_global, 'institution', &
+               & TRIM(cinst) ), cpname, __LINE__ ) 
 
             !! Define Dimensions

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

@@ -82 +82 @@
    LOGICAL, PUBLIC :: ln_ssh         !: Logical switch for sea surface height
    LOGICAL, PUBLIC :: ln_sss         !: Logical switch for sea surface salinity
+   LOGICAL, PUBLIC :: ln_sstnight    !: Logical switch for night mean SST observations
    LOGICAL, PUBLIC :: ln_nea         !: Remove observations near land
    LOGICAL, PUBLIC :: ln_altbias     !: Logical switch for altimeter bias  
@@ -169 +170 @@
          &            nmsshc, mdtcorr, mdtcutoff,                     &
          &            ln_reysst, ln_ghrsst, reysstname, reysstfmt,    &
+         &            ln_sstnight,                                    &
          &            ln_grid_search_lookup,                          &
          &            grid_search_file, grid_search_res,              &
@@ -228 +230 @@
       ln_velhradcp = .FALSE.
       ln_velfb = .FALSE.
+      ln_sstnight = .FALSE.
       ln_nea = .FALSE.
       ln_grid_search_lookup = .FALSE.
@@ -360 +363 @@
          WRITE(numout,*) '             Logical switch for GHRSST observations          ln_ghrsst = ', ln_ghrsst
          WRITE(numout,*) '             Logical switch for feedback SST data             ln_sstfb = ', ln_sstfb
+         WRITE(numout,*) '             Logical switch for night-time SST obs         ln_sstnight = ', ln_sstnight
          WRITE(numout,*) '             Logical switch for SSS observations                ln_sss = ', ln_sss
          WRITE(numout,*) '             Logical switch for Sea Ice observations         ln_seaice = ', ln_seaice
@@ -753 +757 @@
             nsstsets = nsstsets + 1
 
-            ld_sstnight(nsstsets) = .TRUE.
+            ld_sstnight(nsstsets) = ln_sstnight
 
             CALL obs_rea_sst_rey( reysstname, reysstfmt, sstdata(nsstsets), &
@@ -767 +771 @@
             nsstsets = nsstsets + 1
 
-            ld_sstnight(nsstsets) = .TRUE.
+            ld_sstnight(nsstsets) = ln_sstnight
           
             CALL obs_rea_sst( 1, sstdata(nsstsets), jnumsst, &
@@ -786 +790 @@
                nsstsets = nsstsets + 1
 
-               ld_sstnight(nsstsets) = .TRUE.
+               ld_sstnight(nsstsets) = ln_sstnight
             
                CALL obs_rea_sst( 0, sstdata(nsstsets), 1, &

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO/OPA_SRC/OBS/obs_fbm.F90

@@ -1044 +1044 @@
       TYPE(obfbdata)   :: fbdata     ! obsfbdata structure
       IF (ln_cl4) THEN
-          WRITE(*,*) "DEBUG: Writing class 4 file outputs"
           ! Class 4 file output stream
           CALL write_obfbdata_cl( cdfilename, fbdata )
       ELSE
-          WRITE(*,*) "DEBUG: Writing feedback file outputs"
           ! Standard feedback file output stream
           CALL write_obfbdata_fb( cdfilename, fbdata )
@@ -1579 +1577 @@
               & cconf, &   !: model configuration
               & csys, &    !: model system
+              & ccont, &   !: contact email
+              & cinst, &   !: institution
               & cversion   !: model version
       CHARACTER(len=8) :: &
@@ -1611 +1611 @@
       CHARACTER(len=128), DIMENSION(:), ALLOCATABLE :: &
               &  ctype       !: Instrument type
+      CHARACTER(len=nf90_max_name) :: &
+              & cdtmp        !: NetCDF variable name
       CHARACTER(len=8), DIMENSION(:), ALLOCATABLE :: &
               &  cwmo, &     !: Instrument WMO ID
@@ -1626 +1628 @@
       csys = TRIM(cl4_sys)
       cversion = TRIM(cl4_vn)
+      ccont = TRIM(cl4_contact)
+      cinst = TRIM(cl4_inst)
       cdate = TRIM(cl4_date)
       CALL locate_kind(cdfilename, ckind)
       kproc = narea
-      kfcst = cl4_fclen
+      kfcst = cl4_fcst_len
       kobs = fbdata%nobs
       kdeps = fbdata%nlev
@@ -1663 +1667 @@
             DO ivar = 1, kvars
                DO iobs = 1, kobs
-                   ! 1 symbolises good for fbdata
-                   ! fbimdi symbolises that qc has not been set
-                   ! Essentially, if any fbdata flag is not an element of {1, fbimdi}
-                   ! then set the class 4 flag to bad.
-                   ! Note: fbdata%ioqc is marked good if zero.
-                   IF (((fbdata%ioqc(iobs) /= 0) .AND. &
-                             & (fbdata%ioqc(iobs) /= fbimdi)) .OR. &
-                     & ((fbdata%ipqc(iobs) /= 1) .AND. &
-                             & (fbdata%ipqc(iobs) /= fbimdi)) .OR. &
-                     & ((fbdata%idqc(idep,iobs) /= 1) .AND. &
-                             & (fbdata%idqc(idep,iobs) /= fbimdi)) .OR. &
-                     & ((fbdata%ivqc(iobs,ivar) /= 1) .AND. &
-                             & (fbdata%ivqc(iobs,ivar) /= fbimdi)) .OR. &
-                     & ((fbdata%ivlqc(idep,iobs,ivar) /= 1) .AND. &
-                             & (fbdata%ivlqc(idep,iobs,ivar) /= fbimdi)) .OR. &
-                     & ((fbdata%itqc(iobs) /= 1) .AND. &
-                             & (fbdata%itqc(iobs) /= fbimdi))) THEN
-                      ! 1 symbolises bad for class 4 file
-                      k2qc(idep, ivar, iobs) = 1
-                   ELSE
-                      ! 0 symbolises good for class 4 file
-                      k2qc(idep, ivar, iobs) = 0
-                   END IF 
+                  ! 1 symbolises good for fbdata
+                  ! fbimdi symbolises that qc has not been set
+                  ! Essentially, if any fbdata flag is not an element of {1, fbimdi}
+                  ! then set the class 4 flag to bad.
+                  ! Note: fbdata%ioqc is marked good if zero.
+                  IF (((fbdata%ioqc(iobs) /= 0) .AND. &
+                            & (fbdata%ioqc(iobs) /= fbimdi)) .OR. &
+                    & ((fbdata%ipqc(iobs) /= 1) .AND. &
+                            & (fbdata%ipqc(iobs) /= fbimdi)) .OR. &
+                    & ((fbdata%idqc(idep,iobs) /= 1) .AND. &
+                            & (fbdata%idqc(idep,iobs) /= fbimdi)) .OR. &
+                    & ((fbdata%ivqc(iobs,ivar) /= 1) .AND. &
+                            & (fbdata%ivqc(iobs,ivar) /= fbimdi)) .OR. &
+                    & ((fbdata%ivlqc(idep,iobs,ivar) /= 1) .AND. &
+                            & (fbdata%ivlqc(idep,iobs,ivar) /= fbimdi)) .OR. &
+                    & ((fbdata%itqc(iobs) /= 1) .AND. &
+                            & (fbdata%itqc(iobs) /= fbimdi))) THEN
+                     ! 1 symbolises bad for class 4 file
+                     k2qc(idep, ivar, iobs) = 1
+                  ELSE
+                     ! 0 symbolises good for class 4 file
+                     k2qc(idep, ivar, iobs) = 0
+                  END IF 
                END DO
             END DO
@@ -1697 +1701 @@
          ! 1,2,3,4 --> 1,4,2,3
          pmod(:,:,:) = fbrmdi
-         ij = nn_forecast(jimatch)
+         ij = cl4_fcst_idx(jimatch)
          DO ii = 1,kdeps
             DO ik = 1, kvars
@@ -1710 +1714 @@
 
          ! Lead time of class 4 file is a global parameter
-         plead = cl4_leadtime(1:cl4_fclen)
+         plead = cl4_leadtime(1:cl4_fcst_len)
 
          ! Model Julian day
@@ -1725 +1729 @@
 
          ! Initialise class 4 file
-         CALL off_wri_init(cconf, csys, ckind, cversion, cdate, &
+         CALL off_wri_init(cconf, csys, ckind, cversion, ccont, cinst, cdate, &
                          & kproc, kobs, kvars, kdeps, kfcst, &
                          & clfilename)
@@ -1734 +1738 @@
                             & plam, pphi, pdep, ptim, pob, plead, &
                             & k2qc, pmodjuld)
-
          !! Write to optional variables
-         CALL off_wri_extra(clfilename, TRIM(cl4_vars(jimatch)), kdeps, kfcst, &
-                         &  kvars, kobs, (/ 1,ij,1,1 /), (/ kdeps,1,kvars,kobs /), pmod)
+         cdtmp = cl4_vars(jimatch)
+         IF ( (TRIM(cdtmp) == "forecast") .OR. &
+              (TRIM(cdtmp) == "persistence") ) THEN
+            !! 4D variables
+            CALL off_wri_extra(clfilename, TRIM(cdtmp), kdeps, kfcst, &
+                            &  kvars, kobs, (/ 1,ij,1,1 /), (/ kdeps,1,kvars,kobs /), pmod)
+         ELSE
+            !! 3D variables
+            CALL off_wri_extra(clfilename, TRIM(cdtmp), kdeps, &
+                            &  kvars, kobs, (/ 1,1,1 /), (/ kdeps,kvars,kobs /), pmod)
+         ENDIF
 
          DEALLOCATE(plam, pphi, ptim, pdep, plead, kqc, k2qc, &

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90

@@ -861 +861 @@
 
          ENDIF
-         
          sstdatqc%rmod(jobs,1) = zext(1)