Changeset 4748 for branches/2014/dev_r4650_UKMO13_CICE_changes_take2/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.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/SBC/sbccpl.F90 (modified) (5 diffs)

branches/2014/dev_r4650_UKMO13_CICE_changes_take2/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -53 +53 @@
 #endif
    USE diaar5, ONLY :   lk_diaar5
-#if defined key_cice
+#if defined key_cice || defined key_cice5
    USE ice_domain_size, only: ncat
 #endif
@@ -145 +145 @@
 #endif
 
-#if defined key_cice
+#if defined key_cice || defined key_cice5
    INTEGER, PARAMETER ::   jpl = ncat
 #elif ! defined key_lim2   &&   ! defined key_lim3
@@ -153 +153 @@
 #endif
 
-#if ! defined key_lim3   &&  ! defined key_cice
+#if ! defined key_lim3   &&  ! defined key_cice && ! defined key_cice5
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::  a_i
 #endif
@@ -161 +161 @@
 #endif
 
-#if ! defined key_cice
+#if ! defined key_cice && ! defined key_cice5
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::  topmelt, botmelt
 #endif
@@ -192 +192 @@
 #endif
 
-#if ! defined key_lim3 && ! defined key_cice
+#if ! defined key_lim3 && ! defined key_cice && ! defined key_cice5
       ALLOCATE( a_i(jpi,jpj,jpl) , STAT=ierr(3) )
 #endif
 
-#if defined key_cice || defined key_lim2
+#if defined key_cice || defined key_cice5 || defined key_lim2
       ALLOCATE( ht_i(jpi,jpj,jpl) , ht_s(jpi,jpj,jpl) , STAT=ierr(4) )
 #endif