Changeset 13365


Ignore:
Timestamp:
2020-07-30T18:57:15+02:00 (12 days 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:
4 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/tickets_icb_1900/src/OCE/ICB/icbini.F90

    r13357 r13365  
    7373      ! 
    7474      IF( .NOT. ln_icebergs )   RETURN 
    75  
     75      ! 
     76      ! check nn_fsbc 
     77      IF ( ln_icebergs .AND. ln_M2016 .AND. nn_fsbc /= 1) THEN 
     78         IF (lwp) WRITE(numout,*) 'The use of ln_M2016 within the iceberg module is only compatible with nn_fsbc == 1' 
     79         IF (lwp) WRITE(numout,*) 'because it needs the 3d t,s,u,v model data' 
     80         CALL ctl_stop('Compatibility error in the iceberg module') 
     81      END IF 
     82      ! 
    7683      !                          ! allocate gridded fields 
    7784      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

    r13359 r13365  
    434434      ii = mi1(ii) 
    435435      ij = mj1(ij) 
    436  
    437       IF (lwp) THEN 
    438          WRITE(numout,*) 'bilin_e ', pi, pj 
    439          WRITE(numout,*) ii, ij, zi, zj 
    440          WRITE(numout,*) '' 
    441       END IF 
    442  
    443436      ! 
    444437      IF(    0.0_wp <= zi .AND. zi < 0.5_wp   ) THEN 
  • NEMO/branches/2020/tickets_icb_1900/src/SAS/nemogcm.F90

    r13216 r13365  
    3434   USE diu_layers     ! diurnal bulk SST and coolskin 
    3535   USE step_diu       ! diurnal bulk SST timestepping (called from here if run offline) 
     36   USE icb_oce        ! icebergs 
    3637   ! 
    3738   USE in_out_manager ! I/O manager 
     
    376377      ! ==> 
    377378                           CALL icb_init( rn_Dt, nit000)   ! initialise icebergs instance 
     379 
     380      ! compatibility check 
     381      IF( ln_icebergs .AND. ln_M2016 ) THEN 
     382         IF( lwp ) WRITE(numout,*) '         ==>>>   ln_iceberg and ln_M2016 not compatible with SAS (need 3d data)' 
     383         CALL ctl_stop('ln_iceberg and ln_M2016 not compatible with SAS (need 3d data)') 
     384      END IF 
    378385      ! 
    379386      IF(lwp) WRITE(numout,cform_aaa)           ! Flag AAAAAAA 
  • NEMO/branches/2020/tickets_icb_1900/src/SAS/sbcssm.F90

    r12615 r13365  
    2121   USE zpshde         ! z-coord. with partial steps: horizontal derivatives 
    2222   USE closea         ! for ln_closea 
     23   USE icb_oce        ! for icebergs 
    2324   ! 
    2425   USE in_out_manager ! I/O manager 
     
    226227         ln_closea = .false. 
    227228      ENDIF 
    228  
     229      IF( ln_icebergs .AND. ln_M2016 ) THEN 
     230         IF( lwp ) WRITE(numout,*) '         ==>>>   ln_iceberg and ln_M2016 not compatible with SAS (need 3d data)' 
     231         CALL ctl_stop('ln_iceberg and ln_M2016 not compatible with SAS (need 3d data)') 
     232      END IF 
    229233      ! 
    230234      IF( l_sasread ) THEN                       ! store namelist information in an array 
Note: See TracChangeset for help on using the changeset viewer.