Changeset 8871

Timestamp:

2017-12-01T10:53:38+01:00 (7 years ago)

Author:

mattmartin

Message:

Bug fixes for passing STD variable through from input obs files to output feedback files.

Location:

branches/UKMO/dev_r5518_obs_oper_update_obserr/NEMOGCM/NEMO/OPA_SRC/OBS

Files:

• obs_read_surf.F90 (modified) (1 diff)
• obs_surf_def.F90 (modified) (1 diff)
• obs_write.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_obs_oper_update_obserr/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_surf.F90

@@ -369 +369 @@
          surfdata%cext(2) = 'MDT'
       ENDIF
-      IF ( iextra > kextr ) surfdata%cext(iextr) = 'STD'
+      IF ( iextr > kextr ) surfdata%cext(iextr) = 'STD'
 
       ityp   (:) = 0

branches/UKMO/dev_r5518_obs_oper_update_obserr/NEMOGCM/NEMO/OPA_SRC/OBS/obs_surf_def.F90

@@ -297 +297 @@
       DEALLOCATE( & 
          & surf%rext, &
-         & cext &
+         & surf%cext &
          & )
 

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

@@ -342 +342 @@
       ENDIF
 
+      iadd_std = 0
+      indx_std = -1
       IF ( surfdata%nextra > 0 ) THEN
-
-         indx_std = -1
-         iadd_std = 0
          DO je = 1, surfdata%nextra
            IF ( TRIM( surfdata%cext(je) ) == 'STD' ) THEN
@@ -352 +351 @@
            ENDIF
          END DO
+      ENDIF
 
       CALL init_obfbdata( fbdata )