Changeset 13365 for NEMO/branches

Timestamp:

2020-07-30T18:57:15+02:00 (4 years ago)

Author:

mathiot

Message:

ticket #1900: add compatibility check (nn_fsbc and ln_M2016, SAS and ln_M2016) and rm useless debug print

Location:

NEMO/branches/2020/tickets_icb_1900/src

Files:

• OCE/ICB/icbini.F90 (modified) (1 diff)
• OCE/ICB/icbutl.F90 (modified) (1 diff)
• SAS/nemogcm.F90 (modified) (2 diffs)
• SAS/sbcssm.F90 (modified) (2 diffs)

NEMO/branches/2020/tickets_icb_1900/src/OCE/ICB/icbini.F90

@@ -73 +73 @@
       !
       IF( .NOT. ln_icebergs )   RETURN
-
+      !
+      ! check nn_fsbc
+      IF ( ln_icebergs .AND. ln_M2016 .AND. nn_fsbc /= 1) THEN
+         IF (lwp) WRITE(numout,*) 'The use of ln_M2016 within the iceberg module is only compatible with nn_fsbc == 1'
+         IF (lwp) WRITE(numout,*) 'because it needs the 3d t,s,u,v model data'
+         CALL ctl_stop('Compatibility error in the iceberg module')
+      END IF
+      !
       !                          ! allocate gridded fields
       IF( icb_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'icb_alloc : unable to allocate arrays' )

NEMO/branches/2020/tickets_icb_1900/src/OCE/ICB/icbutl.F90

@@ -434 +434 @@
       ii = mi1(ii)
       ij = mj1(ij)
-
-      IF (lwp) THEN
-         WRITE(numout,*) 'bilin_e ', pi, pj
-         WRITE(numout,*) ii, ij, zi, zj
-         WRITE(numout,*) ''
-      END IF
-
       !
       IF(    0.0_wp <= zi .AND. zi < 0.5_wp   ) THEN

NEMO/branches/2020/tickets_icb_1900/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 in_out_manager ! I/O manager
@@ -376 +377 @@
       ! ==>
                            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/tickets_icb_1900/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