Changeset 7932

Timestamp:

2017-04-19T13:07:37+02:00 (8 years ago)

Author:

jwhile

Message:

Bug fixes

Location:

branches/UKMO/obs_oper_do_not_assim_update/NEMOGCM/NEMO/OPA_SRC/OBS

Files:

• obs_prep.F90 (modified) (3 diffs)
• obs_read_prof.F90 (modified) (5 diffs)
• obs_readmdt.F90 (modified) (1 diff)

branches/UKMO/obs_oper_do_not_assim_update/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90

@@ -144 +144 @@
          &              surfdata%nsurf,   surfdata%nyea, surfdata%nmon, &
          &              surfdata%nday,    surfdata%nhou, surfdata%nmin, &
-         &              surfdata%nqc,     surfdata%mstp, iotdobs,       &
-         &              kqc_cutoff = iqc_cutoff  )
+         &              surfdata%nqc,     surfdata%mstp, iotdobs        )
 
       CALL obs_mpp_sum_integer( iotdobs, iotdobsmpp )
@@ -170 +169 @@
          &                 iosdsobs,     ilansobs,     &
          &                 inlasobs,     ld_nea,       &
-         &                 ibdysobs,     ld_bound_reject        )
+         &                 ibdysobs,     ld_bound_reject, &
+         &                 iqc_cutoff                     )
 
       CALL obs_mpp_sum_integer( iosdsobs, iosdsobsmpp )
@@ -1450 +1450 @@
    END SUBROUTINE obs_pro_rej
 
-   SUBROUTINE obs_uv_rej( profdata, knumu, knumv, kqc_cutof )
+   SUBROUTINE obs_uv_rej( profdata, knumu, knumv, kqc_cutoff )
       !!----------------------------------------------------------------------
       !!                    ***  ROUTINE obs_uv_rej ***

branches/UKMO/obs_oper_do_not_assim_update/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90

@@ -409 +409 @@
                      IF ( ( .NOT. BTEST(inpfiles(jj)%ivlqc(ij,ji,1),2) .AND. &
                         &   .NOT. BTEST(inpfiles(jj)%idqc(ij,ji),2) .AND. &
-                        &    ldt3d ) .OR. &
+                        &    ldvar1 ) .OR. &
                         & ( .NOT. BTEST(inpfiles(jj)%ivlqc(ij,ji,2),2) .AND. &
                         &   .NOT. BTEST(inpfiles(jj)%idqc(ij,ji),2) .AND. &
@@ -618 +618 @@
                      IF ( ( .NOT. BTEST(inpfiles(jj)%ivlqc(ij,ji,1),2) .AND. &
                         &   .NOT. BTEST(inpfiles(jj)%idqc(ij,ji),2) .AND. &
-                        &    ldt3d ) .OR. &
+                        &    ldvar1 ) .OR. &
                         & ( .NOT. BTEST(inpfiles(jj)%ivlqc(ij,ji,2),2) .AND. &
                         &   .NOT. BTEST(inpfiles(jj)%idqc(ij,ji),2) .AND. &
-                        &   lds3d ) ) THEN
+                        &   ldvar2 ) ) THEN
                         ip3dt = ip3dt + 1
                      ELSE
@@ -631 +631 @@
                   IF ( ( .NOT. BTEST(inpfiles(jj)%ivlqc(ij,ji,1),2) .AND. &
                     &   .NOT. BTEST(inpfiles(jj)%idqc(ij,ji),2) .AND. &
-                    &    ldt3d ) .OR. ldsatt ) THEN
+                    &    ldvar1 ) .OR. ldsatt ) THEN
 
                      IF (ldsatt) THEN
@@ -693 +693 @@
                   ENDIF
 
-                  IF ( .NOT. BTEST(inpfiles(jj)%ivlqc(ij,ji,2),2) .AND. &
-                     & .NOT. BTEST(inpfiles(jj)%idqc(ij,ji),2) ) THEN
+                  IF ( ( .NOT. BTEST(inpfiles(jj)%ivlqc(ij,ji,2),2) .AND. &
+                     &   .NOT. BTEST(inpfiles(jj)%idqc(ij,ji),2)    .AND. &
                      &   ldvar2 ) .OR. ldsatt ) THEN
 
@@ -726 +726 @@
 
                      ! Profile var2 value
-                  IF ( ( .NOT. BTEST(inpfiles(jj)%ivlqc(ij,ji,2),2) .AND. &
-                    &   .NOT. BTEST(inpfiles(jj)%idqc(ij,ji),2) .AND. &
+                  IF (  ( .NOT. BTEST(inpfiles(jj)%ivlqc(ij,ji,2),2) ) .AND. &
+                    &   ( .NOT. BTEST(inpfiles(jj)%idqc(ij,ji),2)    )  ) THEN
                         profdata%var(2)%vobs(ivar2t) = &
                            &                inpfiles(jj)%pob(ij,ji,2)

branches/UKMO/obs_oper_do_not_assim_update/NEMOGCM/NEMO/OPA_SRC/OBS/obs_readmdt.F90

@@ -154 +154 @@
 
 ! mark any masked data with a QC flag
-         IF( zobsmask(1) == 0 )   sladata%nqc(jobs) = IBSET(sladata(jslano)%nqc(jobs),15)
+         IF( zobsmask(1) == 0 )   sladata%nqc(jobs) = IBSET(sladata%nqc(jobs),15)
 
          END DO