Changeset 4062

Timestamp:

2013-10-15T18:14:59+02:00 (11 years ago)

Author:

djlea

Message:

Bug fix to allow CICE versions with assimilation to build.

File:

• branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) (4 diffs)

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

@@ -1026 +1026 @@
 #endif
 
-#if defined key_cice
+#if defined key_cice && defined key_asminc
             ! Sea-ice : CICE case. Pass ice increment tendency into CICE
             ndaice_da(:,:) = seaice_bkginc(:,:) * zincwgt / rdt
@@ -1037 +1037 @@
          ELSE
 
-#if defined key_cice
+#if defined key_cice && defined key_asminc
             ! Sea-ice : CICE case. Zero ice increment tendency into CICE
             ndaice_da(:,:) = 0.0_wp
@@ -1081 +1081 @@
 #endif
  
-#if defined key_cice
-            ! Sea-ice : CICE case. Pass ice increment tendency into CICE - is this correct?
+#if defined key_cice && defined key_asminc
+            ! Sea-ice : CICE case. Pass ice increment tendency into CICE
            ndaice_da(:,:) = seaice_bkginc(:,:) / rdt
 #endif
@@ -1091 +1091 @@
          ELSE
 
-#if defined key_cice
+#if defined key_cice && defined key_asminc
             ! Sea-ice : CICE case. Zero ice increment tendency into CICE 
             ndaice_da(:,:) = 0.0_wp