Changeset 8954 for branches/UKMO/dev_r4650_general_vert_coord_obsoper_logchl_std/NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.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_write.F90 (modified) (3 diffs)

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

@@ -974 +974 @@
          nadd = padd%inum
       ELSE
-         nadd = 0
+         nadd = 1
       ENDIF
 
@@ -1000 +1000 @@
       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
@@ -1067 +1073 @@
          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