Changeset 9929 for NEMO/trunk/src/ICE
- Timestamp:
- 2018-07-11T15:59:30+02:00 (6 years ago)
- Location:
- NEMO/trunk/src/ICE
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/trunk/src/ICE/icealb.F90
r9910 r9929 149 149 ! 150 150 ! !--- Snow-covered ice albedo (freezing, melting cases) 151 IF( pt_su(ji,jj,jl) < rt0 _snow) THEN151 IF( pt_su(ji,jj,jl) < rt0 ) THEN 152 152 zalb_snw = rn_alb_sdry - ( rn_alb_sdry - zalb_ice ) * EXP( - ph_snw(ji,jj,jl) * z1_c3 ) 153 153 ELSE -
NEMO/trunk/src/ICE/icedyn_adv_umx.F90
r9866 r9929 136 136 ! 137 137 END SUBROUTINE ice_dyn_adv_umx 138 138 139 139 140 SUBROUTINE adv_umx( k_order, kt, pdt, puc, pvc, pubox, pvbox, ptc ) … … 159 160 INTEGER :: ji, jj ! dummy loop indices 160 161 REAL(wp) :: ztra ! local scalar 161 REAL(wp) :: zfp_ui, zfp_vj ! - -162 REAL(wp) :: zfm_ui, zfm_vj ! - -163 162 REAL(wp), DIMENSION(jpi,jpj) :: zfu_ups, zfu_ho, zt_u, zt_ups 164 163 REAL(wp), DIMENSION(jpi,jpj) :: zfv_ups, zfv_ho, zt_v, ztrd … … 169 168 DO jj = 1, jpjm1 ! upstream tracer flux in the i and j direction 170 169 DO ji = 1, fs_jpim1 ! vector opt. 171 zfp_ui = puc(ji,jj) + ABS( puc(ji,jj) ) 172 zfm_ui = puc(ji,jj) - ABS( puc(ji,jj) ) 173 zfp_vj = pvc(ji,jj) + ABS( pvc(ji,jj) ) 174 zfm_vj = pvc(ji,jj) - ABS( pvc(ji,jj) ) 175 zfu_ups(ji,jj) = 0.5_wp * ( zfp_ui * ptc(ji,jj) + zfm_ui * ptc(ji+1,jj ) ) 176 zfv_ups(ji,jj) = 0.5_wp * ( zfp_vj * ptc(ji,jj) + zfm_vj * ptc(ji ,jj+1) ) 170 zfu_ups(ji,jj) = MAX( puc(ji,jj), 0._wp ) * ptc(ji,jj) + MIN( puc(ji,jj), 0._wp ) * ptc(ji+1,jj) 171 zfv_ups(ji,jj) = MAX( pvc(ji,jj), 0._wp ) * ptc(ji,jj) + MIN( pvc(ji,jj), 0._wp ) * ptc(ji,jj+1) 177 172 END DO 178 173 END DO -
NEMO/trunk/src/ICE/icethd_zdf_bl99.F90
r9916 r9929 805 805 cnd_ice_1d(ji) = 2._wp * zkappa_i(ji,0) 806 806 ELSE 807 cnd_ice_1d(ji) = 2._wp * ztcond_i(ji,0) / 0.1_wp807 cnd_ice_1d(ji) = 2._wp * ztcond_i(ji,0) * 10._wp 808 808 ENDIF 809 809 ENDIF
Note: See TracChangeset
for help on using the changeset viewer.