Changeset 13493

Timestamp:

2020-09-21T09:00:06+02:00 (3 years ago)

Author:

vancop

Message:

Some progress on VP rheology but still does not compile

Location:

NEMO/branches/2020/SI3-03_VP_rheology/src/ICE

Files:

• icedyn_rhg.F90 (modified) (6 diffs)
• icedyn_rhg_vp.F90 (added)

NEMO/branches/2020/SI3-03_VP_rheology/src/ICE/icedyn_rhg.F90

@@ -34 +34 @@
    INTEGER, PARAMETER ::   np_rhgEVP = 1   ! EVP rheology
 !! INTEGER, PARAMETER ::   np_rhgEAP = 2   ! EAP rheology
+   INTEGER, PARAMETER ::   np_rhgVP  = 3   ! VP rheology
 
    ! ** namelist (namrhg) **
    LOGICAL ::   ln_rhg_EVP       ! EVP rheology
+   LOGICAL ::   ln_rhg_VP        ! EVP rheology
    !
    !! * Substitutions
@@ -76 +78 @@
       !--------------!   
       SELECT CASE( nice_rhg )
-      !                                !------------------------!
-      CASE( np_rhgEVP )                ! Elasto-Viscous-Plastic !
-         !                             !------------------------!
+      !                                !---------------------------------!
+      CASE( np_rhgEVP )                ! Elasto-Viscous-Plastic rheology !
+         !                             !---------------------------------!
          CALL ice_dyn_rhg_evp( kt, stress1_i, stress2_i, stress12_i, shear_i, divu_i, delta_i )
+         !         
+      END SELECT
+
+      !                                !---------------------------------------------!
+      CASE( np_rhgVP  )                ! Viscous-Plastic rheology                    !
+         !                             !---------------------------------------------!
+         CALL ice_dyn_rhg_vp ( kt, stress1_i, stress2_i, stress12_i, shear_i, divu_i, delta_i )
          !         
       END SELECT
@@ -85 +94 @@
       IF( lrst_ice ) THEN                       !* write EVP fields in the restart file
          IF( ln_rhg_EVP )   CALL rhg_evp_rst( 'WRITE', kt )
+         IF( ln_rhg_VP  )   CALL rhg_lsr_rst( 'WRITE', kt )
       ENDIF
       !
@@ -110 +120 @@
       INTEGER ::   ios, ioptio   ! Local integer output status for namelist read
       !!
-      NAMELIST/namdyn_rhg/  ln_rhg_EVP, ln_aEVP, rn_creepl, rn_ecc , nn_nevp, rn_relast, ln_rhg_chkcvg
+      NAMELIST/namdyn_rhg/  ln_rhg_EVP, ln_aEVP, rn_creepl, rn_ecc , nn_nevp, rn_relast, ln_rhg_chkcvg, &
+    &                       ln_rhg_VP 
       !!-------------------------------------------------------------------
       !
@@ -133 +144 @@
          WRITE(numout,*) '         ratio of elastic timescale over ice time step     rn_relast     = ', rn_relast
          WRITE(numout,*) '      check convergence of rheology                        ln_rhg_chkcvg = ', ln_rhg_chkcvg
+         WRITE(numout,*) ''    
+         WRITE(numout,*) '      rheology VP     (icedyn_rhg_lsr)                     ln_rhg_VP     = ', ln_rhg_VP
       ENDIF
       !
@@ -139 +152 @@
       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( ioptio /= 1 )   CALL ctl_stop( 'ice_dyn_rhg_init: choose one and only one ice rheology' )
       !
       IF( ln_rhg_EVP  )   CALL rhg_evp_rst( 'READ' )  !* read or initialize all required files
+      IF( ln_rhg_VP   )   CALL rhg_lsr_rst( 'READ' )  !* read or initialize all required files
       !
    END SUBROUTINE ice_dyn_rhg_init