Changeset 13658 for NEMO/branches/UKMO/NEMO_4.0.2_IODRAG/src/OCE/DYN/dynzdf.F90

Timestamp:

2020-10-21T17:14:23+02:00 (4 years ago)

Author:

cguiavarch

Message:

Implicit sea ice drag: merge from NEMO/branches/MOI/NEMO_4.03_IODRAG [12947:12964]

File:

• NEMO/branches/UKMO/NEMO_4.0.2_IODRAG/src/OCE/DYN/dynzdf.F90 (modified) (3 diffs)

NEMO/branches/UKMO/NEMO_4.0.2_IODRAG/src/OCE/DYN/dynzdf.F90

@@ -141 +141 @@
             END DO
          END DO
-         IF( ln_isfcav ) THEN    ! Ocean cavities (ISF)
+         IF( ln_isfcav.OR.ln_drgice_imp ) THEN    ! Ocean cavities (ISF)
             DO jj = 2, jpjm1        
                DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -258 +258 @@
             END DO
          END DO
-         IF ( ln_isfcav ) THEN   ! top friction (always implicit)
+         IF ( ln_isfcav.OR.ln_drgice_imp ) THEN   ! top friction (always implicit)
             DO jj = 2, jpjm1
                DO ji = 2, jpim1
@@ -423 +423 @@
             END DO
          END DO
-         IF ( ln_isfcav ) THEN
+         IF ( ln_isfcav.OR.ln_drgice_imp ) THEN
             DO jj = 2, jpjm1
                DO ji = 2, jpim1