Ignore:
Timestamp:
2019-11-29T16:59:07+01:00 (3 months ago)
Author:
gsamson
Message:

dev_ASINTER-01-05_merged: merge dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk branch @rev11988 with dev_r11265_ASINTER-01_Guillaume_ABL1D branch @rev11937 (tickets #2159 and #2131); ORCA2_ICE(_ABL) reproductibility OK

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_ASINTER-01-05_merged/src/OCE/SBC/sbcmod.F90

    r11874 r12015  
    128128      ENDIF 
    129129#else 
    130       IF( lk_si3  )   nn_ice      = 2 
     130      !IF( lk_si3  )   nn_ice      = 2 
    131131      IF( lk_cice )   nn_ice      = 3 
    132132#endif 
     
    261261 
    262262      !                          ! Choice of the Surface Boudary Condition (set nsbc) 
     263      nday_qsr = -1   ! allow initialization at the 1st call !LB: now warm-layer of COARE* calls "sbc_dcy_param" of sbcdcy.F90! 
    263264      IF( ln_dm2dc ) THEN           !* daily mean to diurnal cycle 
    264          nday_qsr = -1   ! allow initialization at the 1st call 
     265         !LB:nday_qsr = -1   ! allow initialization at the 1st call 
    265266         IF( .NOT.( ln_flx .OR. ln_blk .OR. ln_abl ) .AND. nn_components /= jp_iam_opa )   & 
    266267            &   CALL ctl_stop( 'qsr diurnal cycle from daily values requires flux, bulk or abl formulation' ) 
     
    370371         CALL iom_set_rstw_var_active('sfx_b') 
    371372      ENDIF 
    372       !  
     373 
    373374   END SUBROUTINE sbc_init 
    374375 
     
    409410         emp_b (:,:) = emp (:,:) 
    410411         sfx_b (:,:) = sfx (:,:) 
    411          IF ( ln_rnf ) THEN 
     412         IF( ln_rnf ) THEN 
    412413            rnf_b    (:,:  ) = rnf    (:,:  ) 
    413414            rnf_tsc_b(:,:,:) = rnf_tsc(:,:,:) 
     
    451452      IF( ln_mixcpl )          CALL sbc_cpl_rcv   ( kt, nn_fsbc, nn_ice )   ! forced-coupled mixed formulation after forcing 
    452453      ! 
    453       IF ( ln_wave .AND. (ln_tauwoc .OR. ln_tauw) ) CALL sbc_wstress( )      ! Wind stress provided by waves  
     454      IF( ln_wave .AND. (ln_tauwoc .OR. ln_tauw) ) CALL sbc_wstress( )      ! Wind stress provided by waves  
    454455      ! 
    455456      !                                            !==  Misc. Options  ==! 
     
    485486!!$!clem: it looks like it is necessary for the north fold (in certain circumstances). Don't know why. 
    486487!!$      CALL lbc_lnk( 'sbcmod', emp, 'T', 1. ) 
    487       IF ( ll_wd ) THEN     ! If near WAD point limit the flux for now 
     488      IF( ll_wd ) THEN     ! If near WAD point limit the flux for now 
    488489         zthscl = atanh(rn_wd_sbcfra)                     ! taper frac default is .999  
    489490         zwdht(:,:) = sshn(:,:) + ht_0(:,:) - rn_wdmin1   ! do this calc of water 
Note: See TracChangeset for help on using the changeset viewer.