Changeset 2004 for branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/TRA/trasbc.F90

Timestamp:

2010-07-09T14:40:45+02:00 (14 years ago)

Author:

acc

Message:

ticket #684 step 8: Add in changes from the trunk between revisions 1879 and the 3.2.1 tag (rev 1986)

File:

• branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) (1 diff)

branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/TRA/trasbc.F90

@@ -139 +139 @@
                zta =  ro0cpr * qns(ji,jj) * zse3t &                  ! temperature : heat flux 
                 &    - emp(ji,jj) * zsrau * tn(ji,jj,1) * zse3t      ! & cooling/heating effet of EMP flux 
-               zsa = 0.e0                                            ! No salinity concent./dilut. effect
+               zsa = ( emps(ji,jj) - emp(ji,jj) ) &
+                &                 * zsrau * sn(ji,jj,1)  * zse3t     ! concent./dilut. effect due to sea-ice 
+                                                                     ! melt/formation and (possibly) SSS restoration
             ELSE
                zta =  ro0cpr * qns(ji,jj) * zse3t                    ! temperature : heat flux