Changeset 8491
- Timestamp:
- 2017-09-01T18:15:45+02:00 (6 years ago)
- Location:
- branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icecor.F90
r8486 r8491 124 124 DO jj = 1, jpj 125 125 DO ji = 1, jpi 126 zsal = smv_i(ji,jj,jl) 127 smv_i(ji,jj,jl) = MIN( MAX( rn_simin*v_i(ji,jj,jl) , smv_i(ji,jj,jl) ) , rn_simax*v_i(ji,jj,jl) ) 128 ! associated salt flux 129 sfx_res(ji,jj) = sfx_res(ji,jj) - ( smv_i(ji,jj,jl) - zsal ) * zzc 126 IF( v_i(ji,jj,jl) > 0._wp ) THEN ! clem: useless IF ??? 127 zsal = smv_i(ji,jj,jl) 128 smv_i(ji,jj,jl) = MIN( MAX( rn_simin*v_i(ji,jj,jl) , smv_i(ji,jj,jl) ) , rn_simax*v_i(ji,jj,jl) ) 129 ! associated salt flux 130 sfx_res(ji,jj) = sfx_res(ji,jj) - ( smv_i(ji,jj,jl) - zsal ) * zzc 131 ENDIF 130 132 END DO 131 133 END DO -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerhg.F90
r8486 r8491 73 73 ! 74 74 IF( ln_landfast ) THEN ! -- Landfast ice parameterization: define max bottom friction 75 tau_icebfr(:,:) = 0._wp 75 76 DO jl = 1, jpl 76 WHERE( ht_i(:,:,jl) > ht_n(:,:) * rn_gamma ) ; tau_icebfr(:,:) = tau_icebfr(:,:) + a_i(:,:,jl) * rn_icebfr 77 ELSEWHERE ; tau_icebfr(:,:) = 0._wp 78 END WHERE 77 WHERE( ht_i(:,:,jl) > ht_n(:,:) * rn_gamma ) tau_icebfr(:,:) = tau_icebfr(:,:) + a_i(:,:,jl) * rn_icebfr 79 78 END DO 80 79 ENDIF -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90
r8488 r8491 206 206 zlay_i = REAL( nlay_i , wp ) ! number of layers 207 207 zaaa = cpic ! Conversion q(S,T) -> T (second order equation) 208 z1_2aaa = 1._wp / 2._wp *zaaa208 z1_2aaa = 1._wp / ( 2._wp * zaaa ) 209 209 zcpMcpic = rcp - cpic 210 210 DO jl = 1, jpl
Note: See TracChangeset
for help on using the changeset viewer.