Changeset 8516 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90

Timestamp:

2017-09-08T19:53:20+02:00 (7 years ago)

Author:

clem

Message:

changes in style - part5 - I think I can see the end of the tunnel

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90 (modified) (4 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90

@@ -37 +37 @@
    USE icerhg         ! sea-ice: rheology
    USE iceadv         ! sea-ice: advection
+   USE icedyn         ! sea-ice: dynamics
    USE icethd         ! sea-ice: thermodynamics
    USE icerdgrft      ! sea-ice: ridging/rafting
@@ -144 +145 @@
          CALL ice_rst_opn( kt )     ! Open Ice restart file (if necessary) 
          !
-         SELECT CASE( nice_dyn )   
-         CASE ( np_dynFULL )          !==  all dynamical processes  ==!
-            CALL ice_rhg   ( kt )          ! -- rheology  
-            CALL ice_adv   ( kt )          ! -- advection of ice
-            CALL ice_rdgrft( kt )          ! -- ridging/rafting 
-            CALL ice_cor   ( kt , 1 )      ! -- Corrections
-         CASE ( np_dyn )              !==  pure dynamics only ==!   (no ridging/rafting)   (nono cat. case 2)
-            CALL ice_rhg   ( kt )          ! -- rheology  
-            CALL ice_adv   ( kt )          ! -- advection of ice
-            CALL ice_cor   ( kt , 1 )      ! -- Corrections
-         CASE ( np_dynPURE )          !==  pure dynamics only ==!   (nn_icedyn= 0 or 1 )
-            CALL ice_rhg   ( kt )          ! -- rheology  
-            CALL ice_adv   ( kt )          ! -- advection of ice
-         END SELECT
+         IF( ln_icedyn .AND. .NOT.lk_c1d )   CALL ice_dyn( kt )            ! -- Ice dynamics
          !
          !                          !==  lateral boundary conditions  ==!
 #if defined key_agrif
-         IF( .NOT. Agrif_Root()     )   CALL agrif_interp_lim3('T')   ! -- AGRIF 
+         IF( .NOT. Agrif_Root()     )        CALL agrif_interp_lim3('T')   ! -- AGRIF 
 #endif
-         IF( ln_icethd .AND. ln_bdy )   CALL bdy_ice( kt )            ! -- bdy ice thermo
+         IF( ln_icethd .AND. ln_bdy )        CALL bdy_ice( kt )            ! -- bdy ice thermo
          !
          !
@@ -186 +174 @@
          !    qprec_ice, qevap_ice
          !------------------------------------------------------!
-         CALL ice_forcing_flx( kt, ksbc )
+                                    CALL ice_forcing_flx( kt, ksbc )
 
          !----------------------------!
@@ -269 +257 @@
       !
       CALL ice_itd_init                ! ice thickness distribution initialization
+      !
+      CALL ice_dyn_init                ! set ice dynamics parameters
       !
       CALL ice_rdgrft_init             ! set ice ridging/rafting parameters