Changeset 5367 for branches/2015/dev_r5204_CNRS_PISCES_dcy/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsbc.F90

Timestamp:

2015-06-05T13:34:40+02:00 (9 years ago)

Author:

cetlod

Message:

NEMOGCM_dev_r5204_CNRS_PISCES_dcy : merge in dev_r5171_CNRS_LIM3_seaicebgc

File:

• branches/2015/dev_r5204_CNRS_PISCES_dcy/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsbc.F90 (modified) (1 diff)

branches/2015/dev_r5204_CNRS_PISCES_dcy/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsbc.F90

@@ -436 +436 @@
             END DO
          END DO
-         IF( cp_cfg == 'orca' ) THEN
-            IF( jp_cfg == 2 ) THEN
-               ii0 = 176   ;   ii1 =  176        ! Southern Island : Kerguelen
-               ij0 =  37   ;   ij1 =   37  ;   zcmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1), 1:jpk ) =  0.3_wp  
-               !
-               ii0 = 119   ;   ii1 =  119        ! South Georgia
-               ij0 =  29   ;   ij1 =   29  ;   zcmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1), 1:jpk ) =  0.3_wp  
-               !
-               ii0 = 111   ;   ii1 =  111        ! Falklands
-               ij0 =  35   ;   ij1 =   35  ;   zcmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1), 1:jpk ) =  0.3_wp  
-               !
-               ii0 = 168   ;   ii1 =  168        ! Crozet
-               ij0 =  40   ;   ij1 =   40  ;   zcmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1), 1:jpk ) =  0.3_wp  
-               !
-               ii0 = 119   ;   ii1 =  119        ! South Orkney
-               ij0 =  28   ;   ij1 =   28  ;   zcmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1), 1:jpk ) =  0.3_wp  
-               !
-               ii0 = 140   ;   ii1 =  140        ! Bouvet Island
-               ij0 =  33   ;   ij1 =   33  ;   zcmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1), 1:jpk ) =  0.3_wp  
-               !
-               ii0 = 178   ;   ii1 =  178        ! Prince edwards
-               ij0 =  34   ;   ij1 =   34  ;   zcmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1), 1:jpk ) =  0.3_wp  
-               !
-               ii0 =  43   ;   ii1 =   43        ! Balleny islands
-               ij0 =  21   ;   ij1 =   21  ;   zcmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1), 1:jpk ) =  0.3_wp  
-               !
-            ELSE IF( jp_cfg == 1 ) THEN
-               !
-               ! 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  ;  isrow = 0  ! Using pre-v3.6 files or adjusted start row from isf-extended grid
-               ELSEIF( jpjglo == 332 ) THEN  ;  isrow = 40 ! Using full isf­extended domain. 
-               ENDIF     
-
-               ii0 = 357             ;   ii1 =  357        ! Southern Island : Kerguelen
-               ij0 =  75  + isrow   ;   ij1 =  76   + isrow  
-               zcmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1), 1:jpk ) = 0.3_wp
-               !
-               ii0 = 243             ;   ii1 =  243        ! South Georgia
-               ij0 =  57  + isrow   ;   ij1 =   59  + isrow 
-               zcmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1), 1:jpk ) = 0.3_wp
-               !
-               ii0 = 227             ;   ii1 =  227        ! Falklands
-               ij0 =  71  + isrow   ;   ij1 =   73  + isrow  
-               zcmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1), 1:jpk ) = 0.3_wp
-               !
-               ii0 = 326             ;   ii1 =  327        ! Crozet
-               ij0 =  79  + isrow   ;   ij1 =   79  + isrow 
-               zcmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1), 1:jpk ) = 0.3_wp
-               ! 
-               ii0 = 243             ;   ii1 =  243        ! South Orkney
-               ij0 =  56  + isrow   ;   ij1 =   56  + isrow  
-               zcmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1), 1:jpk ) = 0.3_wp
-               !
-               ii0 = 283             ;   ii1 =  286        ! Bouvet Island
-               ij0 =  66  + isrow   ;   ij1 =   66  + isrow  
-               zcmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1), 1:jpk ) = 0.3_wp
-               !
-               ii0 = 361             ;   ii1 =  361        ! Prince edwards
-               ij0 =  67  + isrow   ;   ij1 =   68  + isrow 
-               zcmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1), 1:jpk ) = 0.3_wp
-               !
-               ii0 =  91             ;   ii1 =   92        ! Balleny islands
-               ij0 =  42  + isrow   ;   ij1 =   43  + isrow 
-               zcmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1), 1:jpk ) = 0.3_wp
-               !
-            ELSE IF( jp_cfg == 05 ) THEN
-               !
-               CALL ctl_warn( ' Coastal supply of iron modifications for southern Islands in ORCA_R05' )
-               !
-            ELSE IF( jp_cfg == 025 ) THEN
-               !
-               CALL ctl_warn( ' Coastal supply of iron modifications for southern Islands in ORCA_R025' )
-               !
-            ENDIF
-            !
-         ENDIF
+         !
          CALL lbc_lnk( zcmask , 'T', 1. )      ! lateral boundary conditions on cmask   (sign unchanged)
+         !
          DO jk = 1, jpk
             DO jj = 1, jpj