Changeset 4229 for branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/ASM

Timestamp:

2013-11-18T12:36:11+01:00 (11 years ago)

Author:

cbricaud

Message:

merge UKMO branch into dev_MERCATOR_UKMO_2013

File:

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

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

@@ -1016 +1016 @@
 #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
@@ -1027 +1027 @@
          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
@@ -1071 +1071 @@
 #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
@@ -1081 +1081 @@
          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