Changeset 5048 for branches/2015/dev_r5044_CNRS_LIM3CLEAN/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90

Timestamp:

2015-02-02T11:28:50+01:00 (9 years ago)

Author:

vancop

Message:

new itd boundaries, namelist changes, mono-category and comments

File:

• branches/2015/dev_r5044_CNRS_LIM3CLEAN/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90 (modified) (7 diffs)

branches/2015/dev_r5044_CNRS_LIM3CLEAN/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90

@@ -191 +191 @@
             CALL sbc_cpl_ice_tau( utau_ice , vtau_ice )
 
-            ! MV -> seb 
-!           CALL sbc_cpl_ice_flx( p_frld=ato_i, palbi=zalb_ice, psst=sst_m, pist=t_su    )
-
-!           IF( nn_limflx == 2 )   CALL ice_lim_flx( t_su, zalb_ice, qns_ice, qsr_ice ,   &
-!              &                                           dqns_ice, qla_ice, dqla_ice, nn_limflx )
-!           ! Latent heat flux is forced to 0 in coupled :
-!           !  it is included in qns (non-solar heat flux)
-!           qla_ice  (:,:,:) = 0._wp
-!           dqla_ice (:,:,:) = 0._wp
-            ! END MV -> seb
-            !
          END SELECT
          
@@ -236 +225 @@
          wfx_spr(:,:) = 0._wp   ;   
 
+         afx_tot(:,:) = at_i(:,:) ;  afx_dyn(:,:) = 0._wp
+         afx_thd(:,:) = 0._wp
+
          hfx_in (:,:) = 0._wp   ;   hfx_out(:,:) = 0._wp
          hfx_thd(:,:) = 0._wp   ;   
@@ -252 +244 @@
          ! ----------------------------------------------
          IF( .NOT. lk_c1d ) THEN
+
+         IF ( ln_limdyn ) afx_dyn(:,:)     = at_i(:,:)
+
                           CALL lim_dyn( kt )              ! Ice dynamics    ( rheology/dynamics )
                           CALL lim_trp( kt )              ! Ice transport   ( Advection/diffusion )
                           CALL lim_var_glo2eqv            ! equivalent variables, requested for rafting
          IF( ln_nicep )   CALL lim_prt_state( kt, jiindx, jjindx,-1, ' - ice dyn & trp - ' )   ! control print
-                          CALL lim_itd_me                 ! Mechanical redistribution ! (ridging/rafting)
+         IF( nn_monocat /= 2 ) CALL lim_itd_me                 ! Mechanical redistribution ! (ridging/rafting)
                           CALL lim_var_agg( 1 ) 
 #if defined key_bdy
@@ -278 +273 @@
                           oa_i_b (:,:,:)   = oa_i (:,:,:)
                           smv_i_b(:,:,:)   = smv_i(:,:,:)
+
+         IF ( ln_limdyn ) afx_dyn(:,:)     = ( at_i(:,:) - afx_dyn(:,:) ) * r1_rdtice
+                          afx_thd(:,:)     = at_i(:,:)
  
          ! ----------------------------------------------
-         ! ice thermodynamic
+         ! ice thermodynamics
          ! ----------------------------------------------
                           CALL lim_var_glo2eqv            ! equivalent variables
@@ -288 +286 @@
                           phicif(:,:)  = vt_i(:,:)
 
-                          ! MV -> seb
                           SELECT CASE( kblk )
                              CASE ( jp_cpl )
@@ -299 +296 @@
                              dqla_ice (:,:,:) = 0._wp
                           END SELECT
-                          ! END MV -> seb
                           !
                           CALL lim_var_bv                 ! bulk brine volume (diag)
@@ -320 +316 @@
          !                                           ! Diagnostics and outputs 
          IF (ln_limdiaout) CALL lim_diahsb
+
+                          afx_thd(:,:)     = ( at_i(:,:) - afx_thd(:,:) ) * r1_rdtice
+                          afx_tot(:,:)     = ( at_i(:,:) - afx_tot(:,:) ) * r1_rdtice
 
                           CALL lim_wri( 1  )              ! Ice outputs