Changeset 8929

Timestamp:

2017-12-06T17:59:59+01:00 (7 years ago)

Author:

cbricaud

Message:

change in CRS branch for regional configuration

File:

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

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

@@ -175 +175 @@
             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)
       !
    END SUBROUTINE crs_dom_coordinates
@@ -1114 +1116 @@
       ! Define global and local domain sizes
       !==============================================================================================
+      SELECT CASE ( jperio )
+
+      CASE ( 0, 1 )
+      jpiglo_crs   = INT( (jpiglo - 2) / nn_factx ) + 2
+      jpjglo_crs   = INT( (jpjglo - 2) / nn_facty ) + 2
+
+      CASE ( 3, 4 )    !  
       jpiglo_crs   = INT( (jpiglo - 2) / nn_factx ) + 2
       jpjglo_crs   = INT( (jpjglo - MOD(jpjglo, nn_facty)) / nn_facty ) + 2
+
+      END SELECT
+      
       jpiglo_crsm1 = jpiglo_crs - 1
       jpjglo_crsm1 = jpjglo_crs - 1  
@@ -1256 +1268 @@
          ijis=ji
          ii_start = mis2_crs(ijis)-nimpp+1
-         WRITE(narea+1000-1,*)"start ",ijis,mis2_crs(ijis),ii_start ; CALL FLUSH(narea+1000-1)
+         !WRITE(narea+1000-1,*)"start ",ijis,mis2_crs(ijis),ii_start ; CALL FLUSH(narea+1000-1)
 
          !----------------------------------------------------------------------------------------------
@@ -1317 +1329 @@
          DO ji = 1, jpi_crs
             mig_crs(ji) = ji + nimpp_crs - 1
-            WRITE(narea+1000-1,*)"crs loctoglo",ji,mig_crs(ji) ; CALL FLUSH(narea+1000-1)
+            !WRITE(narea+1000-1,*)"crs loctoglo",ji,mig_crs(ji) ; CALL FLUSH(narea+1000-1)
          ENDDO
          DO ji = 1, jpiglo_crs
@@ -1365 +1377 @@
          !CALL FLUSH(narea+1000-1)
          !DO ji = 1, jpi_crs
-         !   WRITE(narea+1000-1,*)"crs i",ji,ji+nimpp_crs-1,mis_crs(ji),mie_crs(ji),mis_crs(ji)+nimpp-1,mie_crs(ji)+nimpp-1,nfactx(ji)
+         !   WRITE(narea+1000-1,'(A15,7(1X,I4.4))')"crs test i",ji,ji+nimpp_crs-1,mis_crs(ji),mie_crs(ji), &
+         !        &                                        mis_crs(ji)+nimpp-1,mie_crs(ji)+nimpp-1,nfactx(ji)
          !ENDDO
 
@@ -1458 +1471 @@
             ENDIF
          ENDIF
+         IF( jperio==0 .OR. jperio==1 )THEN
+            IF( njmpp==1 )nldj_crs=1
+         END IF
 
          !----------------------------------------------------------------------------------------------
@@ -1523 +1539 @@
             !WRITE(narea+1000-1,*)"test J",jj,mjg_crs(jj),mjs_crs(jj),mje_crs(jj),mjs_crs(jj)+njmpp-1,mje_crs(jj)+njmpp-1,nfacty(jj)
          ENDDO
+
+         !WRITE(narea+1000-1,*)"loc crs jpj nldj,nlej,nlcj ",jpj_crs, nldj_crs ,nlej_crs,nlcj_crs ; CALL FLUSH(narea+1000-1)
+         !WRITE(narea+1000-1,*)"glo crs jpj nldj,nlej      ",jpj_crs, nldj_crs+njmpp_crs-1,nlej_crs+njmpp_crs-1 ;CALL FLUSH(narea+1000-1)
+         !DO jj = 1, jpj_crs
+         !   WRITE(narea+1000-1,'(A15,7(1X,I4.4))')"crs test j",jj,jj+njmpp_crs-1,mjs_crs(jj),mje_crs(jj), &
+         !        & mjs_crs(jj)+njmpp-1,mje_crs(jj)+njmpp-1,nfacty(jj)
+         !ENDDO
 
          !==========================================================================