Changeset 1226 for trunk/NEMO/OPA_SRC/SBC/sbcmod.F90

Timestamp:

2008-11-27T18:41:45+01:00 (15 years ago)

Author:

smasson

Message:

bugfix of the coupling interface (commited during changeset:1218), see ticket:155

File:

• trunk/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -28 +28 @@
    USE sbcice_lim_2    ! surface boundary condition: LIM 2.0 sea-ice model
    USE sbccpl          ! surface boundary condition: coupled florulation
+   USE cpl_oasis3, ONLY:lk_cpl      ! are we in coupled mode?
    USE sbcssr          ! surface boundary condition: sea surface restoring
    USE sbcrnf          ! surface boundary condition: runoffs
@@ -130 +131 @@
          &  CALL ctl_warn( 'nn_fsbc is NOT a multiple of the number of time steps in a day' )
       !
-      IF( nn_ice == 2 .AND. .NOT.( ln_blk_clio .OR. ln_blk_core ) )   &
-         &   CALL ctl_stop( 'sea-ice model requires a bulk formulation' )
+      IF( nn_ice == 2 .AND. .NOT.( ln_blk_clio .OR. ln_blk_core .OR. lk_cpl ) )   &
+         &   CALL ctl_stop( 'sea-ice model requires a bulk formulation or coupled configuration' )
       
       ! Choice of the Surface Boudary Condition (set nsbc)
@@ -201 +202 @@
       CASE(  5 )   ;   CALL sbc_cpl_rcv ( kt, nn_fsbc, nn_ice )   ! coupled formulation
       CASE( -1 )                                
-                       CALL sbc_ana     ( kt )                     ! ESOPA, test ALL the formulations
-                       CALL sbc_gyre    ( kt )                     !
-                       CALL sbc_flx     ( kt )                     !
-                       CALL sbc_blk_clio( kt )                     !
-                       CALL sbc_blk_core( kt )                     !
-                       CALL sbc_cpl_rcv ( kt,  nn_fsbc, nn_ice )   !
+                       CALL sbc_ana     ( kt )                    ! ESOPA, test ALL the formulations
+                       CALL sbc_gyre    ( kt )                    !
+                       CALL sbc_flx     ( kt )                    !
+                       CALL sbc_blk_clio( kt )                    !
+                       CALL sbc_blk_core( kt )                    !
+                       CALL sbc_cpl_rcv ( kt, nn_fsbc, nn_ice )   !
       END SELECT