Changeset 10712 for branches/UKMO/dev_r5518_obs_oper_update_icethick/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

Timestamp:

2019-02-21T16:44:54+01:00 (5 years ago)

Author:

emmafiedler

Message:

Correct flagging of ice data at zeroth timestep, QC for sea ice thickness

File:

• branches/UKMO/dev_r5518_obs_oper_update_icethick/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) (4 diffs)

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

@@ -191 +191 @@
          & cn_altbiasfile        ! Altimeter bias input filename
 
+      LOGICAL :: ln_seaicetypes = .FALSE.  ! Logical switch indicating data type is sea ice
 
       LOGICAL :: ln_t3d          ! Logical switch for temperature profiles
@@ -844 +845 @@
                &               rn_dobsini, rn_dobsend, ln_ignmis, .FALSE., llnightav(jtype) )
 
-            CALL obs_pre_surf( surfdata(jtype), surfdataqc(jtype), ln_nea, ln_bound_reject )
+
+            IF ( TRIM(cobstypessurf(jtype)) == 'sit' ) THEN
+              ln_seaicetypes = .TRUE.
+            ELSE
+              ln_seaicetypes = .FALSE.
+            ENDIF           
+            CALL obs_pre_surf( surfdata(jtype), surfdataqc(jtype), ln_nea, ln_bound_reject, ln_seaicetypes )
 
             IF ( TRIM(cobstypessurf(jtype)) == 'sla' ) THEN
@@ -1233 +1240 @@
                         &           'time-step but some obs are valid then.' )
                      WRITE(numout,*)surfdataqc(jtype)%nsstpmpp(1), &
-                        &           ' sea-ice concentration obs will be missed'
-                  ENDIF
-                  surfdataqc(jtype)%nsurfup = surfdataqc(jtype)%nsurfup + &
-                     &                        surfdataqc(jtype)%nsstp(1)
-                  CYCLE
+                        &           ' sea-ice concentration obs will be missed'                  
+                  ENDIF                                
                ELSE
 #if defined key_cice
@@ -1249 +1253 @@
                ENDIF
             CASE('sit')
-               IF ( kstp == 0 ) THEN ! **Copied from SIC, check applies to SIT!**
+               IF ( kstp == 0 ) THEN
                   IF ( lwp .AND. surfdataqc(jtype)%nsstpmpp(1) > 0 ) THEN
                      CALL ctl_warn( 'Sea-ice not initialised on zeroth '// &
                         &           'time-step but some obs are valid then.' )
                      WRITE(numout,*)surfdataqc(jtype)%nsstpmpp(1), &
-                        &           ' sea-ice thickness obs will be missed'
-                  ENDIF
-                  surfdataqc(jtype)%nsurfup = surfdataqc(jtype)%nsurfup + &
-                     &                        surfdataqc(jtype)%nsstp(1)
-                  CYCLE
-               ELSE            
+                        &           ' sea-ice thickness obs will be missed and QC flag set to 4'
+                  ENDIF                                  
+               ELSE       
 #if defined key_cice
                   zsurfvar(:,:) = thick_i(:,:)