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 12735 for NEMO/releases – NEMO

Changeset 12735 for NEMO/releases


Ignore:
Timestamp:
2020-04-10T16:10:16+02:00 (4 years ago)
Author:
jchanut
Message:

Mask initial ice fields if read from file, #2437

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/releases/r4.0/r4.0-HEAD/src/ICE/iceistate.F90

    r12398 r12735  
    176176            ! 
    177177            ! -- mandatory fields -- ! 
    178             zht_i_ini(:,:) = si(jp_hti)%fnow(:,:,1) 
    179             zht_s_ini(:,:) = si(jp_hts)%fnow(:,:,1) 
    180             zat_i_ini(:,:) = si(jp_ati)%fnow(:,:,1) 
     178            zht_i_ini(:,:) = si(jp_hti)%fnow(:,:,1) * tmask(:,:,1) 
     179            zht_s_ini(:,:) = si(jp_hts)%fnow(:,:,1) * tmask(:,:,1) 
     180            zat_i_ini(:,:) = si(jp_ati)%fnow(:,:,1) * tmask(:,:,1) 
    181181 
    182182            ! -- optional fields -- ! 
     
    216216               &     si(jp_hpd)%fnow(:,:,1) = ( rn_hpd_ini_n * zswitch + rn_hpd_ini_s * (1._wp - zswitch) ) * tmask(:,:,1) 
    217217            ! 
    218             zsm_i_ini(:,:) = si(jp_smi)%fnow(:,:,1) 
    219             ztm_i_ini(:,:) = si(jp_tmi)%fnow(:,:,1) 
    220             zt_su_ini(:,:) = si(jp_tsu)%fnow(:,:,1) 
    221             ztm_s_ini(:,:) = si(jp_tms)%fnow(:,:,1) 
    222             zapnd_ini(:,:) = si(jp_apd)%fnow(:,:,1) 
    223             zhpnd_ini(:,:) = si(jp_hpd)%fnow(:,:,1) 
     218            zsm_i_ini(:,:) = si(jp_smi)%fnow(:,:,1) * tmask(:,:,1) 
     219            ztm_i_ini(:,:) = si(jp_tmi)%fnow(:,:,1) * tmask(:,:,1) 
     220            zt_su_ini(:,:) = si(jp_tsu)%fnow(:,:,1) * tmask(:,:,1) 
     221            ztm_s_ini(:,:) = si(jp_tms)%fnow(:,:,1) * tmask(:,:,1) 
     222            zapnd_ini(:,:) = si(jp_apd)%fnow(:,:,1) * tmask(:,:,1) 
     223            zhpnd_ini(:,:) = si(jp_hpd)%fnow(:,:,1) * tmask(:,:,1) 
    224224            ! 
    225225            ! change the switch for the following 
Note: See TracChangeset for help on using the changeset viewer.