Changeset 11992


Ignore:
Timestamp:
2019-11-27T18:40:38+01:00 (8 weeks ago)
Author:
mathiot
Message:

ENHANCE-03_closea: cosmetic changes

Location:
NEMO/branches/2019/ENHANCE-03_closea/src/OCE
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/ENHANCE-03_closea/src/OCE/DOM/closea.F90

    r11656 r11992  
    6666      !! ** Purpose :   Closed sea domain initialization 
    6767      !! 
    68       !! ** Method  :   if a closed sea is located only in a model grid point 
    69       !!                just the thermodynamic processes are applied. 
    70       !! 
    7168      !! ** Action  :   Read mask_cs* fields (if needed) from domain_cfg file and infer 
    7269      !!                number of closed seas for each case (glo, rnf, emp) from mask_cs* field. 
     
    106103      ! ------------------------------------------------------------------------------ 
    107104      ! 
    108       ! load mask of open sea and undefined closed seas 
     105      ! load mask of open sea 
    109106      CALL alloc_csmask( mask_opnsea ) 
    110107      CALL read_csmask( cn_domcfg, 'mask_opensea' , mask_opnsea  ) 
     
    154151         ! 
    155152         ! allocate closed sea group masks  
    156          !(used to defined the target area in case multiple lakes have the same river mouth (great lakes for example) 
     153         !(used to defined the target area in case multiple lakes have the same river mouth (great lakes for example)) 
    157154         CALL alloc_csmask( mask_csgrpglo ) 
    158155         CALL alloc_csmask( mask_csgrprnf ) 
  • NEMO/branches/2019/ENHANCE-03_closea/src/OCE/SBC/sbcclo.F90

    r11656 r11992  
    185185         ! 
    186186         !! 0. find group number for cs number jcs 
    187          imskgrp = kmaskcsgrp 
    188          imsksrc = kmaskcs 
     187         imskgrp(:,:) = kmaskcsgrp(:,:) 
     188         imsksrc(:,:) = kmaskcs(:,:) 
    189189         ! 
    190190         ! set cs value where cs is defined 
    191191         ! imsk = HUGE outside the cs id jcs 
    192          imsk = HUGE(1) 
    193          WHERE ( imsksrc == jcs ) imsk = jcs 
     192         imsk(:,:) = HUGE(1) 
     193         WHERE ( imsksrc(:,:) == jcs ) imsk(:,:) = jcs 
    194194         ! 
    195195         ! jtmp = jcs - group id for this lake 
    196          imsk = imsk - imskgrp 
    197          jtmp = MINVAL(imsk) ; CALL mpp_min('closea',jtmp) 
     196         imsk(:,:) = imsk(:,:) - imskgrp(:,:) 
     197         jtmp = MINVAL(imsk(:,:)) ; CALL mpp_min('closea',jtmp) 
    198198         ! kcsgrp = group id corresponding to the cs id jcs 
    199199         ! kcsgrp(jcs)=(jcs - (jcs - group id))=group id 
     
    201201         ! 
    202202         !! 1. build the target river mouth mask for this lake 
    203          WHERE ( imskgrp * mask_opnsea == kcsgrp(jcs) ) 
    204             imsktrg = 1 
     203         WHERE ( imskgrp(:,:) * mask_opnsea(:,:) == kcsgrp(jcs) ) 
     204            imsktrg(:,:) = 1 
    205205         ELSE WHERE 
    206             imsktrg = 0 
     206            imsktrg(:,:) = 0 
    207207         END WHERE 
    208208         ! 
     
    308308         !! 4. Add residuals to target points  
    309309         !!    Do not use pqcs(:,:) = pqcs(:,:) - rcp * zcsfw  * sst_m(:,:) / zsurftrg  
    310          !!    as there is no reason for heat conservation with this formulation 
     310         !!    as there is no reason heat will be conserved with this formulation 
    311311         zcsh   = glob_sum( 'closea', e1e2t(:,:) * rcp * zcsfwf * sst_m(:,:) * imsk_src(:,:) ) 
    312312         WHERE( imsk_trg(:,:) == kcsgrp(jcs) ) 
Note: See TracChangeset for help on using the changeset viewer.