Changeset 14043 for NEMO/branches/2020/dev_r13787_OSMOSIS_IMMERSE/src/SAS/nemogcm.F90

Timestamp:

2020-12-03T12:54:29+01:00 (4 years ago)

Author:

acc

Message:

dev_r13787_OSMOSIS_IMMERSE merge in trunk changes up to 14041

Location:

NEMO/branches/2020/dev_r13787_OSMOSIS_IMMERSE

Files:

• . (modified) (1 prop)
• src/SAS/nemogcm.F90 (modified) (3 diffs)

NEMO/branches/2020/dev_r13787_OSMOSIS_IMMERSE

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@13559        sette
+^/utils/CI/sette_wave@13990         sette

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@13559        sette
+^/utils/CI/sette_wave@13990         sette

NEMO/branches/2020/dev_r13787_OSMOSIS_IMMERSE/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
@@ -374 +375 @@
      CALL Agrif_Declare_Var_ini   !  "      "   "   "      "  DOM
 #endif
-                           CALL dom_init( Nbb, Nnn, Naa, 'SAS') ! Domain
+                           CALL dom_init( Nbb, Nnn, Naa ) ! Domain
       IF( sn_cfctl%l_prtctl )   &
          &                 CALL prt_ctl_init        ! Print control
@@ -393 +394 @@
       ! ==>
                            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

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@13559        sette
+^/utils/CI/sette_wave@13990         sette