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

Timestamp:

2015-05-29T12:28:06+02:00 (9 years ago)

Author:

cetlod

Message:

dev_r5204_CNRS_PISCES_dcy : An adjustment (isrow) is made to the hard-wired

File:

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

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

@@ -187 +187 @@
       INTEGER  :: ierr, ierr1, ierr2, ierr3
       INTEGER  :: ios                 ! Local integer output status for namelist read
-      INTEGER  :: ik50               !  last level where depth less than 50 m
+      INTEGER  :: ik50                !  last level where depth less than 50 m
+      INTEGER  ::   isrow             ! index for ORCA1 starting row
       REAL(wp) :: zexpide, zdenitide, zmaskt
       REAL(wp) :: ztimes_dust, ztimes_riv, ztimes_ndep 
@@ -463 +464 @@
             ELSE IF( jp_cfg == 1 ) THEN
                !
-               ii0 = 357   ;   ii1 =  357        ! Southern Island : Kerguelen
-               ij0 =  75   ;   ij1 =   76  ;   zcmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1), 1:jpk ) =  0.3_wp
-               !
-               ii0 = 243   ;   ii1 =  243        ! South Georgia
-               ij0 =  57   ;   ij1 =   59  ;   zcmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1), 1:jpk ) =  0.3_wp
-               !
-               ii0 = 227   ;   ii1 =  227        ! Falklands
-               ij0 =  71   ;   ij1 =   73  ;   zcmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1), 1:jpk ) =  0.3_wp
-               !
-               ii0 = 326   ;   ii1 =  327        ! Crozet
-               ij0 =  79   ;   ij1 =   79  ;   zcmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1), 1:jpk ) =  0.3_wp
-               !
-               ii0 = 243   ;   ii1 =  243        ! South Orkney
-               ij0 =  56   ;   ij1 =   56  ;   zcmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1), 1:jpk ) =  0.3_wp
-               !
-               ii0 = 283   ;   ii1 =  286        ! Bouvet Island
-               ij0 =  66   ;   ij1 =   66  ;   zcmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1), 1:jpk ) =  0.3_wp
-               !
-               ii0 = 361   ;   ii1 =  361        ! Prince edwards
-               ij0 =  67   ;   ij1 =   68  ;   zcmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1), 1:jpk ) =  0.3_wp
-               !
-               ii0 =  91   ;   ii1 =   92        ! Balleny islands
-               ij0 =  42   ;   ij1 =   43  ;   zcmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1), 1:jpk ) =  0.3_wp
+               ! 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  + iswrow   ;   ij1 =  76   + iswrow  
+               zcmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1), 1:jpk ) = 0.3_wp
+               !
+               ii0 = 243             ;   ii1 =  243        ! South Georgia
+               ij0 =  57  + iswrow   ;   ij1 =   59  + iswrow 
+               zcmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1), 1:jpk ) = 0.3_wp
+               !
+               ii0 = 227             ;   ii1 =  227        ! Falklands
+               ij0 =  71  + iswrow   ;   ij1 =   73  + iswrow  
+               zcmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1), 1:jpk ) = 0.3_wp
+               !
+               ii0 = 326             ;   ii1 =  327        ! Crozet
+               ij0 =  79  + iswrow   ;   ij1 =   79  + iswrow 
+               zcmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1), 1:jpk ) = 0.3_wp
+               ! 
+               ii0 = 243             ;   ii1 =  243        ! South Orkney
+               ij0 =  56  + iswrow   ;   ij1 =   56  + iswrow  
+               zcmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1), 1:jpk ) = 0.3_wp
+               !
+               ii0 = 283             ;   ii1 =  286        ! Bouvet Island
+               ij0 =  66  + iswrow   ;   ij1 =   66  + iswrow  
+               zcmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1), 1:jpk ) = 0.3_wp
+               !
+               ii0 = 361             ;   ii1 =  361        ! Prince edwards
+               ij0 =  67  + iswrow   ;   ij1 =   68  + iswrow 
+               zcmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1), 1:jpk ) = 0.3_wp
+               !
+               ii0 =  91             ;   ii1 =   92        ! Balleny islands
+               ij0 =  42  + iswrow   ;   ij1 =   43  + iswrow 
+               zcmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1), 1:jpk ) = 0.3_wp
                !
             ELSE IF( jp_cfg == 05 ) THEN