Changeset 4819

Timestamp:

2014-10-16T18:37:22+02:00 (10 years ago)

Author:

djlea

Message:

Fix a bug to the allocation of arrays in OBS and add a test for the allocation of the ice background and warning if not allocated (as is currently the case on the zeroth timestep).

Location:

branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM/NEMO/OPA_SRC

Files:

• ASM/asmbkg.F90 (modified) (1 diff)
• OBS/obs_read_sla.F90 (modified) (1 diff)

branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90

@@ -156 +156 @@
 #if defined key_lim2 || defined key_lim3
             IF(( nn_ice == 2 ) .OR. ( nn_ice == 3 )) THEN
-               CALL iom_rstput( kt, nitdin_r, inum, 'iceconc', 1.0 - frld(:,:)   )
+          IF(ALLOCATED(frld)) THEN
+                  CALL iom_rstput( kt, nitdin_r, inum, 'iceconc', 1.0 - frld(:,:)   )
+               ELSE
+        CALL ctl_warn('Ice concentration not written to background as ice variable frld not allocated on this timestep')
+          ENDIF
             ENDIF
 #endif

branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sla.F90

@@ -393 +393 @@
          &               iindx   )
       
-      CALL obs_surf_alloc( sladata, iobs, kvars, kextr, &
-         &                 jpi, jpj, kstp )
+      CALL obs_surf_alloc( sladata, iobs, kvars, kextr, kstp, jpi, jpj )
       
       ! * Read obs/positions, QC, all variable and assign to sladata