Ignore:
Timestamp:
2015-10-26T15:49:40+01:00 (5 years ago)
Author:
cetlod
Message:

merge the simplification branch onto the trunk, see ticket #1612

Location:
trunk/NEMOGCM/NEMO/OPA_SRC/ICB
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icbdia.F90

    r5215 r5836  
    191191 
    192192         nbergs_end        = icb_utl_count() 
    193          zgrdd_berg_mass   = SUM( berg_mass (:,:)*e1e2t(:,:)*tmask_i(:,:) ) 
     193         zgrdd_berg_mass   = SUM( berg_mass(:,:)*e1e2t(:,:)*tmask_i(:,:) ) 
    194194         zgrdd_bits_mass   = SUM( bits_mass(:,:)*e1e2t(:,:)*tmask_i(:,:) ) 
    195195 
  • trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icbthm.F90

    r5215 r5836  
    156156         ! use tmask rather than tmask_i when dealing with icebergs 
    157157         IF( tmask(ii,ij,1) /= 0._wp ) THEN    ! Add melting to the grid and field diagnostics 
    158             z1_e1e2    = 1._wp / e1e2t(ii,ij) * this%mass_scaling 
     158            z1_e1e2    = r1_e1e2t(ii,ij) * this%mass_scaling 
    159159            z1_dt_e1e2 = z1_dt * z1_e1e2 
    160160            zmelt    = ( zdM - ( zdMbitsE - zdMbitsM ) ) * z1_dt   ! kg/s 
     
    195195            ! 
    196196         ELSE                            ! Diagnose mass distribution on grid 
    197             z1_e1e2 = 1._wp / e1e2t(ii,ij) * this%mass_scaling 
     197            z1_e1e2 = r1_e1e2t(ii,ij) * this%mass_scaling 
    198198            CALL icb_dia_size( ii, ij, zWn, zLn, zAbits,   & 
    199199            &                  this%mass_scaling, zMnew, znMbits, z1_e1e2) 
Note: See TracChangeset for help on using the changeset viewer.