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 14043 for NEMO/branches/2020/dev_r13787_OSMOSIS_IMMERSE/src/ICE/iceistate.F90 – NEMO

Ignore:
Timestamp:
2020-12-03T12:54:29+01:00 (4 years ago)
Author:
acc
Message:

dev_r13787_OSMOSIS_IMMERSE merge in trunk changes up to 14041

Location:
NEMO/branches/2020/dev_r13787_OSMOSIS_IMMERSE
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2020/dev_r13787_OSMOSIS_IMMERSE

    • Property svn:externals

      •  

        old new  
        88 
        99# SETTE 
        10 ^/utils/CI/sette@13559        sette 
         10^/utils/CI/sette_wave@13990         sette 

  • NEMO/branches/2020/dev_r13787_OSMOSIS_IMMERSE/src/ICE/iceistate.F90

    r13472 r14043  
    426426      ! 4) Snow-ice mass (case ice is fully embedded) 
    427427      !---------------------------------------------- 
    428       snwice_mass  (:,:) = tmask(:,:,1) * SUM( rhos * v_s(:,:,:) + rhoi * v_i(:,:,:), dim=3  )   ! snow+ice mass 
     428      snwice_mass  (:,:) = tmask(:,:,1) * SUM( rhos * v_s + rhoi * v_i + rhow * ( v_ip + v_il ), dim=3  )   ! snow+ice mass 
    429429      snwice_mass_b(:,:) = snwice_mass(:,:) 
    430430      ! 
Note: See TracChangeset for help on using the changeset viewer.