- Timestamp:
- 2015-12-16T10:25:22+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90
r5836 r6060 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)106 END DO 107 IF( .NOT.lk_vvl) THEN108 IF 103 zbotpres(:,:) = zbotpres(:,:) + e3t_n(:,:,jk) * zrhd(:,:,jk) 104 END DO 105 IF( ln_linssh ) THEN 106 IF( ln_isfcav ) THEN 109 107 DO ji=1,jpi 110 108 DO jj=1,jpj … … 115 113 zbotpres(:,:) = zbotpres(:,:) + sshn(:,:) * zrhd(:,:,1) 116 114 END IF 115 !!gm 116 !!gm riceload should be added in both ln_linssh=T or F, no? 117 !!gm 117 118 END IF 118 119 ! … … 123 124 124 125 ! ! steric sea surface height 125 CALL eos( tsn, zrhd, zrhop, fsdept_n(:,:,:) ) ! now in situ and potential density126 CALL eos( tsn, zrhd, zrhop, gdept_n(:,:,:) ) ! now in situ and potential density 126 127 zrhop(:,:,jpk) = 0._wp 127 128 CALL iom_put( 'rhop', zrhop ) … … 129 130 zbotpres(:,:) = 0._wp ! no atmospheric surface pressure, levitating sea-ice 130 131 DO jk = 1, jpkm1 131 zbotpres(:,:) = zbotpres(:,:) + fse3t(:,:,jk) * zrhd(:,:,jk)132 END DO 133 IF( .NOT.lk_vvl) THEN132 zbotpres(:,:) = zbotpres(:,:) + e3t_n(:,:,jk) * zrhd(:,:,jk) 133 END DO 134 IF( ln_linssh ) THEN 134 135 IF ( ln_isfcav ) THEN 135 136 DO ji=1,jpi … … 159 160 DO jj = 1, jpj 160 161 DO ji = 1, jpi 161 zztmp = area(ji,jj) * fse3t(ji,jj,jk)162 zztmp = area(ji,jj) * e3t_n(ji,jj,jk) 162 163 ztemp = ztemp + zztmp * tsn(ji,jj,jk,jp_tem) 163 164 zsal = zsal + zztmp * tsn(ji,jj,jk,jp_sal) … … 165 166 END DO 166 167 END DO 167 IF( .NOT.lk_vvl) THEN168 IF 168 IF( ln_linssh ) THEN 169 IF( ln_isfcav ) THEN 169 170 DO ji=1,jpi 170 171 DO jj=1,jpj
Note: See TracChangeset
for help on using the changeset viewer.