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

Timestamp:

2014-08-18T10:33:45+02:00 (10 years ago)

Author:

timgraham

Message:

Added key_cice5 to select use of CICE5 model. This is used so that the correct variable names are used in the CICE5 version
Modified all references to key_cice to an "or" so that they will be triggered by the key_cice5 key as well (assuming the code sections don't require chanegs for CICE5).

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_asminc
+#if ( defined key_cice || defined key_cice5 ) && 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_asminc
+#if ( defined key_cice || defined key_cice5 ) && 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_asminc
+#if ( defined key_cice || defined key_cice5 ) && 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_asminc
+#if ( defined key_cice || defined key_cice5 ) && 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
+!#if defined defined key_lim2 || defined key_cice || defined key_cice5
 !
 !            IF (ln_seaicebal ) THEN