Changeset 14071

Timestamp:

2020-12-04T08:43:44+01:00 (3 years ago)

Author:

laurent

Message:

Catch up with trunk at r14070

Location:

NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src

Files:

• OCE/IOM/iom.F90 (modified) (1 diff)
• SAS/sbcssm.F90 (modified) (1 diff)

NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/OCE/IOM/iom.F90

@@ -2331 +2331 @@
       CASE ('U')        ;   icnr =  0   ;   jcnr = -1
       CASE ('V')        ;   icnr = -1   ;   jcnr =  0
+      CASE ('F')        ;   icnr =  0   ;   jcnr =  0
       END SELECT
       !

NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/SAS/sbcssm.F90

@@ -230 +230 @@
          ln_closea = .false.
       ENDIF
-      IF( ln_icebergs .AND. ln_M2016 ) THEN
-         IF( lwp ) WRITE(numout,*) '         ==>>>   ln_iceberg and ln_M2016 not compatible with SAS (need 3d data)'
-         CALL ctl_stop('ln_iceberg and ln_M2016 not compatible with SAS (need 3d data)')
-      END IF
       !
       IF( l_sasread ) THEN                       ! store namelist information in an array