Changeset 15226 for NEMO/branches/UKMO/NEMO_4.0.4_generic_obs

Timestamp:

2021-09-02T19:25:23+02:00 (3 years ago)

Author:

dford

Message:

Deal with variables not initialised on step zero.

Location:

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

Files:

• diaobs.F90 (modified) (4 diffs)
• obs_oper.F90 (modified) (1 diff)

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

@@ -339 +339 @@
       INTEGER :: jvar              ! Variable number
       INTEGER :: jgroup
-      INTEGER :: ji, jj            ! Loop counters
+      INTEGER :: ji, jj, jobs      ! Loop counters
+      LOGICAL :: lstp0             ! Flag special treatment on zeroth time step
       REAL(wp), DIMENSION(:,:,:), ALLOCATABLE :: &
          & zprofvar                ! Model values for variables in a prof ob
@@ -406 +407 @@
                DO jvar = 1, sobsgroups(jgroup)%nobstypes
 
+                  lstp0 = .FALSE.
                   SELECT CASE ( TRIM(sobsgroups(jgroup)%cobstypes(jvar)) )
                   CASE('SST')
@@ -419 +421 @@
                   CASE('ICECONC')
                      IF ( kstp == 0 ) THEN
-                        IF ( lwp .AND. sobsgroups(jgroup)%ssurfdataqc%nsstpmpp(1) > 0 ) THEN
-                           CALL ctl_warn( 'Sea-ice not initialised on zeroth '// &
-                              &           'time-step but some obs are valid then.' )
-                           WRITE(numout,*)sobsgroups(jgroup)%ssurfdataqc%nsstpmpp(1), &
-                              &           ' sea-ice obs will be missed'
-                        ENDIF
-!!! IS THIS ROBUST TO MULTIPLE TYPES IN A GROUP???
-                        sobsgroups(jgroup)%ssurfdataqc%nsurfup = sobsgroups(jgroup)%ssurfdataqc%nsurfup + &
-                           &                                     sobsgroups(jgroup)%ssurfdataqc%nsstp(1)
-                        CYCLE
+                        lstp0 = .TRUE.
                      ELSE
 #if defined key_cice || defined key_si3
@@ -439 +432 @@
                   END SELECT
 
-                  CALL obs_surf_opt( sobsgroups(jgroup)%ssurfdataqc,       &
-                     &               kstp, jpi, jpj,                       &
-                     &               nit000, idaystp,                      &
-                     &               jvar, zsurfvar,                       &
-                     &               sobsgroups(jgroup)%rmask(:,:,1,jvar), &
-                     &               sobsgroups(jgroup)%n2dint,            &
-                     &               sobsgroups(jgroup)%lnight,            &
-                     &               sobsgroups(jgroup)%ravglamscl,        &
-                     &               sobsgroups(jgroup)%ravgphiscl,        &
-                     &               sobsgroups(jgroup)%lfp_indegs,        &
-                     &               kssh=sobsgroups(jgroup)%nadd_ssh,     &
-                     &               kmdt=sobsgroups(jgroup)%next_mdt )
+                  IF ( lstp0 ) THEN
+                     IF ( sobsgroups(jgroup)%ssurfdataqc%nsstpmpp(1) > 0 ) THEN
+                        DO jobs = sobsgroups(jgroup)%ssurfdataqc%nsurfup + 1, &
+                           &      sobsgroups(jgroup)%ssurfdataqc%nsurfup + sobsgroups(jgroup)%ssurfdataqc%nsstp(1)
+                           sobsgroups(jgroup)%ssurfdata%nqc(jobs) = IBSET(sobsgroups(jgroup)%ssurfdata%nqc(jobs),13)
+                        END DO
+                        IF ( lwp ) THEN
+                           CALL ctl_warn( TRIM(sobsgroups(jgroup)%cobstypes(jvar))// &
+                              &           ' not initialised on zeroth '           // &
+                              &           'time-step but some obs are valid then.' )
+                           WRITE(numout,*)sobsgroups(jgroup)%ssurfdataqc%nsstpmpp(1), &
+                              &           TRIM(sobsgroups(jgroup)%cobstypes(jvar)),   &
+                              &           'observations will be flagged as bad'
+                        ENDIF
+                     ENDIF
+                     IF ( jvar == sobsgroups(jgroup)%ssurfdataqc%nvar ) THEN
+                        sobsgroups(jgroup)%ssurfdataqc%nsurfup = sobsgroups(jgroup)%ssurfdataqc%nsurfup + &
+                           &                                     sobsgroups(jgroup)%ssurfdataqc%nsstp(1)
+                     ENDIF
+                  ELSE
+                     CALL obs_surf_opt( sobsgroups(jgroup)%ssurfdataqc,       &
+                        &               kstp, jpi, jpj,                       &
+                        &               nit000, idaystp,                      &
+                        &               jvar, zsurfvar,                       &
+                        &               sobsgroups(jgroup)%rmask(:,:,1,jvar), &
+                        &               sobsgroups(jgroup)%n2dint,            &
+                        &               sobsgroups(jgroup)%lnight,            &
+                        &               sobsgroups(jgroup)%ravglamscl,        &
+                        &               sobsgroups(jgroup)%ravgphiscl,        &
+                        &               sobsgroups(jgroup)%lfp_indegs,        &
+                        &               kssh=sobsgroups(jgroup)%nadd_ssh,     &
+                        &               kmdt=sobsgroups(jgroup)%next_mdt )
+                  ENDIF
 
                END DO

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

@@ -795 +795 @@
       ENDIF
       !
-      surfdataqc%nsurfup = surfdataqc%nsurfup + isurf
+      IF ( kvar == surfdataqc%nvar ) THEN
+         surfdataqc%nsurfup = surfdataqc%nsurfup + isurf
+      ENDIF
       !
    END SUBROUTINE obs_surf_opt