Changeset 9080

Timestamp:

2017-12-15T17:09:41+01:00 (7 years ago)

Author:

davestorkey

Message:

UKMO/dev_r8600_closea_rewrite branch:

1. Correct eORCA025 lakes definitions in make_closea_masks.py.
2. Remove some debugging write-outs.

Location:

branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM

Files:

• NEMO/OPA_SRC/DOM/closea.F90 (modified) (1 diff)
• TOOLS/DOMAINcfg/make_closea_masks.py (modified) (3 diffs)

branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90

@@ -323 +323 @@
                   zcoef    = zfwfr(jcr) / surfr(jcr)
                   zcoef1   = rcp * zcoef
-                  IF(lwp) WRITE(numout,*) 'NEGATIVE FLUX zfwfr(jcr), zcoef : ',zfwfr(jcr), zcoef
                   WHERE( closea_mask_rnf(:,:) == jcr .and. closea_mask(:,:) == 0.0)
                      emp(:,:) = emp(:,:) + zcoef
                      qns(:,:) = qns(:,:) - zcoef1 * sst_m(:,:)
                   ENDWHERE
-               ELSE
-                  IF(lwp) WRITE(numout,*) 'POSITIVE FLUX zfwfr(jcr) : ',zfwfr(jcr)
                ENDIF
                !

branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/TOOLS/DOMAINcfg/make_closea_masks.py

@@ -164 +164 @@
         # Lake Superior
         ncsnr[4]   = 1    ; ncstt[4]   = 0     
-        ncsi1[4]   = 781  ; ncsj1[4]   = 904 
+        ncsi1[4]   = 781  ; ncsj1[4]   = 905 
         ncsi2[4]   = 815  ; ncsj2[4]   = 926 
 
@@ -228 +228 @@
         # Lake Superior
         ncsnr[4]   = 1    ; ncstt[4]   = 1     
-        ncsi1[4]   = 781  ; ncsj1[4]   = 904 
+        ncsi1[4]   = 781  ; ncsj1[4]   = 905 
         ncsi2[4]   = 815  ; ncsj2[4]   = 926 
         # runff points the St Laurence Seaway for all Great Lakes
@@ -295 +295 @@
         # Lake Superior
         ncsnr[4]   = 1    ; ncstt[4]   = 2     
-        ncsi1[4]   = 781  ; ncsj1[4]   = 904 
+        ncsi1[4]   = 781  ; ncsj1[4]   = 905
         ncsi2[4]   = 815  ; ncsj2[4]   = 926 
         # runff points the St Laurence Seaway for all Great Lakes