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

Timestamp:

2017-08-07T17:29:21+02:00 (7 years ago)

Author:

clem

Message:

change calls in icestp.F90 for advection

File:

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

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

@@ -32 +32 @@
    USE phycst          ! Define parameters for the routines
    USE eosbn2          ! equation of state
-   USE icerhg          ! Ice dynamics
-   USE limtrp          ! Ice transport
+   USE icerhg          ! Ice rheology
+   USE iceadv          ! Ice advection
    USE limthd          ! Ice thermodynamics
-   USE limitd_me       ! Mechanics on ice thickness distribution
+   USE icerdgrft       ! Ice ridging/rafting
    USE limsbc          ! sea surface boundary condition
    USE limdiahsb       ! Ice budget diagnostics
    USE limwri          ! Ice outputs
    USE limrst          ! Ice restarts
-   USE limupdate1      ! update of global variables
-   USE limupdate2      ! update of global variables
+   USE icecor1         ! Ice corrections after dynamics
+   USE icecor2         ! Ice corrections after thermo
    USE limvar          ! Ice variables switch
    USE limctl          !
@@ -153 +153 @@
          ! --- zap this if no ice dynamics --- !
          IF( .NOT. lk_c1d .AND. ln_limdyn ) THEN
-            !
-            IF( nn_limdyn /= 0 ) THEN                          ! -- Ice dynamics
-                                      CALL ice_rhg( kt )       !     rheology  
-            ELSE
-               u_ice(:,:) = rn_uice * umask(:,:,1)             !     or prescribed velocity
-               v_ice(:,:) = rn_vice * vmask(:,:,1)
-               !!CALL RANDOM_NUMBER(u_ice(:,:))
-               !!CALL RANDOM_NUMBER(v_ice(:,:))
-            ENDIF
-                                      CALL lim_trp( kt )       ! -- Ice transport (Advection/diffusion)
-            IF( nn_limdyn == 2 .AND. nn_monocat /= 2 )  &      ! -- Mechanical redistribution (ridging/rafting)
-               &                      CALL lim_itd_me         
-            IF( nn_limdyn == 2 )      CALL lim_update1( kt )   ! -- Corrections
+                                      CALL ice_rhg( kt )       ! -- rheology  
+                                      CALL ice_adv( kt )       ! -- advection
+            IF( nn_limdyn == 2 .AND. nn_monocat /= 2 )  &      ! -- ridging/rafting
+               &                      CALL ice_rdgrft         
+            IF( nn_limdyn == 2 )      CALL ice_cor1( kt )      ! -- Corrections
             !
          ENDIF
@@ -204 +196 @@
          ! END MV MP 2016
 
-         IF( ln_limthd )              CALL lim_update2( kt )    ! -- Corrections
+         IF( ln_limthd )              CALL ice_cor2( kt )       ! -- Corrections
          ! ---
 # if defined key_agrif
@@ -270 +262 @@
       ierr = ierr + sbc_ice_alloc    ()      ! surface forcing 
       ierr = ierr + thd_ice_alloc    ()      ! thermodynamics
-      IF( ln_limdyn )   ierr = ierr + lim_itd_me_alloc ()      ! ice thickness distribution - mechanics
+      IF( ln_limdyn )   ierr = ierr + ice_rdgrft_alloc ()      ! ridging/rafting
       !
       IF( lk_mpp    )   CALL mpp_sum( ierr )
@@ -287 +279 @@
       ! END MV MP 2016
 
-      IF( ln_limdyn )   CALL lim_itd_me_init             ! ice thickness distribution initialization for mecanical deformation
+      IF( ln_limdyn )   CALL ice_rdgrft_init             ! ice thickness distribution initialization for ridging/rafting
       !                                ! Initial sea-ice state
       IF( .NOT. ln_rstart ) THEN              ! start from rest: sea-ice deduced from sst