- Timestamp:
- 2020-11-14T20:03:15+01:00 (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/dev_r13787_SI3-10_EAP/src/ICE/icedyn_rhg.F90
r13472 r13797 17 17 USE ice ! sea-ice: variables 18 18 USE icedyn_rhg_evp ! sea-ice: EVP rheology 19 USE icedyn_rhg_eap ! sea-ice: EAP rheology 19 20 USE icectl ! sea-ice: control prints 20 21 ! … … 33 34 ! ! associated indices: 34 35 INTEGER, PARAMETER :: np_rhgEVP = 1 ! EVP rheology 35 !!INTEGER, PARAMETER :: np_rhgEAP = 2 ! EAP rheology36 INTEGER, PARAMETER :: np_rhgEAP = 2 ! EAP rheology 36 37 37 38 ! ** namelist (namrhg) ** 38 LOGICAL :: ln_rhg_EVP ! EVP rheology39 39 ! 40 40 !!---------------------------------------------------------------------- … … 78 78 CALL ice_dyn_rhg_evp( kt, Kmm, stress1_i, stress2_i, stress12_i, shear_i, divu_i, delta_i ) 79 79 ! 80 ! !----------------------------! 81 CASE( np_rhgEAP ) ! Elasto-Anisotropic-Plastic ! 82 ! !----------------------------! 83 CALL ice_dyn_rhg_eap( kt, Kmm, stress1_i, stress2_i, stress12_i, shear_i, divu_i, delta_i, aniso_11, aniso_12, rdg_conv ) 80 84 END SELECT 81 85 ! 82 86 IF( lrst_ice ) THEN !* write EVP fields in the restart file 83 87 IF( ln_rhg_EVP ) CALL rhg_evp_rst( 'WRITE', kt ) 88 IF( ln_rhg_EAP ) CALL rhg_eap_rst( 'WRITE', kt ) !* write EAP fields in the restart file 84 89 ENDIF 85 90 ! … … 108 113 INTEGER :: ios, ioptio ! Local integer output status for namelist read 109 114 !! 110 NAMELIST/namdyn_rhg/ ln_rhg_EVP, ln_aEVP, rn_creepl, rn_ecc , nn_nevp, rn_relast, nn_rhg_chkcvg115 NAMELIST/namdyn_rhg/ ln_rhg_EVP, ln_aEVP, ln_rhg_EAP, rn_creepl, rn_ecc , nn_nevp, rn_relast, nn_rhg_chkcvg 111 116 !!------------------------------------------------------------------- 112 117 ! … … 133 138 ELSEIF( nn_rhg_chkcvg == 2 ) THEN ; WRITE(numout,*) ' check cvg at both main and rheology time steps' 134 139 ENDIF 140 WRITE(numout,*) ' rheology EAP (icedyn_rhg_eap) ln_rhg_EAP = ', ln_rhg_EAP 135 141 ENDIF 136 142 ! … … 138 144 ioptio = 0 139 145 IF( ln_rhg_EVP ) THEN ; ioptio = ioptio + 1 ; nice_rhg = np_rhgEVP ; ENDIF 140 !!IF( ln_rhg_EAP ) THEN ; ioptio = ioptio + 1 ; nice_rhg = np_rhgEAP ; ENDIF146 IF( ln_rhg_EAP ) THEN ; ioptio = ioptio + 1 ; nice_rhg = np_rhgEAP ; ENDIF 141 147 IF( ioptio /= 1 ) CALL ctl_stop( 'ice_dyn_rhg_init: choose one and only one ice rheology' ) 142 148 ! 143 149 IF( ln_rhg_EVP ) CALL rhg_evp_rst( 'READ' ) !* read or initialize all required files 150 IF( ln_rhg_EAP ) CALL rhg_eap_rst( 'READ' ) !* read or initialize all required files 144 151 ! 145 152 END SUBROUTINE ice_dyn_rhg_init
Note: See TracChangeset
for help on using the changeset viewer.