Changeset 6491 for branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90

Timestamp:

2016-04-21T18:15:17+02:00 (8 years ago)

Author:

davestorkey

Message:

Commit remaining changes to UKMO/r5518_GO6_package branch from following branches:
UKMO/dev_r5021_nn_etau_revision@6238
UKMO/dev_r5107_mld_zint@5534
UKMO/dev_r5107_eorca025_closea@6390
UKMO/restart_datestamp@5539
UKMO/icebergs_latent_heat@5821
UKMO/icebergs_restart_single_file_corrected@6480
UKMO/product_diagnostics@5971
UKMO/antarctic_partial_slip@5961
Custom merge into /branches/UKMO/dev_r5518_GO6_package/NEMOGCM: r5961 cf. r5958 of /branches/UKMO/antarctic_partial_slip/NEMOGCM@6490

Custom merge into /branches/UKMO/dev_r5518_GO6_package/NEMOGCM: r6349 cf. r5962 of /branches/UKMO/product_diagnostics/NEMOGCM@6490

Custom merge into /branches/UKMO/dev_r5518_GO6_package/NEMOGCM: r6480 cf. r6479 of /branches/UKMO/icebergs_restart_single_file_corrected/NEMOGCM@6490

Custom merge into /branches/UKMO/dev_r5518_GO6_package/NEMOGCM: r5986 cf. r5852 of /branches/UKMO/icebergs_restart_single_file/NEMOGCM@6490

Custom merge into /branches/UKMO/dev_r5518_GO6_package/NEMOGCM: r5821 cf. r5808 of /branches/UKMO/icebergs_latent_heat/NEMOGCM@6490

File:

• branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90 (modified) (2 diffs)

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

@@ -36 +36 @@
    PUBLIC clo_bat      ! routine called in domzgr module
 
-   INTEGER, PUBLIC, PARAMETER          ::   jpncs   = 4      !: number of closed sea
+   INTEGER, PUBLIC, PARAMETER          ::   jpncs   = 10      !: number of closed sea
    INTEGER, PUBLIC, DIMENSION(jpncs)   ::   ncstt            !: Type of closed sea
    INTEGER, PUBLIC, DIMENSION(jpncs)   ::   ncsi1, ncsj1     !: south-west closed sea limits (i,j)
@@ -155 +155 @@
             ncsi2(4)   = 76  ;  ncsj2(4)   = 61
             ncsir(4,1) = 84  ;  ncsjr(4,1) = 59 
-            !                                        ! =======================
-         CASE ( 025 )                                ! ORCA_R025 configuration
-            !                                        ! =======================
-            ncsnr(1)   = 1    ; ncstt(1)   = 0               ! Caspian + Aral sea
-            ncsi1(1)   = 1330 ; ncsj1(1)   = 645
-            ncsi2(1)   = 1400 ; ncsj2(1)   = 795
+            !                                        ! ================================
+         CASE ( 025 )                                ! ORCA_R025 extended configuration
+            !                                        ! ================================
+            ncsnr(1)   = 1    ; ncstt(1)   = 0               ! Caspian sea
+            ncsi1(1)   = 1330 ; ncsj1(1)   = 831
+            ncsi2(1)   = 1375 ; ncsj2(1)   = 981
             ncsir(1,1) = 1    ; ncsjr(1,1) = 1
             !                                        
-            ncsnr(2)   = 1    ; ncstt(2)   = 0               ! Azov Sea 
-            ncsi1(2)   = 1284 ; ncsj1(2)   = 722
-            ncsi2(2)   = 1304 ; ncsj2(2)   = 747
+            ncsnr(2)   = 1    ; ncstt(2)   = 0               ! Aral sea
+            ncsi1(2)   = 1376 ; ncsj1(2)   = 900
+            ncsi2(2)   = 1400 ; ncsj2(2)   = 981
             ncsir(2,1) = 1    ; ncsjr(2,1) = 1
+            !                                        
+            ncsnr(3)   = 1    ; ncstt(3)   = 0               ! Azov Sea 
+            ncsi1(3)   = 1284 ; ncsj1(3)   = 908
+            ncsi2(3)   = 1304 ; ncsj2(3)   = 933
+            ncsir(3,1) = 1    ; ncsjr(3,1) = 1
+            !
+            ncsnr(4)   = 1    ; ncstt(4)   = 0               ! Lake Superior  
+            ncsi1(4)   = 781  ; ncsj1(4)   = 904 
+            ncsi2(4)   = 815  ; ncsj2(4)   = 926 
+            ncsir(4,1) = 1    ; ncsjr(4,1) = 1 
+            ! 
+            ncsnr(5)   = 1    ; ncstt(5)   = 0               ! Lake Michigan
+            ncsi1(5)   = 795  ; ncsj1(5)   = 871             
+            ncsi2(5)   = 813  ; ncsj2(5)   = 905 
+            ncsir(5,1) = 1    ; ncsjr(5,1) = 1 
+            ! 
+            ncsnr(6)   = 1    ; ncstt(6)   = 0               ! Lake Huron part 1
+            ncsi1(6)   = 814  ; ncsj1(6)   = 882             
+            ncsi2(6)   = 825  ; ncsj2(6)   = 905 
+            ncsir(6,1) = 1    ; ncsjr(6,1) = 1 
+            ! 
+            ncsnr(7)   = 1    ; ncstt(7)   = 0               ! Lake Huron part 2
+            ncsi1(7)   = 826  ; ncsj1(7)   = 889             
+            ncsi2(7)   = 833  ; ncsj2(7)   = 905 
+            ncsir(7,1) = 1    ; ncsjr(7,1) = 1 
+            ! 
+            ncsnr(8)   = 1    ; ncstt(8)   = 0               ! Lake Erie
+            ncsi1(8)   = 816  ; ncsj1(8)   = 871             
+            ncsi2(8)   = 837  ; ncsj2(8)   = 881 
+            ncsir(8,1) = 1    ; ncsjr(8,1) = 1 
+            ! 
+            ncsnr(9)   = 1    ; ncstt(9)   = 0               ! Lake Ontario
+            ncsi1(9)   = 831  ; ncsj1(9)   = 882             
+            ncsi2(9)   = 847  ; ncsj2(9)   = 889 
+            ncsir(9,1) = 1    ; ncsjr(9,1) = 1 
+            ! 
+            ncsnr(10)   = 1    ; ncstt(10)   = 0               ! Lake Victoria  
+            ncsi1(10)   = 1274 ; ncsj1(10)   = 672 
+            ncsi2(10)   = 1289 ; ncsj2(10)   = 687 
+            ncsir(10,1) = 1    ; ncsjr(10,1) = 1 
             !
          END SELECT