Changeset 9054 for branches

Timestamp:

2017-12-14T16:17:59+01:00 (6 years ago)

Author:

dford

Message:

Merge in fix for reading/write logchl STD values.

Location:

branches/UKMO/dev_r4650_general_vert_coord_obsoper_pfts/NEMOGCM/NEMO/OPA_SRC/OBS

Files:

• diaobs.F90 (modified) (3 diffs)
• obs_read_logchl.F90 (modified) (5 diffs)
• obs_write.F90 (modified) (3 diffs)

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

@@ -1420 +1420 @@
          nlogchlvars = 1
 
-         ! Set the number of extra variables for logchl to 0
-         nlogchlextr = 0
+         ! Set the number of extra variables for logchl to 1 (STD)
+         nlogchlextr = 1
          
          IF ( ln_logchlfb ) THEN
@@ -1490 +1490 @@
          nlogchlpftvars = 1   ! ??????? ASK DAVID
 
-         ! Set the number of extra variables for logchl to 0
-         nlogchlpftextr = 0
+         ! Set the number of extra variables for logchl to 1 (STD)
+         nlogchlpftextr = 1
          
          DO pft = 1, nn_logchlpftscc 
@@ -2559 +2559 @@
 
          ! Write the logchl data
+         ! If padd is ever defined and added as an optional argument
+         ! to the obs_wri_logchl call, then the observed STD values
+         ! will need adding to padd in order to be written out
          DO jlogchlset = 1, nlogchlsets
       

branches/UKMO/dev_r4650_general_vert_coord_obsoper_pfts/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

branches/UKMO/dev_r4650_general_vert_coord_obsoper_pfts/NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.F90

@@ -976 +976 @@
          nadd = padd%inum
       ELSE
-         nadd = 0
+         nadd = 1
       ENDIF
 
@@ -1008 +1008 @@
       fbdata%caddunit(1,1) = 'mg/m3'
       fbdata%cgrid(1)      = 'T'
-      DO ja = 1, nadd
-         fbdata%caddname(1+ja) = padd%cdname(ja)
-         fbdata%caddlong(1+ja,1) = padd%cdlong(ja,1)
-         fbdata%caddunit(1+ja,1) = padd%cdunit(ja,1)
-      END DO
+      IF ( PRESENT( padd ) ) THEN
+         DO ja = 1, nadd
+            fbdata%caddname(1+ja) = padd%cdname(ja)
+            fbdata%caddlong(1+ja,1) = padd%cdlong(ja,1)
+            fbdata%caddunit(1+ja,1) = padd%cdunit(ja,1)
+         END DO
+      ELSE
+         fbdata%caddname(2) = 'STD'
+         fbdata%caddlong(2) = 'Standard deviation of LOGCHL'
+         fbdata%caddunit(2) = 'mg/m3'
+      ENDIF
 
       WRITE(cfname, FMT="(A,'_fdbk_',I4.4,'.nc')") TRIM(cprefix), nproc
@@ -1075 +1081 @@
          fbdata%iobsk(1,jo,1)  = 0
          DO ja = 1, nadd
-            fbdata%padd(1,jo,1+ja,1) = &
-               & logchldata%rext(jo,padd%ipoint(ja))
+            IF ( PRESENT( padd ) ) THEN
+               fbdata%padd(1,jo,1+ja,1) = &
+                  & logchldata%rext(jo,padd%ipoint(ja))
+            ELSE
+               fbdata%padd(1,jo,1+ja,1) = &
+                  & logchldata%rext(jo,1)
+            ENDIF
          END DO
          DO je = 1, next