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

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

@@ -9 +9 @@
    !!            3.4  ! 2011-11  (C. Harris) CICE added as an option
    !!----------------------------------------------------------------------
-#if defined key_lim3 || defined key_lim2 || defined key_cice || defined key_cice5
+#if defined key_lim3 || defined key_lim2 || defined key_cice
    !!----------------------------------------------------------------------
    !!   'key_lim2' or 'key_lim3' :             LIM-2 or LIM-3 sea-ice model
@@ -21 +21 @@
    USE ice_2
 # endif
-# if defined key_cice || defined key_cice5
+# if defined key_cice
    USE ice_domain_size, only: ncat 
 #endif
@@ -48 +48 @@
    CHARACTER(len=1), PUBLIC, PARAMETER ::   cp_ice_msh = 'C'      !: 'C'-grid ice-velocity
 # endif
-# if defined  key_cice || defined key_cice5
+# if defined  key_cice
    LOGICAL         , PUBLIC, PARAMETER ::   lk_lim2    = .FALSE.  !: no LIM-2
    LOGICAL         , PUBLIC, PARAMETER ::   lk_lim3    = .FALSE.  !: no LIM-3
@@ -75 +75 @@
 # endif
 
-#elif defined key_cice || key_cice5
+#elif defined key_cice
    !
    ! for consistency with LIM, these are declared with three dimensions
@@ -127 +127 @@
          &      emp_ice(jpi,jpj)                              , STAT= ierr(1) )
 #endif
-#elif defined key_cice || defined key_cice5
+#elif defined key_cice
       ALLOCATE( qla_ice(jpi,jpj,1)    , qlw_ice(jpi,jpj,1)    , qsr_ice(jpi,jpj,1)    , &
                 wndi_ice(jpi,jpj)     , tatm_ice(jpi,jpj)     , qatm_ice(jpi,jpj)     , &