Changeset 13387


Ignore:
Timestamp:
2020-08-06T16:51:29+02:00 (3 months ago)
Author:
dancopsey
Message:

Fix conflicts with penetrating_solar branch.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/NEMO_4.0.1_fix_cpl/src/OCE/SBC/sbccpl.F90

    r12686 r13387  
    20742074      ELSEIF( ln_cndflx .AND. .NOT.ln_cndemulate ) THEN      !==  conduction flux as surface forcing  ==! 
    20752075         ! 
    2076          !                    ! ===> here we must receive the qtr_ice_top array from the coupler 
    2077          !                           for now just assume zero (fully opaque ice) 
    2078          zqtr_ice_top(:,:,:) = 0._wp 
     2076         SELECT CASE( TRIM( sn_rcv_qtr%cldes ) ) 
     2077         ! 
     2078         !      ! ===> here we receive the qtr_ice_top array from the coupler 
     2079         CASE ('coupled') 
     2080            IF (ln_scale_ice_fluxes) THEN 
     2081               WHERE( a_i(:,:,:) > 0.0_wp ) zqtr_ice_top(:,:,:) = frcv(jpr_qtr)%z3(:,:,:) * a_i_last_couple(:,:,:) / a_i(:,:,:) 
     2082               WHERE( a_i(:,:,:) <= 0.0_wp ) zqtr_ice_top(:,:,:) = 0.0_wp 
     2083            ELSE 
     2084               zqtr_ice_top(:,:,:) = frcv(jpr_qtr)%z3(:,:,:) 
     2085            ENDIF 
     2086 
     2087         !      if we are not getting this data from the coupler then assume zero (fully opaque ice) 
     2088         CASE ('none') 
     2089            zqtr_ice_top(:,:,:) = 0._wp 
     2090         END SELECT 
    20792091         ! 
    20802092      ENDIF 
Note: See TracChangeset for help on using the changeset viewer.