Ignore:
Timestamp:
2019-03-20T18:53:44+01:00 (20 months ago)
Author:
aumont
Message:

bug fixes corresponding to tickets #2262

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/releases/release-4.0/src/TOP/PISCES/P4Z/p4zsbc.F90

    r10522 r10780  
    2727   LOGICAL , PUBLIC ::   ln_ironsed   !: boolean for Fe input from sediments 
    2828   LOGICAL , PUBLIC ::   ln_hydrofe   !: boolean for Fe input from hydrothermal vents 
    29    LOGICAL , PUBLIC ::   ln_ironice   !: boolean for Fe input from sea ice 
    3029   REAL(wp), PUBLIC ::   sedfeinput   !: Coastal release of Iron 
    3130   REAL(wp), PUBLIC ::   dustsolub    !: Solubility of the dust 
     
    109108         IF( kt == nit000 .OR. ( kt /= nit000 .AND. ntimes_dust > 1 ) ) THEN 
    110109            CALL fld_read( kt, 1, sf_dust ) 
    111             IF( nn_ice_tr == -1 .AND. .NOT.ln_ironice ) THEN   ;   dust(:,:) = MAX( rtrn, sf_dust(1)%fnow(:,:,1) ) 
    112             ELSE                                               ;   dust(:,:) = MAX( rtrn, sf_dust(1)%fnow(:,:,1) * ( 1.-fr_i(:,:) ) ) 
    113             ENDIF 
     110            dust(:,:) = MAX( rtrn, sf_dust(1)%fnow(:,:,1) ) * ( 1.0 - fr_i(ji,jj) ) 
    114111         ENDIF 
    115112      ENDIF 
     
    265262      END IF 
    266263 
    267       IF( nn_ice_tr >= 0 .AND. ln_ironice ) THEN 
    268          IF(lwp) THEN 
    269             WRITE(numout,*) '   ==>>>   ln_ironice incompatible with nn_ice_tr = ', nn_ice_tr 
    270             WRITE(numout,*) '           Specify your sea ice iron concentration in nampisice instead ' 
    271             WRITE(numout,*) '           ln_ironice is forced to .FALSE. ' 
    272          ENDIF 
    273          ln_ironice = .FALSE. 
    274       ENDIF 
    275  
    276264      IF( ln_dust .OR. ln_river .OR. ln_ndepo ) THEN   ;   ll_sbc = .TRUE. 
    277265      ELSE                                             ;   ll_sbc = .FALSE. 
Note: See TracChangeset for help on using the changeset viewer.