Changeset 14072 for NEMO/trunk/src/ICE/icedyn.F90

Timestamp:

2020-12-04T08:48:38+01:00 (3 years ago)

Author:

laurent

Message:

Merging branch "2020/dev_r13648_ASINTER-04_laurent_bulk_ice", ticket #2369

File:

• NEMO/trunk/src/ICE/icedyn.F90 (modified) (11 diffs)

NEMO/trunk/src/ICE/icedyn.F90

@@ -2 +2 @@
    !!======================================================================
    !!                     ***  MODULE  icedyn  ***
-   !!   Sea-Ice dynamics : master routine for sea ice dynamics 
+   !!   Sea-Ice dynamics : master routine for sea ice dynamics
    !!======================================================================
    !! history :  4.0  ! 2018  (C. Rousset)  original code SI3 [aka Sea Ice cube]
@@ -36 +36 @@
    PUBLIC   ice_dyn        ! called by icestp.F90
    PUBLIC   ice_dyn_init   ! called by icestp.F90
-   
+
    INTEGER ::              nice_dyn   ! choice of the type of dynamics
    !                                        ! associated indices:
    INTEGER, PARAMETER ::   np_dynALL     = 1   ! full ice dynamics               (rheology + advection + ridging/rafting + correction)
-   INTEGER, PARAMETER ::   np_dynRHGADV  = 2   ! pure dynamics                   (rheology + advection) 
+   INTEGER, PARAMETER ::   np_dynRHGADV  = 2   ! pure dynamics                   (rheology + advection)
    INTEGER, PARAMETER ::   np_dynADV1D   = 3   ! only advection 1D - test case from Schar & Smolarkiewicz 1996
    INTEGER, PARAMETER ::   np_dynADV2D   = 4   ! only advection 2D w prescribed vel.(rn_uvice + advection)
@@ -51 +51 @@
    REAL(wp) ::   rn_uice          !    prescribed u-vel (case np_dynADV1D & np_dynADV2D)
    REAL(wp) ::   rn_vice          !    prescribed v-vel (case np_dynADV1D & np_dynADV2D)
-   
+
    TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_icbmsk   ! structure of input grounded icebergs mask (file informations, fields read)
 
@@ -66 +66 @@
       !!-------------------------------------------------------------------
       !!               ***  ROUTINE ice_dyn  ***
-      !!               
+      !!
       !! ** Purpose :   this routine manages sea ice dynamics
       !!
@@ -91 +91 @@
          WRITE(numout,*)'~~~~~~~'
       ENDIF
-      !                      
+      !
       ! retrieve thickness from volume for landfast param. and UMx advection scheme
       WHERE( a_i(:,:,:) >= epsi20 )
@@ -118 +118 @@
       CASE ( np_dynALL )           !==  all dynamical processes  ==!
          !
-         CALL ice_dyn_rhg   ( kt, Kmm )                                     ! -- rheology  
+         CALL ice_dyn_rhg   ( kt, Kmm )                                     ! -- rheology
          CALL ice_dyn_adv   ( kt )                                          ! -- advection of ice
-         CALL ice_dyn_rdgrft( kt )                                          ! -- ridging/rafting 
+         CALL ice_dyn_rdgrft( kt )                                          ! -- ridging/rafting
          CALL ice_cor       ( kt , 1 )                                      ! -- Corrections
          !
       CASE ( np_dynRHGADV  )       !==  no ridge/raft & no corrections ==!
          !
-         CALL ice_dyn_rhg   ( kt, Kmm )                                     ! -- rheology  
+         CALL ice_dyn_rhg   ( kt, Kmm )                                     ! -- rheology
          CALL ice_dyn_adv   ( kt )                                          ! -- advection of ice
          CALL Hpiling                                                       ! -- simple pile-up (replaces ridging/rafting)
@@ -134 +134 @@
          ! --- monotonicity test from Schar & Smolarkiewicz 1996 --- !
          ! CFL = 0.5 at a distance from the bound of 1/6 of the basin length
-         ! Then for dx = 2m and dt = 1s => rn_uice = u (1/6th) = 1m/s 
+         ! Then for dx = 2m and dt = 1s => rn_uice = u (1/6th) = 1m/s
          DO_2D( 1, 1, 1, 1 )
             zcoefu = ( REAL(jpiglo+1)*0.5_wp - REAL(ji+nimpp-1) ) / ( REAL(jpiglo+1)*0.5_wp - 1._wp )
@@ -156 +156 @@
       !
       !
-      ! diagnostics: divergence at T points 
+      ! diagnostics: divergence at T points
       IF( iom_use('icediv') ) THEN
          !
@@ -259 +259 @@
       ENDIF
       !                             !== set the choice of ice dynamics ==!
-      ioptio = 0 
+      ioptio = 0
       !      !--- full dynamics                               (rheology + advection + ridging/rafting + correction)
       IF( ln_dynALL    ) THEN   ;   ioptio = ioptio + 1   ;   nice_dyn = np_dynALL       ;   ENDIF
@@ -292 +292 @@
          ALLOCATE( sf_icbmsk(1)%fnow(jpi,jpj,1) )
          IF( sf_icbmsk(1)%ln_tint )   ALLOCATE( sf_icbmsk(1)%fdta(jpi,jpj,1,2) )
-         IF( TRIM(sf_icbmsk(1)%clrootname) == 'NOT USED' ) sf_icbmsk(1)%fnow(:,:,1) = 0._wp   ! not used field  (set to 0)         
+         IF( TRIM(sf_icbmsk(1)%clrootname) == 'NOT USED' ) sf_icbmsk(1)%fnow(:,:,1) = 0._wp   ! not used field  (set to 0)
       ELSE
          icb_mask(:,:) = 0._wp
       ENDIF
-      !                                      !--- other init 
+      !                                      !--- other init
       CALL ice_dyn_rdgrft_init          ! set ice ridging/rafting parameters
       CALL ice_dyn_rhg_init             ! set ice rheology parameters
@@ -307 +307 @@
    !!   Default option         Empty module           NO SI3 sea-ice model
    !!----------------------------------------------------------------------
-#endif 
+#endif
 
    !!======================================================================