Changeset 4979


Ignore:
Timestamp:
2014-12-08T17:39:09+01:00 (6 years ago)
Author:
vancop
Message:

bugfixes found during the merge party

Location:
branches/2014/dev_4728_CNRS04_coupled_interface/NEMOGCM/NEMO/LIM_SRC_3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2014/dev_4728_CNRS04_coupled_interface/NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90

    r4892 r4979  
    108108      REAL(wp) ::   zgamma    =  18009._wp    ! for specific heat 
    109109      REAL(wp) ::   zbeta     =  0.117_wp     ! for thermal conductivity (could be 0.13) 
    110       REAL(wp) ::   zraext_s  =  1.e+8_wp     ! extinction coefficient of radiation in the snow 
     110      REAL(wp) ::   zraext_s  =  10.0_wp      ! extinction coefficient of radiation in the snow 
    111111      REAL(wp) ::   zkimin    =  0.10_wp      ! minimum ice thermal conductivity 
    112112      REAL(wp) ::   ztsu_err  =  1.e-5_wp     ! range around which t_su is considered as 0°C  
  • branches/2014/dev_4728_CNRS04_coupled_interface/NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90

    r4688 r4979  
    144144            zs0oi (:,:,jl)   = oa_i (:,:,jl) * area(:,:)    ! Age content 
    145145            zs0c0 (:,:,jl)   = e_s  (:,:,1,jl)              ! Snow heat content 
    146             zs0e  (:,:,:,jl) = e_i  (:,:,:,jl)              ! Ice  heat content 
     146            zs0e  (:,:,:,jl) = e_i  (:,:,1:nlay_i,jl)       ! Ice  heat content 
    147147         END DO 
    148148 
     
    393393                     zsmv = smv_i(ji,jj,jl) 
    394394                     zes  = e_s  (ji,jj,1,jl) 
    395                      zei  = SUM( e_i(ji,jj,:,jl) ) 
     395                     zei  = SUM( e_i(ji,jj,1:nlay_i,jl) ) 
    396396                     zdv  = v_i(ji,jj,jl) - zviold(ji,jj,jl)    
    397397                     !zda = a_i(ji,jj,jl) - zaiold(ji,jj,jl)    
     
    414414                     smv_i(ji,jj,jl) = zindh * smv_i(ji,jj,jl) 
    415415                     e_s(ji,jj,1,jl) = zindh * e_s(ji,jj,1,jl) 
    416                      e_i(ji,jj,:,jl) = zindh * e_i(ji,jj,:,jl) 
     416                     e_i(ji,jj,1:nlay_i,jl) = zindh * e_i(ji,jj,1:nlay_i,jl) 
    417417 
    418418                     ! Update mass fluxes 
     
    421421                     sfx_res(ji,jj) = sfx_res(ji,jj) - ( smv_i(ji,jj,jl) - zsmv ) * rhoic * r1_rdtice  
    422422                     hfx_res(ji,jj) = hfx_res(ji,jj) + ( e_s(ji,jj,1,jl) - zes ) * unit_fac / area(ji,jj) * r1_rdtice ! W.m-2 <0 
    423                      hfx_res(ji,jj) = hfx_res(ji,jj) + ( SUM( e_i(ji,jj,:,jl) ) - zei ) * unit_fac / area(ji,jj) * r1_rdtice ! W.m-2 <0 
     423                     hfx_res(ji,jj) = hfx_res(ji,jj) + ( SUM( e_i(ji,jj,1:nlay_i,jl) ) - zei ) * unit_fac / area(ji,jj) * r1_rdtice ! W.m-2 <0 
    424424 
    425425                  ENDIF 
Note: See TracChangeset for help on using the changeset viewer.