Changeset 12036

Timestamp:

2019-12-03T13:00:09+01:00 (4 years ago)

Author:

kingr

Message:

Fix to update times only when bkg time-averged.

Location:

branches/UKMO/dev_r5518_obs_oper_update_SlaAssim/NEMOGCM/NEMO/OPA_SRC/OBS

Files:

• diaobs.F90 (modified) (1 diff)
• obs_read_surf.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_obs_oper_update_SlaAssim/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

@@ -919 +919 @@
                &               nvarssurf(jtype), nextrsurf(jtype), nitend-nit000+2, &
                &               rn_dobsini, rn_dobsend, MeanPeriodHours, ln_ignmis, .FALSE., &
-               &               llnightav(jtype), ltype_clim, clvars )
+               &               llnightav(jtype), ltype_clim, ln_time_mean_sla_bkg, clvars )
 
             CALL obs_pre_surf( surfdata(jtype), surfdataqc(jtype), ln_nea, ln_bound_reject )

branches/UKMO/dev_r5518_obs_oper_update_SlaAssim/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_surf.F90

@@ -40 +40 @@
    SUBROUTINE obs_rea_surf( surfdata, knumfiles, cdfilenames, &
       &                     kvars, kextr, kstp, ddobsini, ddobsend, MeanPeriodHours, &
-      &                     ldignmis, ldmod, ldnightav, ldclim, cdvars )
+      &                     ldignmis, ldmod, ldnightav, ldclim, ln_time_mean_sla_bkg, cdvars )
       !!---------------------------------------------------------------------
       !!
@@ -72 +72 @@
       LOGICAL, INTENT(IN) :: ldnightav  ! Observations represent a night-time average
       LOGICAL, INTENT(IN) :: ldclim     ! Will include climatology at obs points.
+      LOGICAL, INTENT(IN) :: ln_time_mean_sla_bkg     ! Will reset times to end of averaging period.
       REAL(dp), INTENT(IN) :: ddobsini   ! Obs. ini time in YYYYMMDD.HHMMSS
       REAL(dp), INTENT(IN) :: ddobsend   ! Obs. end time in YYYYMMDD.HHMMSS
@@ -284 +285 @@
             !If the observations are representing a time mean then set the time
             !of the obs to the end of that meaning period relative to the start of the run
-            IF ( MeanPeriodHours > 0._wp ) THEN
+            IF ( MeanPeriodHours > 0._wp .AND. ln_time_mean_sla_bkg ) THEN
                DO ji = 1, inpfiles(jj)%nobs
                   inpfiles(jj)%ptim(ji) = &