Changeset 5530 for branches/2015/dev_r5021_UKMO1_CICE_coupling/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90

Timestamp:

2015-07-02T15:38:54+02:00 (9 years ago)

Author:

davestorkey

Message:

Updating 2015/dev_r5021_UKMO1_CICE_coupling branch to rev 5518 of trunk
(= NEMO 3.6_stable branching point).

File:

• branches/2015/dev_r5021_UKMO1_CICE_coupling/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90 (modified) (4 diffs)

branches/2015/dev_r5021_UKMO1_CICE_coupling/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90

@@ -166 +166 @@
          CASE ( 1 )                                  !  ORCA_R1 configurations
             !                                        ! =======================
-            ! 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                                       ! Adjust j­indices to account for more southerly starting latitude
+            ! This dirty section will be suppressed by simplification process:
+            ! all this will come back in input files
+            ! Currently these hard-wired indices relate to configuration with
+            ! extend grid (jpjglo=332)
+            isrow = 332 - jpjglo
+            !
             ii0 = 283           ;   ii1 = 283
-            ij0 = 201 + isrow   ;   ij1 = 201 + isrow
+            ij0 = 241 - isrow   ;   ij1 = 241 - isrow
             !                                        ! =======================
          CASE DEFAULT                                !    ORCA R05 or R025
@@ -223 +219 @@
          CASE ( 1 )                                  !  ORCA_R1 configurations
             !                                        ! =======================
-            !  This dirty section will be suppressed by simplification process:
-            !  all this will come back in input files
-            IF    ( jpjglo == 292 ) THEN  ;  isrow = 0  
-            ELSEIF( jpjglo == 332 ) THEN  ;  isrow = 39
-            ENDIF                                      
+            ! This dirty section will be suppressed by simplification process:
+            ! all this will come back in input files
+            ! Currently these hard-wired indices relate to configuration with
+            ! extend grid (jpjglo=332)
+            isrow = 332 - jpjglo
             ii0 = 282           ;   ii1 = 282
-            ij0 = 201 + isrow   ;   ij1 = 201 + isrow
+            ij0 = 240 - isrow   ;   ij1 = 240 - isrow
             !                                        ! =======================
          CASE DEFAULT                                !    ORCA R05 or R025
@@ -275 +271 @@
          CASE ( 1 )                                  !  ORCA_R1 configurations
             !                                        ! =======================
-            !  This dirty section will be suppressed by simplification process:
-            !  all this will come back in input files
-            IF    ( jpjglo == 292 ) THEN  ;  isrow = 0  
-            ELSEIF( jpjglo == 332 ) THEN  ;  isrow = 39
-            ENDIF                                      
+            ! This dirty section will be suppressed by simplification process:
+            ! all this will come back in input files
+            ! Currently these hard-wired indices relate to configuration with
+            ! extend grid (jpjglo=332)
+            isrow = 332 - jpjglo
             ii0 = 331           ;   ii1 = 331
-            ij0 = 176 + isrow   ;   ij1 = 176 + isrow
+            ij0 = 215 - isrow   ;   ij1 = 215 - isrow
             !                                        ! =======================
          CASE DEFAULT                                !    ORCA R05 or R025
@@ -327 +323 @@
          CASE ( 1 )                                  !  ORCA_R1 configurations
             !                                        ! =======================
-            !  This dirty section will be suppressed by simplification process:
-            !  all this will come back in input files
-            IF    ( jpjglo == 292 ) THEN  ;  isrow = 0  
-            ELSEIF( jpjglo == 332 ) THEN  ;  isrow = 39
-            ENDIF                                      
+            ! This dirty section will be suppressed by simplification process:
+            ! all this will come back in input files
+            ! Currently these hard-wired indices relate to configuration with
+            ! extend grid (jpjglo=332)
+            isrow = 332 - jpjglo
             ii0 = 297           ;   ii1 = 297
-            ij0 = 230 + isrow   ;   ij1 = 230 + isrow
+            ij0 = 269 - isrow   ;   ij1 = 269 - isrow
             !                                        ! =======================
          CASE DEFAULT                                !    ORCA R05 or R025