Changeset 4881 for branches/2014/dev_r4650_UKMO13_CICE_changes_take2/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

Timestamp:

2014-11-21T11:25:19+01:00 (10 years ago)

Author:

timgraham

Message:

Changes suggested by reviewer:
1) Changed behaviour so that key_cice defaults to cice5. Running with cice4 will require bot key_cice and key_cice4.
2) Other small changes in sbcice_cice.F90

File:

• branches/2014/dev_r4650_UKMO13_CICE_changes_take2/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) (5 diffs)

branches/2014/dev_r4650_UKMO13_CICE_changes_take2/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

@@ -1009 +1009 @@
 #endif
 
-#if ( defined key_cice || defined key_cice5 ) && defined key_asminc
+#if defined key_cice && defined key_asminc
             ! Sea-ice : CICE case. Pass ice increment tendency into CICE
             ndaice_da(:,:) = seaice_bkginc(:,:) * zincwgt / rdt
@@ -1020 +1020 @@
          ELSE
 
-#if ( defined key_cice || defined key_cice5 ) && defined key_asminc
+#if defined key_cice && defined key_asminc
             ! Sea-ice : CICE case. Zero ice increment tendency into CICE
             ndaice_da(:,:) = 0.0_wp
@@ -1064 +1064 @@
 #endif
  
-#if ( defined key_cice || defined key_cice5 ) && defined key_asminc
+#if defined key_cice && defined key_asminc
             ! Sea-ice : CICE case. Pass ice increment tendency into CICE
            ndaice_da(:,:) = seaice_bkginc(:,:) / rdt
@@ -1074 +1074 @@
          ELSE
 
-#if ( defined key_cice || defined key_cice5 ) && defined key_asminc
+#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 defined key_lim2 || defined key_cice || defined key_cice5
+!#if defined defined key_lim2 || defined key_cice
 !
 !            IF (ln_seaicebal ) THEN