Changeset 9463


Ignore:
Timestamp:
2018-04-06T17:50:29+02:00 (3 years ago)
Author:
jcastill
Message:

Modify a couple of lines to allow merging with the coupling branch - no science changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_obs_oper_update/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90

    r9188 r9463  
    322322      !  
    323323      ! One level below 
    324       en(:,:,2) = rc02r * ustars2(:,:) * (1._wp + rsbc_tke1 * ((zhsro(:,:)+fsdepw(:,:,2))/zhsro(:,:) )**(1.5_wp*ra_sf))**(2._wp/3._wp) 
     324      en(:,:,2) = rc02r * ustars2(:,:) * (1._wp + rsbc_tke1 * ((zhsro(:,:)+fsdepw(:,:,2)) & 
     325          &            / zhsro(:,:) )**(1.5_wp*ra_sf))**(2._wp/3._wp) 
    325326      en(:,:,2) = MAX(en(:,:,2), rn_emin ) 
    326327      z_elem_a(:,:,2) = 0._wp  
     
    343344      z_elem_a(:,:,2) = 0._wp 
    344345      zkar(:,:)       = (rl_sf + (vkarmn-rl_sf)*(1.-exp(-rtrans*fsdept(:,:,1)/zhsro(:,:)) )) 
    345       zflxs(:,:)      = rsbc_tke2 * ustars2(:,:)**1.5_wp * zkar(:,:) * ((zhsro(:,:)+fsdept(:,:,1))/zhsro(:,:) )**(1.5_wp*ra_sf) 
     346      zflxs(:,:)      = rsbc_tke2 * ustars2(:,:)**1.5_wp * zkar(:,:) & 
     347           &                      * ((zhsro(:,:)+fsdept(:,:,1))/zhsro(:,:) )**(1.5_wp*ra_sf) 
    346348 
    347349      en(:,:,2) = en(:,:,2) + zflxs(:,:)/fse3w(:,:,2) 
Note: See TracChangeset for help on using the changeset viewer.