Changeset 12063 for NEMO/branches/2019/dev_ASINTER-01-05_merged/src/OCE/SBC/sbcmod.F90

Timestamp:

2019-12-05T11:46:38+01:00 (4 years ago)

Author:

gsamson

Message:

dev_ASINTER-01-05_merged: update branch with dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk@r12061 and trunk@r12055 + bugfix for agrif compatibility in sbcblk: sette tests with ref configs ok except ABL restartability (under investigation) (tickets #2159 and #2131)

File:

• NEMO/branches/2019/dev_ASINTER-01-05_merged/src/OCE/SBC/sbcmod.F90 (modified) (2 diffs)

NEMO/branches/2019/dev_ASINTER-01-05_merged/src/OCE/SBC/sbcmod.F90

@@ -127 +127 @@
          IF( lk_cice )   nn_ice      = 3
       ENDIF
-#else
-      !IF( lk_si3  )   nn_ice      = 2
-      IF( lk_cice )   nn_ice      = 3
+!!GS: TBD
+!#else
+!      IF( lk_si3  )   nn_ice      = 2
+!      IF( lk_cice )   nn_ice      = 3
 #endif
       !
@@ -250 +251 @@
          fwfisf  (:,:)   = 0._wp   ;   risf_tsc  (:,:,:) = 0._wp
          fwfisf_b(:,:)   = 0._wp   ;   risf_tsc_b(:,:,:) = 0._wp
-      END IF
+      ENDIF
       IF( nn_ice == 0 ) THEN        !* No sea-ice in the domain : ice fraction is always zero
          IF( nn_components /= jp_iam_opa )   fr_i(:,:) = 0._wp    ! except for OPA in SAS-OPA coupled case