Changeset 5385 for trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90

Timestamp:

2015-06-09T15:50:42+02:00 (9 years ago)

Author:

cetlod

Message:

merge 2015/dev_r5204_CNRS_PISCES_dcy branch into the trunk, see ticket #1532

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90 (modified) (5 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90

@@ -51 +51 @@
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index
       !!
-      INTEGER :: inum             ! temporary logical unit
-      INTEGER :: ji, jj, jk, jt   ! dummy loop indices
-      INTEGER :: ii0, ii1, ij0, ij1
-      REAL(wp) ::   zarea, zvol, zwei
-      REAL(wp) ::  ztemi(4), ztemo(4), zsali(4), zsalo(4), zflxi(4), zflxo(4)
-      REAL(wp) ::  zt, zs, zu  
-      REAL(wp) ::  zsm0, zfwfnew
+      INTEGER  :: inum             ! temporary logical unit
+      INTEGER  :: ji, jj, jk, jt   ! dummy loop indices
+      INTEGER  :: ii0, ii1, ij0, ij1
+      INTEGER  :: isrow         ! index for ORCA1 starting row
+      REAL(wp) :: zarea, zvol, zwei
+      REAL(wp) :: ztemi(4), ztemo(4), zsali(4), zsalo(4), zflxi(4), zflxo(4)
+      REAL(wp) :: zt, zs, zu  
+      REAL(wp) :: zsm0, zfwfnew
       IF( cp_cfg == "orca" .AND. jp_cfg == 1 .OR. jp_cfg == 2 .OR. jp_cfg == 4 ) THEN
       !!----------------------------------------------------------------------
@@ -165 +166 @@
          CASE ( 1 )                                  !  ORCA_R1 configurations
             !                                        ! =======================
-            ii0 = 283   ;   ii1 = 283
-            ij0 = 200   ;   ij1 = 200
+            ! 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
+            ii0 = 283           ;   ii1 = 283
+            ij0 = 201 + isrow   ;   ij1 = 201 + isrow
             !                                        ! =======================
          CASE DEFAULT                                !    ORCA R05 or R025
@@ -212 +223 @@
          CASE ( 1 )                                  !  ORCA_R1 configurations
             !                                        ! =======================
-            ii0 = 282   ;   ii1 = 282
-            ij0 = 200   ;   ij1 = 200
+            !  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                                      
+            ii0 = 282           ;   ii1 = 282
+            ij0 = 201 + isrow   ;   ij1 = 201 + isrow
             !                                        ! =======================
          CASE DEFAULT                                !    ORCA R05 or R025
@@ -259 +275 @@
          CASE ( 1 )                                  !  ORCA_R1 configurations
             !                                        ! =======================
-            ii0 = 331   ;   ii1 = 331
-            ij0 = 176   ;   ij1 = 176
+            !  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                                      
+            ii0 = 331           ;   ii1 = 331
+            ij0 = 176 + isrow   ;   ij1 = 176 + isrow
             !                                        ! =======================
          CASE DEFAULT                                !    ORCA R05 or R025
@@ -306 +327 @@
          CASE ( 1 )                                  !  ORCA_R1 configurations
             !                                        ! =======================
-            ii0 = 297   ;   ii1 = 297 
-            ij0 = 230   ;   ij1 = 230
+            !  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                                      
+            ii0 = 297           ;   ii1 = 297
+            ij0 = 230 + isrow   ;   ij1 = 230 + isrow
             !                                        ! =======================
          CASE DEFAULT                                !    ORCA R05 or R025