Changeset 4938

Timestamp:

2014-12-01T14:53:48+01:00 (9 years ago)

Author:

acc

Message:

Branch dev_r4879_UKMO_NOC_MERGE. Partial fix to sbcisf.F90 to get AGRIF to compile

File:

• branches/2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) (2 diffs)

branches/2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90

@@ -402 +402 @@
       LOGICAL :: ln_isomip = .true.
       REAL(wp), DIMENSION(:,:), POINTER       ::   zfrz,zpress,zti
-      REAL(wp), DIMENSION(:,:), POINTER, SAVE ::   zgammat2d, zgammas2d 
+      REAL(wp), DIMENSION(:,:), POINTER       ::   zgammat2d, zgammas2d 
       !REAL(wp), DIMENSION(:,:), POINTER ::   zqisf, zfwfisf
       REAL(wp) ::   zlamb1, zlamb2, zlamb3
@@ -816 +816 @@
                ! test on tmask useless ?????
                DO jk = ikt, mbkt(ji,jj)
-                  IF ( (SUM(fse3t(ji,jj,ikt:jk-1)) .LT. rhisf_tbl(ji,jj)) .AND. (tmask(ji,jj,jk) == 1) ) ikb = jk
+!                  IF ( (SUM(fse3t(ji,jj,ikt:jk-1)) .LT. rhisf_tbl(ji,jj)) .AND. (tmask(ji,jj,jk) == 1) ) ikb = jk
                END DO
                rhisf_tbl(ji,jj) = MIN(rhisf_tbl(ji,jj), SUM(fse3t(ji,jj,ikt:ikb)))  ! limit the tbl to water thickness.