Changeset 14054 for NEMO/branches/2020/dev_r13747_ENHANCE-04_dford_OBSOP_BGC/src/SAS

Timestamp:

2020-12-03T14:55:50+01:00 (4 years ago)

Author:

ayoung

Message:

Updated to trunk at 14052. No conflicts since last sette test at 14034. Ticket #2567.

Location:

NEMO/branches/2020/dev_r13747_ENHANCE-04_dford_OBSOP_BGC/src/SAS

Files:

• nemogcm.F90 (modified) (3 diffs)
• sbcssm.F90 (modified) (2 diffs)

NEMO/branches/2020/dev_r13747_ENHANCE-04_dford_OBSOP_BGC/src/SAS/nemogcm.F90

@@ -34 +34 @@
    USE diu_layers     ! diurnal bulk SST and coolskin
    USE step_diu       ! diurnal bulk SST timestepping (called from here if run offline)
+   USE icb_oce        ! icebergs
    !
    USE prtctl         ! Print control
@@ -215 +216 @@
       !!----------------------------------------------------------------------
       !
-      IF( lk_oasis ) THEN   ;   cxios_context = 'sas'
-      ELSE                  ;   cxios_context = 'nemo'
+      IF( lk_oasis ) THEN   ;   cxios_context = 'sas'    ! when coupling SAS to OCE
+      ELSE                  ;   cxios_context = 'nemo'   ! 
       ENDIF
       nn_hls = 1
+      !
+      l_SAS = .TRUE.   ! used in domain:dom_nam
       !
       !                             !-------------------------------------------------!
@@ -393 +396 @@
       ! ==>
                            CALL icb_init( rn_Dt, nit000)   ! initialise icebergs instance
+
+      ! compatibility check
+      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(lwp) WRITE(numout,cform_aaa)           ! Flag AAAAAAA

NEMO/branches/2020/dev_r13747_ENHANCE-04_dford_OBSOP_BGC/src/SAS/sbcssm.F90

@@ -21 +21 @@
    USE zpshde         ! z-coord. with partial steps: horizontal derivatives
    USE closea         ! for ln_closea
+   USE icb_oce        ! for icebergs
    !
    USE in_out_manager ! I/O manager
@@ -226 +227 @@
          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