- Timestamp:
- 2015-10-31T08:40:45+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90
r5836 r5845 40 40 REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: sn0 ! initial salinity 41 41 42 !! * Substitutions43 # include "domzgr_substitute.h90"44 42 !!---------------------------------------------------------------------- 45 43 !! NEMO/OPA 3.3 , NEMO Consortium (2010) … … 99 97 ztsn(:,:,:,jp_tem) = tsn(:,:,:,jp_tem) ! thermosteric ssh 100 98 ztsn(:,:,:,jp_sal) = sn0(:,:,:) 101 CALL eos( ztsn, zrhd, fsdept_n(:,:,:) ) ! now in situ density using initial salinity99 CALL eos( ztsn, zrhd, gdept_n(:,:,:) ) ! now in situ density using initial salinity 102 100 ! 103 101 zbotpres(:,:) = 0._wp ! no atmospheric surface pressure, levitating sea-ice 104 102 DO jk = 1, jpkm1 105 zbotpres(:,:) = zbotpres(:,:) + fse3t(:,:,jk) * zrhd(:,:,jk)103 zbotpres(:,:) = zbotpres(:,:) + e3t_n(:,:,jk) * zrhd(:,:,jk) 106 104 END DO 107 105 IF( .NOT.lk_vvl ) THEN … … 123 121 124 122 ! ! steric sea surface height 125 CALL eos( tsn, zrhd, zrhop, fsdept_n(:,:,:) ) ! now in situ and potential density123 CALL eos( tsn, zrhd, zrhop, gdept_n(:,:,:) ) ! now in situ and potential density 126 124 zrhop(:,:,jpk) = 0._wp 127 125 CALL iom_put( 'rhop', zrhop ) … … 129 127 zbotpres(:,:) = 0._wp ! no atmospheric surface pressure, levitating sea-ice 130 128 DO jk = 1, jpkm1 131 zbotpres(:,:) = zbotpres(:,:) + fse3t(:,:,jk) * zrhd(:,:,jk)129 zbotpres(:,:) = zbotpres(:,:) + e3t_n(:,:,jk) * zrhd(:,:,jk) 132 130 END DO 133 131 IF( .NOT.lk_vvl ) THEN … … 159 157 DO jj = 1, jpj 160 158 DO ji = 1, jpi 161 zztmp = area(ji,jj) * fse3t(ji,jj,jk)159 zztmp = area(ji,jj) * e3t_n(ji,jj,jk) 162 160 ztemp = ztemp + zztmp * tsn(ji,jj,jk,jp_tem) 163 161 zsal = zsal + zztmp * tsn(ji,jj,jk,jp_sal)
Note: See TracChangeset
for help on using the changeset viewer.