Changeset 4932 for branches/2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/NEMO/OPA_SRC/ASM

Timestamp:

2014-12-01T11:08:54+01:00 (9 years ago)

Author:

acc

Message:

Branch dev_r4879_UKMO_NOC_MERGE, Check in merged UKMO_OBSASM branch; all conflicts resolved

Location:

branches/2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/NEMO/OPA_SRC/ASM

Files:

• asmbkg.F90 (modified) (1 diff)
• asminc.F90 (modified) (1 diff)

branches/2014/dev_r4879_UKMO_NOC_MERGE/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_r4879_UKMO_NOC_MERGE/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

@@ -237 +237 @@
          &                ' Inconsistent options')
 
-      IF ( ( ln_bkgwri ).AND.( ( ln_asmdin ).OR.( ln_asmiau ) ) )  &
-         & CALL ctl_stop( ' ln_bkgwri and either ln_asmdin or ln_asmiau are set to .true.:', &
-         &                ' The background state must be written before applying the increments')
-
       IF ( ( niaufn /= 0 ).AND.( niaufn /= 1 ) ) &
          & CALL ctl_stop( ' niaufn /= 0 or niaufn /=1 :',  &