Changeset 4726 for branches/2014/dev_r4650_UKMO2_ice_shelves/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90

Timestamp:

2014-07-23T18:27:21+02:00 (10 years ago)

Author:

mathiot

Message:

ISF branch: change name of 2 variables (icedep => risfdep and lmask => ssmask), cosmetic changes and add ldfslp key

File:

• branches/2014/dev_r4650_UKMO2_ice_shelves/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) (3 diffs)

branches/2014/dev_r4650_UKMO2_ice_shelves/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90

@@ -230 +230 @@
                DO jk = ikt, ikb - 1
                ! compute tfreez for the temperature correction (we add water at freezing temperature)
-                  zpress = grav*rau0*fsdept(ji,jj,jk)*1.e-04
+!                  zpress = grav*rau0*fsdept(ji,jj,jk)*1.e-04
                   zt_frz = -1.9 !tfreez1D( tsn(ji,jj,jk,jp_sal), zpress )
                ! compute trend
@@ -242 +242 @@
    
                ! level partially include in ice shelf boundary layer 
-               zhk   = SUM( fse3t(ji, jj, ikt:ikb - 1)) * r1_hisf_tbl(ji,jj)  ! proportion of tbl cover by cell from ikt to ikb - 1
-               zalpha = rhisf_tbl(ji,jj) * ( 1._wp - zhk ) / fse3t(ji,jj,ikb)     ! proportion of bottom cell influenced by boundary layer
                ! compute tfreez for the temperature correction (we add water at freezing temperature)
-               zpress = grav*rau0*fsdept(ji,jj,ikb)*1.e-04
+!               zpress = grav*rau0*fsdept(ji,jj,ikb)*1.e-04
                zt_frz = -1.9 !tfreez1D( tsn(ji,jj,ikb,jp_sal), zpress )
                ! compute trend
@@ -251 +249 @@
                   &              + zfact * (risf_tsc_b(ji,jj,jp_tem) + risf_tsc(ji,jj,jp_tem)          &
                   &                  - rdivisf * (fwfisf(ji,jj) + fwfisf_b(ji,jj)) * zt_frz * r1_rau0) & 
-                  &              * r1_hisf_tbl(ji,jj) * zalpha
+                  &              * r1_hisf_tbl(ji,jj) * ralpha(ji,jj)
                tsa(ji,jj,ikb,jp_sal) = tsa(ji,jj,ikb,jp_sal)                                           &
-                  &              + zfact * (risf_tsc_b(ji,jj,jp_sal) + risf_tsc(ji,jj,jp_sal)) * r1_hisf_tbl(ji,jj) * zalpha 
+                  &              + zfact * (risf_tsc_b(ji,jj,jp_sal) + risf_tsc(ji,jj,jp_sal)) * r1_hisf_tbl(ji,jj) * ralpha(ji,jj) 
             END DO
          END DO