Changeset 3508 for branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

Timestamp:

2012-10-17T13:40:14+02:00 (12 years ago)

Author:

charris

Message:

First attempt at changes for CICE embedded sea ice. The nn_ice_embd=0 option has been prevented (as for LIM3). Changes to sbcice_cice include some other fixes
and cosmetic changes as in dev_3352_UKMO8_CICE (care will be required merging with this branch).

File:

• branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) (1 diff)

branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -163 +163 @@
       IF( nn_ice == 4 .AND. ( .NOT. ( cp_cfg == 'orca' ) .OR. lk_agrif ) )   &
          &   CALL ctl_stop( 'CICE sea-ice model currently only available in a global ORCA configuration without AGRIF' )
-      IF( nn_ice == 3 .AND. nn_ice_embd == 0 )   &
-         &   CALL ctl_stop( 'LIM3 sea-ice model requires nn_ice_embd = 2 or 3' )
+      IF( ( nn_ice == 3 .OR. nn_ice == 4 ) .AND. nn_ice_embd == 0 )   &
+         &   CALL ctl_stop( 'LIM3 and CICE sea-ice models require nn_ice_embd = 2 or 3' )
       
       IF( ln_dm2dc )   nday_qsr = -1   ! initialisation flag