Changeset 6074 for branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN
- Timestamp:
- 2015-12-16T17:42:24+01:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90
r6069 r6074 215 215 ! compute density of the water displaced by the ice shelf 216 216 DO jk = 1, jpk 217 CALL eos(ztstop(:,:,:), fsdept_n(:,:,jk),zrhd(:,:,jk))217 CALL eos(ztstop(:,:,:),gdept_n(:,:,jk),zrhd(:,:,jk)) 218 218 END DO 219 219 … … 228 228 DO ji = 1, jpi 229 229 ikt=mikt(ji,jj) 230 ziceload(ji,jj) = ziceload(ji,jj) + (znad + zrhd(ji,jj,1) ) * fse3w(ji,jj,1) * (1._wp - tmask(ji,jj,1))230 ziceload(ji,jj) = ziceload(ji,jj) + (znad + zrhd(ji,jj,1) ) * e3w(ji,jj,1) * (1._wp - tmask(ji,jj,1)) 231 231 DO jk=2,ikt-1 232 ziceload(ji,jj) = ziceload(ji,jj) + (2._wp * znad + zrhd(ji,jj,jk-1) + zrhd(ji,jj,jk)) * fse3w(ji,jj,jk) &232 ziceload(ji,jj) = ziceload(ji,jj) + (2._wp * znad + zrhd(ji,jj,jk-1) + zrhd(ji,jj,jk)) * e3w(ji,jj,jk) & 233 233 & * (1._wp - tmask(ji,jj,jk)) 234 234 END DO
Note: See TracChangeset
for help on using the changeset viewer.