Changeset 2485 for CONFIG

Timestamp:

04/14/15 17:41:48 (9 years ago)

Author:

omamce

Message:

O.M. : handling old ORCA1 and extended ORCA1 grids

in closea.F90

File:

• CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/closea.F90 (modified) (2 diffs)

CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/closea.F90

@@ -77 +77 @@
       !!----------------------------------------------------------------------
       INTEGER ::   jc               ! dummy loop indices
-      REAL(wp)::   ztmp   
+      REAL(wp)::   ztmp
+      INTEGER ::   isrow
       !!----------------------------------------------------------------------
       
@@ -96 +97 @@
          !                                           ! =======================
          CASE ( 1 )                                  ! ORCA_R1 configuration
-            !                                        ! =======================
+            !
+            !! This dirty section will be suppressed by simplification process: all this will come back in input files
+            !! Currently these hard-wired indices relate to the original (pre-v3.6) configuration which had a grid-size of 362x292.
+            !! This grid has been extended southwards for use with the under ice-shelf options (isf) introduced in v3.6. The original
+            !! domain can still be used optionally if the isf code is not activated. An adjustment (isrow) is made to the hard-wired
+            !! indices if the extended domain (362x332) is being used.
+            !! =======================
+            IF     ( jpjglo == 292 ) THEN  !  ORCA1 R1 ­ Using pre-v3.6 files or adjusted start row from isf-extended grid
+               isrow = 0
+            ELSEIF ( jpjglo == 332 ) THEN  !  ORCA1 R1 - Using full isf­extended domain.
+               isrow = 40                  !    - Adjust j­indices to account for more southerly starting latitude
+            ENDIF
+            
             ncsnr(1)   = 1    ; ncstt(1)   = 0           ! Caspian Sea
-            ncsi1(1)   = 332  ; ncsj1(1)   = 203           ! spread over the globe
-            ncsi2(1)   = 344  ; ncsj2(1)   = 235
+            ncsi1(1)   = 332  ; ncsj1(1)   = 203 + isrow   ! spread over the globe
+            ncsi2(1)   = 344  ; ncsj2(1)   = 235 + isrow
             ncsir(1,1) = 1    ; ncsjr(1,1) = 1
             ! 
             ncsnr(2)   = 4    ; ncstt(2)   = 2           ! Great North American Lakes
-            ncsi1(2)   = 198  ; ncsj1(2)   = 209           ! put at St Laurent mouth
-            ncsi2(2)   = 213  ; ncsj2(2)   = 223
-            ncsir(1,2) = 225  ; ncsjr(1,2) = 220
-            ncsir(1,2) = 225  ; ncsjr(1,2) = 221
-            ncsir(1,2) = 226  ; ncsjr(1,2) = 220
-            ncsir(1,2) = 226  ; ncsjr(1,2) = 221
+            ncsi1(2)   = 198  ; ncsj1(2)   = 209 + isrow   ! put at St Laurent mouth
+            ncsi2(2)   = 213  ; ncsj2(2)   = 223 + isrow
+            ncsir(1,2) = 225  ; ncsjr(1,2) = 220 + isrow
+            ncsir(1,2) = 225  ; ncsjr(1,2) = 221 + isrow
+            ncsir(1,2) = 226  ; ncsjr(1,2) = 220 + isrow
+            ncsir(1,2) = 226  ; ncsjr(1,2) = 221 + isrow
 
             !