Changeset 1481 for trunk/NEMO/OPA_SRC/SBC

Timestamp:

2009-07-03T17:07:08+02:00 (15 years ago)

Author:

ctlod

Message:

ensure restartability of TKE2 in coupled mode + few minor bugs corrections, see ticket: #466

Location:

trunk/NEMO/OPA_SRC/SBC

Files:

• sbcice_lim.F90 (modified) (2 diffs)
• sbcice_lim_2.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/SBC/sbcice_lim.F90

@@ -232 +232 @@
          !
          !                                           ! Diagnostics and outputs 
-#if defined key_zdftke2
-         IF( kt .NE. nitend+1 ) THEN
-            IF( ( MOD( kt+nn_fsbc-1, ninfo ) == 0 .OR. ntmoy == 1 ) .AND. .NOT. lk_mpp )   &
-               &             CALL lim_dia 
-                             CALL lim_wri( 1  )              ! Ice outputs 
-            IF( lrst_ice )   CALL lim_rst_write( kt )        ! Ice restart file 
-                             CALL lim_var_glo2eqv            ! ???
-            !
-            IF( ln_nicep )   CALL lim_ctl               ! alerts in case of model crash
-            !
-         ENDIF
-#else
          IF( ( MOD( kt+nn_fsbc-1, ninfo ) == 0 .OR. ntmoy == 1 ) .AND. .NOT. lk_mpp )   &
             &             CALL lim_dia 
@@ -252 +240 @@
          IF( ln_nicep )   CALL lim_ctl               ! alerts in case of model crash
          !
-#endif
       ENDIF                                          ! End sea-ice time step only
 

trunk/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90

@@ -171 +171 @@
          ! ---------------- !
 
-#if defined key_zdftke2
-         IF ( kt .NE. nitend+1 ) THEN
                                         CALL lim_rst_opn_2  ( kt )      ! Open Ice restart file
-         ENDIF
-#else
-                                        CALL lim_rst_opn_2  ( kt )      ! Open Ice restart file
-#endif
          IF( .NOT. lk_c1d ) THEN                                        ! Ice dynamics & transport (not in 1D case)
                                         CALL lim_dyn_2      ( kt )           ! Ice dynamics    ( rheology/dynamics )
@@ -192 +186 @@
                                         CALL lim_thd_2      ( kt )      ! Ice thermodynamics 
                                         CALL lim_sbc_2      ( kt )      ! Ice/Ocean Mass & Heat fluxes 
-#if defined key_zdftke2
-         IF( kt .NE. nitend+1 ) THEN
-            IF( ( MOD( kt+nn_fsbc-1, ninfo ) == 0 .OR. ntmoy == 1 ) .AND. .NOT. lk_mpp )   &
-               &                        CALL lim_dia_2      ( kt )      ! Ice Diagnostics 
-                                        CALL lim_wri_2      ( kt )      ! Ice outputs 
-            IF( lrst_ice )              CALL lim_rst_write_2( kt )      ! Ice restart file 
-            !
-         ENDIF
-#else
+
          IF( ( MOD( kt+nn_fsbc-1, ninfo ) == 0 .OR. ntmoy == 1 ) .AND. .NOT. lk_mpp )   &
             &                           CALL lim_dia_2      ( kt )      ! Ice Diagnostics
@@ -206 +192 @@
          IF( lrst_ice )                 CALL lim_rst_write_2( kt )      ! Ice restart file
          !
-#endif
       ENDIF
       !