Changeset 10239

Timestamp:

2018-10-26T17:43:47+02:00 (6 years ago)

Author:

cmao

Message:

Copy in changes to dev_r5003_MERCATOR6_CRS at r10234

Location:

branches/UKMO/dev_r10171_test_crs_AMM7/NEMOGCM/NEMO/OPA_SRC/CRS

Files:

• crs.F90 (modified) (1 diff)
• crsdom.F90 (modified) (10 diffs)

branches/UKMO/dev_r10171_test_crs_AMM7/NEMOGCM/NEMO/OPA_SRC/CRS/crs.F90

@@ -326 +326 @@
 #elif defined key_traldf_c1d
       ALLOCATE( ahtt_crs(        jpk) , ahtu_crs(        jpk) , ahtv_crs(        jpk) , ahtw_crs(        jpk) , &
+#else
+      ALLOCATE( &
 #endif
               & r_fact_lap_crs(jpi_crs,jpj_crs,jpk) , STAT=ierr(13) )

branches/UKMO/dev_r10171_test_crs_AMM7/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  
 
               !--!--!--!--!--!--!--!--!--!
@@ -1143 +1145 @@
               !--!--!--!--!--!--!--!--!--!
       !IBI36               1  2  3  4  5  
-      !IBI12  !    1   !   2    !   3    ! 
-      
-
+      !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
 
          ENDIF
-
+         
          !----------------------------------------------------------------------------------------------
          ! I-4 compute nimpp_crs
@@ -1368 +1377 @@
             mie_crs(ji) = mie2_crs(mig_crs(ji)) - nimpp + 1
             nfactx(ji)  = mie_crs(ji)-mis_crs(ji)+1
-         ENDDO         
+         ENDDO
 
          !-----------------------------------------------------------------------------
@@ -1456 +1465 @@
          END SELECT
 
-
+         
          !WRITE(narea+1000-1,*)"loc crs jpi nldi,nlei,nlci ",jpi_crs, nldi_crs            ,nlei_crs             ,nlci_crs
          !CALL FLUSH(narea+1000-1)
@@ -1534 +1543 @@
          !     global: special case when the domain on the north is land: 
          !             compute mjs2_crs and mje2_crs for the first cell of the local domain 
-         !     local :  special case for southern domain  
+         !     local :  special case for southern domain 
          !---------------------------------------------------------------------------------------------
          nldj_crs = 2
@@ -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