Changeset 9361

Timestamp:

2018-02-26T16:33:11+01:00 (7 years ago)

Author:

mathiot

Message:

Correction of issue related to runoff in depth and isf (apparition during METO+MERCATOR merge). Now, filter+correction applied first on emp, then on rnf (if rnf), then on isf (if isf)

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) (2 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90

@@ -29 +29 @@
    USE sbc_oce        ! Surface boundary condition: ocean fields
    USE sbcrnf         ! river runoffs
+   USE sbcisf         ! ice shelf
    USE phycst         ! physical constants
    USE dynadv         ! dynamics: vector invariant versus flux form
@@ -221 +222 @@
             ! => time filter + conservation correction (only at the first level)
             zcoef = atfp * rdt * r1_rau0
-            IF ( .NOT. ln_isf ) THEN   ! if no ice shelf melting
-               e3t_b(:,:,1) = e3t_b(:,:,1) - zcoef * ( emp_b(:,:) - emp(:,:) &
-                              &                      - rnf_b(:,:) + rnf(:,:) ) * tmask(:,:,1)
-            ELSE                     ! if ice shelf melting
-               DO jj = 1, jpj
-                  DO ji = 1, jpi
-                     ikt = mikt(ji,jj)
-                     e3t_b(ji,jj,ikt) = e3t_b(ji,jj,ikt) - zcoef * (  emp_b   (ji,jj) - emp   (ji,jj)  &
-                        &                                           - rnf_b   (ji,jj) + rnf   (ji,jj)  &
-                        &                                           + fwfisf_b(ji,jj) - fwfisf(ji,jj)  ) * tmask(ji,jj,ikt)
+
+            e3t_b(:,:,1) = e3t_b(:,:,1) - zcoef * ( emp_b(:,:) - emp(:,:) ) * tmask(:,:,1)
+
+            IF ( ln_rnf ) THEN
+               IF( ln_rnf_depth ) THEN
+                  DO jk = 1, jpkm1 ! Deal with Rivers separetely, as can be through depth too
+                     DO jj = 1, jpj
+                        DO ji = 1, jpi
+                           IF( jk <=  nk_rnf(ji,jj)  ) THEN
+                               e3t_b(ji,jj,jk) =   e3t_b(ji,jj,jk) - zcoef *  ( - rnf_b(ji,jj) + rnf(ji,jj) ) &
+                                      &          * ( e3t_n(ji,jj,jk) / h_rnf(ji,jj) ) * tmask(ji,jj,jk)
+                           ENDIF
+                        ENDDO
+                     ENDDO
+                  ENDDO
+               ELSE
+                  e3t_b(:,:,1) = e3t_b(:,:,1) - zcoef *  ( -rnf_b(:,:) + rnf(:,:))*tmask(:,:,1)
+               ENDIF
+            END IF
+
+            IF ( ln_isf ) THEN   ! if ice shelf melting
+               DO jk = 1, jpkm1 ! Deal with isf separetely, as can be through depth too
+                  DO jj = 1, jpj
+                     DO ji = 1, jpi
+                        IF( misfkt(ji,jj) <= jk .AND. jk <= misfkb(ji,jj) ) THEN
+                           e3t_b(ji,jj,jk) =   e3t_b(ji,jj,jk) - zcoef *  ( fwfisf_b(ji,jj) - fwfisf(ji,jj) ) &
+                                &          * ( e3t_n(ji,jj,jk) * r1_hisf_tbl(ji,jj) ) * tmask(ji,jj,jk)
+                        ENDIF
+                     END DO
                   END DO
                END DO
-               ! Add volume filter correction: compatibility with tracer advection scheme
-               ! => time filter + conservation correction (only at the first level)
-               zcoef = atfp * rdt * r1_rau0
-               IF ( .NOT. ln_isf ) THEN   ! if no ice shelf melting
-                  e3t_b(:,:,1) = e3t_b(:,:,1) - zcoef * ( emp_b(:,:) - emp(:,:) &
-                                 &                      ) * tmask(:,:,1)
-                  IF( ln_rnf_depth ) THEN 
-                     DO jk = 1, jpkm1 ! Deal with Rivers separetely, as can be through depth too, not sure for ice shelf case yet
-                        DO jj = 1, jpj
-                           DO ji = 1, jpi
-                              IF( mikt(ji,jj) <= jk .and. jk <=  nk_rnf(ji,jj)  ) THEN
-                                 e3t_b(ji,jj,jk) =   e3t_b(ji,jj,jk) - zcoef *  ( - rnf_b(ji,jj) + rnf(ji,jj) ) &
-                                      &          * ( e3t_n(ji,jj,jk) / h_rnf(ji,jj) ) * tmask(ji,jj,jk)
-                              ENDIF
-                           ENDDO
-                        ENDDO
-                     ENDDO
-                  ELSE
-                      e3t_b(:,:,1) = e3t_b(:,:,1) - zcoef *  ( -rnf_b(:,:) + rnf(:,:))*tmask(:,:,1)
-                  ENDIF
-               ELSE                     ! if ice shelf melting
-                  DO jj = 1, jpj
-                     DO ji = 1, jpi
-                        ikt = mikt(ji,jj)
-                        e3t_b(ji,jj,ikt) = e3t_b(ji,jj,ikt) - zcoef * (  emp_b   (ji,jj) - emp   (ji,jj)  &
-                           &                                           - rnf_b   (ji,jj) + rnf   (ji,jj)  &
-                           &                                           + fwfisf_b(ji,jj) - fwfisf(ji,jj)  ) * tmask(ji,jj,ikt)
-                     END DO
-                  END DO
-               END IF
             END IF
             !