Changeset 4220 for branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

Timestamp:

2013-11-15T16:36:52+01:00 (10 years ago)

Author:

clem

Message:

corrections for restartability

File:

• branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) (5 diffs)

branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -106 +106 @@
           nn_ice      =   0
       ENDIF
-      
+     
       IF(lwp) THEN               ! Control print
          WRITE(numout,*) '        Namelist namsbc (partly overwritten with CPP key setting)'
@@ -129 +129 @@
       ENDIF
 
-      !   Flux handling over ice categories 
+      !   Flux handling over ice categories
+#if defined key_coupled 
       SELECT CASE ( TRIM (cn_iceflx))
       CASE ('ave')
@@ -143 +144 @@
       IF(lwp) WRITE(numout,*) '              Fluxes averaged over all ice categories         ln_iceflx_ave    = ', ln_iceflx_ave
       IF(lwp) WRITE(numout,*) '              Fluxes distributed linearly over ice categories ln_iceflx_linear = ', ln_iceflx_linear
+#endif
       !
       !                              ! allocate sbc arrays
@@ -182 +184 @@
       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 = 1 or 2' )
-
+#if defined key_coupled
       IF( ln_iceflx_ave .AND. ln_iceflx_linear ) &
          &   CALL ctl_stop( ' ln_iceflx_ave and ln_iceflx_linear options are not compatible' )
-
       IF( ( nn_ice ==3 .AND. lk_cpl) .AND. .NOT. ( ln_iceflx_ave .OR. ln_iceflx_linear ) ) &
          &   CALL ctl_stop( ' With lim3 coupled, either ln_iceflx_ave or ln_iceflx_linear must be set to .TRUE.' )
-      
+#endif      
       IF( ln_dm2dc )   nday_qsr = -1   ! initialisation flag
 
@@ -320 +321 @@
       CASE(  3 )   ;         CALL sbc_ice_lim  ( kt, nsbc )          ! LIM-3 ice model
       !is it useful?
-      !CASE(  4 )   ;         CALL sbc_ice_cice ( kt, nsbc )          ! CICE ice model
+      CASE(  4 )   ;         CALL sbc_ice_cice ( kt, nsbc )          ! CICE ice model
       END SELECT