Changeset 14072 for NEMO/trunk/src/ICE/icedyn_rhg.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_rhg.F90 (modified) (7 diffs)

NEMO/trunk/src/ICE/icedyn_rhg.F90

@@ -2 +2 @@
    !!======================================================================
    !!                     ***  MODULE  icedyn_rhg  ***
-   !!   Sea-Ice dynamics : master routine for rheology 
+   !!   Sea-Ice dynamics : master routine for rheology
    !!======================================================================
    !! history :  4.0  !  2018     (C. Rousset)      Original code
@@ -49 +49 @@
       !!-------------------------------------------------------------------
       !!               ***  ROUTINE ice_dyn_rhg  ***
-      !!               
+      !!
       !! ** Purpose :   compute ice velocity
       !!
@@ -72 +72 @@
       !--------------!
       !== Rheology ==!
-      !--------------!   
+      !--------------!
       SELECT CASE( nice_rhg )
       !                                !------------------------!
@@ -78 +78 @@
          !                             !------------------------!
          CALL ice_dyn_rhg_evp( kt, Kmm, stress1_i, stress2_i, stress12_i, shear_i, divu_i, delta_i )
-         !        
+         !
          !                             !------------------------!
       CASE( np_rhgVP  )                ! Viscous-Plastic        !
@@ -121 +121 @@
       !!
       NAMELIST/namdyn_rhg/  ln_rhg_EVP, ln_aEVP, ln_rhg_EAP, rn_creepl, rn_ecc , nn_nevp, rn_relast, nn_rhg_chkcvg, &  !-- evp
-         &                  ln_rhg_VP, nn_vp_nout, nn_vp_ninn, nn_vp_chkcvg                                            !-- vp 
+         &                  ln_rhg_VP, nn_vp_nout, nn_vp_ninn, nn_vp_chkcvg                                            !-- vp
       !!-------------------------------------------------------------------
       !
@@ -156 +156 @@
       !
       !                             !== set the choice of ice advection ==!
-      ioptio = 0 
+      ioptio = 0
       IF( ln_rhg_EVP ) THEN   ;   ioptio = ioptio + 1   ;   nice_rhg = np_rhgEVP    ;   ENDIF
       IF( ln_rhg_EAP ) THEN   ;   ioptio = ioptio + 1   ;   nice_rhg = np_rhgEAP    ;   ENDIF
-      IF( ln_rhg_VP  ) THEN   ;   ioptio = ioptio + 1   ;   nice_rhg = np_rhgVP     ;   ENDIF 
+      IF( ln_rhg_VP  ) THEN   ;   ioptio = ioptio + 1   ;   nice_rhg = np_rhgVP     ;   ENDIF
       IF( ioptio /= 1 )   CALL ctl_stop( 'ice_dyn_rhg_init: choose one and only one ice rheology' )
       !
@@ -172 +172 @@
    !!   Default option         Empty module           NO SI3 sea-ice model
    !!----------------------------------------------------------------------
-#endif 
+#endif
 
    !!======================================================================