Changeset 10538 for NEMO/trunk/src/ICE
- Timestamp:
- 2019-01-17T11:41:10+01:00 (5 years ago)
- Location:
- NEMO/trunk/src/ICE
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/trunk/src/ICE/icectl.F90
r10425 r10538 156 156 IF ( ABS( zt ) > zt_sill ) WRITE(numout,*) 'violation enthalpy [GW] (',cd_routine,') = ',zt 157 157 IF ( zvmin < -epsi10 ) WRITE(numout,*) 'violation v_i<0 [m] (',cd_routine,') = ',zvmin 158 IF ( zamax > MAX(rn_amax_n,rn_amax_s)+epsi10 .AND. cd_routine /= 'icedyn_adv' .AND. cd_routine /= 'icedyn_rdgrft' ) & 158 IF ( zamax > MAX( rn_amax_n, rn_amax_s ) + epsi10 & 159 & .AND. cd_routine /= 'icedyn_adv' .AND. cd_routine /= 'icedyn_rdgrft' .AND. cd_routine /= 'Hbig' ) & 159 160 & WRITE(numout,*) 'violation a_i>amax (',cd_routine,') = ',zamax 160 161 IF ( zamin < -epsi10 ) WRITE(numout,*) 'violation a_i<0 (',cd_routine,') = ',zamin 161 !clem: the following check fails when using UM 3-5advection scheme (see comments in icedyn_adv.F90)162 !clem: the following check fails when using UMx advection scheme (see comments in icedyn_adv.F90) 162 163 ! IF ( ABS(zvtrp ) > zv_sill .AND. cd_routine == 'icedyn_adv' ) THEN 163 164 ! WRITE(numout,*) 'violation vtrp [Mt/day] (',cd_routine,') = ',zvtrp -
NEMO/trunk/src/ICE/icedyn.F90
r10512 r10538 81 81 ! 82 82 ! controls 83 IF( ln_timing ) CALL timing_start('icedyn') ! timing 84 IF( ln_icediachk ) CALL ice_cons_hsm(0, 'icedyn', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft) ! conservation 83 IF( ln_timing ) CALL timing_start('icedyn') 85 84 ! 86 85 IF( kt == nit000 .AND. lwp ) THEN … … 182 181 183 182 END SELECT 184 ! 185 ! controls 186 IF( ln_icediachk ) CALL ice_cons_hsm(1, 'icedyn', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft) ! conservation 187 IF( ln_timing ) CALL timing_stop ('icedyn') ! timing 183 ! 184 ! controls 185 IF( ln_timing ) CALL timing_stop ('icedyn') 188 186 ! 189 187 END SUBROUTINE ice_dyn … … 212 210 REAL(wp) :: zhip, zhi, zhs, zvs_excess, zfra 213 211 !!------------------------------------------------------------------- 212 ! controls 213 IF( ln_icediachk ) CALL ice_cons_hsm(0, 'Hbig', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft) ! conservation 214 214 ! 215 215 CALL ice_var_zapsmall !-- zap small areas … … 270 270 WHERE( a_ip(:,:,:) > a_i(:,:,:) ) a_ip(:,:,:) = a_i(:,:,:) 271 271 ! 272 ! controls 273 IF( ln_icediachk ) CALL ice_cons_hsm(1, 'Hbig', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft) ! conservation 274 ! 272 275 END SUBROUTINE Hbig 273 276 … … 285 288 INTEGER :: jl ! dummy loop indices 286 289 !!------------------------------------------------------------------- 290 ! controls 291 IF( ln_icediachk ) CALL ice_cons_hsm(0, 'Hpiling', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft) ! conservation 287 292 ! 288 293 CALL ice_var_zapsmall !-- zap small areas … … 294 299 END WHERE 295 300 END DO 301 ! controls 302 IF( ln_icediachk ) CALL ice_cons_hsm(1, 'Hpiling', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft) ! conservation 296 303 ! 297 304 END SUBROUTINE Hpiling
Note: See TracChangeset
for help on using the changeset viewer.