Changeset 8954 for branches/UKMO/dev_r4650_general_vert_coord_obsoper_logchl_std/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_logchl.F90

Timestamp:

2017-12-08T12:32:59+01:00 (6 years ago)

Author:

dford

Message:

Import changes from reanalysis branch.

File:

• branches/UKMO/dev_r4650_general_vert_coord_obsoper_logchl_std/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_logchl.F90 (modified) (5 diffs)

branches/UKMO/dev_r4650_general_vert_coord_obsoper_logchl_std/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_logchl.F90

@@ -82 +82 @@
       INTEGER :: jj
       INTEGER :: jk
+      INTEGER :: jadd
       INTEGER :: iflag
       INTEGER :: inobf
@@ -115 +116 @@
       TYPE(obfbdata), POINTER, DIMENSION(:) :: &
          & inpfiles
+      LOGICAL :: ll_get_std   ! Logical for getting STD
       real(wp), DIMENSION(knumfiles) :: &
          & djulini, &
@@ -120 +122 @@
       INTEGER :: iobs
       INTEGER :: iobstot
+      INTEGER :: iaddref_std
       INTEGER :: ios
       INTEGER :: ioserrcount
@@ -205 +208 @@
                CALL ctl_stop( 'File format unknown' )
             ENDIF
+
+            !------------------------------------------------------------------ 
+            ! Find the references to additional entries, if any 
+            !------------------------------------------------------------------ 
+            ! STD 
+            iaddref_std = 0 
+            ll_get_std = .FALSE.
+            DO jadd = 1,inpfiles(jj) % nadd  
+               IF (  TRIM(inpfiles(jj) % caddname(jadd)) == "STD" ) THEN 
+                  iaddref_std = jadd
+                  ll_get_std = .TRUE. 
+                  EXIT 
+               ENDIF 
+            END DO
 
             !------------------------------------------------------------------
@@ -417 +434 @@
                   logchldata%rmod(iobs,1) = fbrmdi
                ENDIF
+                  
+               ! Copy in STD 
+               IF ( ll_get_std ) THEN 
+                  logchldata%rext(iobs,1) = inpfiles(jj)%padd(1,ji,iaddref_std,1) 
+               ELSE
+                  IF ( jk == 1 )   &
+                  &   CALL ctl_warn(   &
+                  &   "No STD values for logchl observations, setting to zero.") 
+                  logchldata%rext(iobs,1) = 0. 
+               ENDIF 
             ENDIF
          ENDIF