Changeset 11992

Timestamp:

2019-11-27T18:40:38+01:00 (4 years ago)

Author:

mathiot

Message:

ENHANCE-03_closea: cosmetic changes

Location:

NEMO/branches/2019/ENHANCE-03_closea/src/OCE

Files:

• DOM/closea.F90 (modified) (3 diffs)
• SBC/sbcclo.F90 (modified) (3 diffs)

NEMO/branches/2019/ENHANCE-03_closea/src/OCE/DOM/closea.F90

@@ -66 +66 @@
       !! ** Purpose :   Closed sea domain initialization
       !!
-      !! ** Method  :   if a closed sea is located only in a model grid point
-      !!                just the thermodynamic processes are applied.
-      !!
       !! ** Action  :   Read mask_cs* fields (if needed) from domain_cfg file and infer
       !!                number of closed seas for each case (glo, rnf, emp) from mask_cs* field.
@@ -106 +103 @@
       ! ------------------------------------------------------------------------------
       !
-      ! load mask of open sea and undefined closed seas
+      ! load mask of open sea
       CALL alloc_csmask( mask_opnsea )
       CALL read_csmask( cn_domcfg, 'mask_opensea' , mask_opnsea  )
@@ -154 +151 @@
          !
          ! allocate closed sea group masks 
-         !(used to defined the target area in case multiple lakes have the same river mouth (great lakes for example)
+         !(used to defined the target area in case multiple lakes have the same river mouth (great lakes for example))
          CALL alloc_csmask( mask_csgrpglo )
          CALL alloc_csmask( mask_csgrprnf )

NEMO/branches/2019/ENHANCE-03_closea/src/OCE/SBC/sbcclo.F90

@@ -185 +185 @@
          !
          !! 0. find group number for cs number jcs
-         imskgrp = kmaskcsgrp
-         imsksrc = kmaskcs
+         imskgrp(:,:) = kmaskcsgrp(:,:)
+         imsksrc(:,:) = kmaskcs(:,:)
          !
          ! set cs value where cs is defined
          ! imsk = HUGE outside the cs id jcs
-         imsk = HUGE(1)
-         WHERE ( imsksrc == jcs ) imsk = jcs
+         imsk(:,:) = HUGE(1)
+         WHERE ( imsksrc(:,:) == jcs ) imsk(:,:) = jcs
          !
          ! jtmp = jcs - group id for this lake
-         imsk = imsk - imskgrp
-         jtmp = MINVAL(imsk) ; CALL mpp_min('closea',jtmp)
+         imsk(:,:) = imsk(:,:) - imskgrp(:,:)
+         jtmp = MINVAL(imsk(:,:)) ; CALL mpp_min('closea',jtmp)
          ! kcsgrp = group id corresponding to the cs id jcs
          ! kcsgrp(jcs)=(jcs - (jcs - group id))=group id
@@ -201 +201 @@
          !
          !! 1. build the target river mouth mask for this lake
-         WHERE ( imskgrp * mask_opnsea == kcsgrp(jcs) )
-            imsktrg = 1
+         WHERE ( imskgrp(:,:) * mask_opnsea(:,:) == kcsgrp(jcs) )
+            imsktrg(:,:) = 1
          ELSE WHERE
-            imsktrg = 0
+            imsktrg(:,:) = 0
          END WHERE
          !
@@ -308 +308 @@
          !! 4. Add residuals to target points 
          !!    Do not use pqcs(:,:) = pqcs(:,:) - rcp * zcsfw  * sst_m(:,:) / zsurftrg 
-         !!    as there is no reason for heat conservation with this formulation
+         !!    as there is no reason heat will be conserved with this formulation
          zcsh   = glob_sum( 'closea', e1e2t(:,:) * rcp * zcsfwf * sst_m(:,:) * imsk_src(:,:) )
          WHERE( imsk_trg(:,:) == kcsgrp(jcs) )