- Timestamp:
- 2020-12-02T10:38:21+01:00 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/SI3_vp_rheology/src/ICE/icedyn_rhg_vp.F90
r13965 r13967 145 145 INTEGER :: nn_nvp ! total number of VP iterations (n_out_vp*n_inn_vp) 146 146 ! 147 REAL(wp) :: zrhoco ! r au0 * rn_cio147 REAL(wp) :: zrhoco ! rho0 * rn_cio 148 148 REAL(wp) :: ecc2, z1_ecc2 ! square of yield ellipse eccenticity 149 149 REAL(wp) :: zglob_area ! global ice area for diagnostics … … 255 255 IF( lwp ) WRITE(numout,*) ' nn_nvp : ', nn_nvp 256 256 257 zrhoco = r au0 * rn_cio257 zrhoco = rho0 * rn_cio 258 258 259 259 ! ecc2: square of yield ellipse eccentricity … … 262 262 263 263 ! Initialise convergence checks 264 IF( ln_rhg_chkcvg) THEN264 IF( nn_rhg_chkcvg /= 0 ) THEN 265 265 266 266 ! ice area for global mean kinetic energy … … 362 362 363 363 ! Mass per unit area divided by time step 364 zmassU_t(ji,jj) = zmassU * r1_ rdtice365 zmassV_t(ji,jj) = zmassV * r1_ rdtice364 zmassU_t(ji,jj) = zmassU * r1_Dt_ice 365 zmassV_t(ji,jj) = zmassV * r1_Dt_ice 366 366 367 367 ! Acceleration term contribution to RHS (depends on velocity at previous time step) … … 1033 1033 zuerr_max = 0._wp 1034 1034 1035 IF ( ll_u_iterate .AND. MOD ( i_inn, nn_ cvgchk_vp) == 0 ) THEN1035 IF ( ll_u_iterate .AND. MOD ( i_inn, nn_vp_cvgchk ) == 0 ) THEN 1036 1036 1037 1037 ! - Maximum U-velocity difference … … 1064 1064 zverr_max = 0._wp 1065 1065 1066 IF ( ll_v_iterate .AND. MOD ( i_inn, nn_ cvgchk_vp) == 0 ) THEN1066 IF ( ll_v_iterate .AND. MOD ( i_inn, nn_vp_cvgchk ) == 0 ) THEN 1067 1067 1068 1068 ! - Maximum V-velocity difference … … 1099 1099 !--------------------------------------------------------------------------------------- 1100 1100 1101 IF( ln_rhg_chkcvg .AND. MOD ( i_inn - 1, nn_cvgchk_vp) == 0 ) CALL rhg_cvg_vp( kt, jter, nn_nvp, u_ice, v_ice, zmt, zuerr_max, zverr_max, zglob_area, &1101 IF( nn_rhg_chkcvg/=0 .AND. MOD ( i_inn - 1, nn_vp_cvgchk ) == 0 ) CALL rhg_cvg_vp( kt, jter, nn_nvp, u_ice, v_ice, zmt, zuerr_max, zverr_max, zglob_area, & 1102 1102 & zrhsu, zAU, zBU, zCU, zDU, zEU, zrhsv, zAV, zBV, zCV, zDV, zEV ) 1103 1103 … … 1137 1137 !------------------------------------------------------------------------------! 1138 1138 1139 IF( ln_rhg_chkcvg) THEN1139 IF( nn_rhg_chkcvg /= 0 ) THEN 1140 1140 1141 1141 IF( iom_use('uice_cvg') ) THEN … … 1144 1144 ENDIF 1145 1145 1146 ENDIF ! ln_rhg_chkcvg1146 ENDIF 1147 1147 1148 1148 ! MV DEBUG test - replace ice velocity by ocean current to give the model the means to go ahead
Note: See TracChangeset
for help on using the changeset viewer.