Changeset 4048 for branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO/OOO_SRC/off_oper.F90

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.

File:

• branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO/OOO_SRC/off_oper.F90 (modified) (2 diffs)

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