Changeset 2000 for branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/ZDF/zdfkpp.F90

Timestamp:

2010-07-09T13:27:11+02:00 (14 years ago)

Author:

acc

Message:

ticket #684 step 7: Add in changes between the head of the DEV_r1821_Rivers branch and the trunk@1821. Note untested changes were made to the Rivers branch before this merge see wiki ticket page for details

File:

• branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/ZDF/zdfkpp.F90 (modified) (1 diff)

branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/ZDF/zdfkpp.F90

@@ -453 +453 @@
             zBosol(ji,jj) = grav * zthermal * qsr(ji,jj)
             ! Non radiative surface buoyancy force
-            zBo   (ji,jj) = grav * zthermal * qns(ji,jj) -  grav * zhalin * emps(ji,jj)
+            zBo   (ji,jj) = grav * zthermal * qns(ji,jj) -  grav * zhalin * ( emps(ji,jj)-rnf(ji,jj) ) 
             ! Surface Temperature flux for non-local term
             wt0(ji,jj) = - ( qsr(ji,jj) + qns(ji,jj) )* ro0cpr * tmask(ji,jj,1)
             ! Surface salinity flux for non-local term
-            ws0(ji,jj) = - ( emps(ji,jj) * sn(ji,jj,1) * rcs ) * tmask(ji,jj,1)
+            ws0(ji,jj) = - ( ( emps(ji,jj)-rnf(ji,jj) ) * sn(ji,jj,1) * rcs ) * tmask(ji,jj,1) 
          ENDDO
       ENDDO