New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 5956 for branches/2015/dev_r5151_UKMO_ISF/NEMOGCM/NEMO/OPA_SRC/ICB/icbthm.F90 – NEMO

Ignore:
Timestamp:
2015-11-30T20:55:41+01:00 (8 years ago)
Author:
mathiot
Message:

ISF : merged trunk (5936) into branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5151_UKMO_ISF/NEMOGCM/NEMO/OPA_SRC/ICB/icbthm.F90

    r5621 r5956  
    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.