Changeset 10234 for NEMO

Timestamp:

2018-10-26T16:19:35+02:00 (5 years ago)

Author:

cbricaud

Message:

correc a bug for MPP decompostion for coarsened grid for limited area model

File:

• NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsdom.F90 (modified) (7 diffs)

NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsdom.F90

@@ -189 +189 @@
             ENDDO
       END SELECT
-      WRITE(narea+1000-1,*)"end glam_crs gphi_crs ",p_glam_crs(1,2),p_gphi_crs(1,2)
 
       ! Retroactively add back the boundary halo cells.
-!????      CALL crs_lbc_lnk( p_gphi_crs, cd_type, 1.0 )
-!????      CALL crs_lbc_lnk( p_glam_crs, cd_type, 1.0 )
+      !CALL crs_lbc_lnk( p_gphi_crs, cd_type, 1.0 )
+      !CALL crs_lbc_lnk( p_glam_crs, cd_type, 1.0 )
       WRITE(narea+1000-1,*)"end1 glam_crs gphi_crs ",p_glam_crs(1,2),p_gphi_crs(1,2)
       !
@@ -1135 +1134 @@
       SELECT CASE ( jperio )
 
-      CASE ( 0, 1 )   ! limited area
+      CASE ( 0, 1 )
+
+      !exp for a regional configuration
+      ! i=1 => ghost cell  
 
               !--!--!--!--!--!--!--!--!--!
@@ -1144 +1146 @@
       !IBI36               1  2  3  4  5  
       !IBI12  !    1   !   2    !   3    !    
-
-
+ 
       jpiglo_crs   = INT( (jpiglo - 4) / nn_factx ) + 4
       jpjglo_crs   = INT( (jpjglo - 4) / nn_facty ) + 4
 
-      CASE ( 3, 4 )    ! global 
+      jpj_crs = ( jpjglo_crs -1  - 2 * jprecj + (jpnj-1) ) / jpnj + 2 * jprecj
+      IF( MOD( jpjglo_crs   - 2 * jprecj + (jpnj-1) , jpnj ) .NE.  0._wp )THEN
+         jpj_crs = jpj_crs + 1
+      ENDIF
+
+      CASE ( 3, 4 )    !  
       jpiglo_crs   = INT( (jpiglo - 2) / nn_factx ) + 2
       jpjglo_crs   = INT( (jpjglo - MOD(jpjglo, nn_facty)) / nn_facty ) + 2
+
+      jpj_crs = ( jpjglo_crs -1  - 2 * jprecj + (jpnj-1) ) / jpnj + 2 * jprecj
 
       END SELECT
@@ -1159 +1167 @@
 
       jpi_crs = ( jpiglo_crs   - 2 * jpreci + (jpni-1) ) / jpni + 2 * jpreci
-      jpj_crs = ( jpjglo_crsm1 - 2 * jprecj + (jpnj-1) ) / jpnj + 2 * jprecj
        
       jpi_crsm1   = jpi_crs - 1
@@ -1318 +1325 @@
                   nldi_crs=2
                   mis2_crs(ijis-1) = mie2_crs(ijis-1) -1
+               !CASE DEFAULT
+               !  WRITE(narea+8000-1,*)"WRONG VALUE FOR iistart ",ii_start
             END SELECT
 
@@ -1555 +1564 @@
                      nldj_crs=2
                      mjs2_crs(ijjs-1) = mje2_crs(ijjs-1) -1
-                  CASE DEFAULT
-                     WRITE(narea+8000-1,*)"WRONG VALUE FOR iistart ",ii_start
+                  !CASE DEFAULT
+                  !   WRITE(narea+8000-1,*)"WRONG VALUE FOR iistart ",ii_start
                END SELECT
 
@@ -1895 +1904 @@
 
       !!----------------------------------------------------------------
-
       mikt_crs(:,:)=1