Changeset 65

Timestamp:

2004-04-22T14:13:14+02:00 (20 years ago)

Author:

opalod

Message:

CT : BUGFIX039 : Indices and comments correction for zoom functionalities

Location:

trunk/NEMO/OPA_SRC/DOM

Files:

• dom_oce.F90 (modified) (1 diff)
• domcfg.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/DOM/dom_oce.F90

@@ -55 +55 @@
    INTEGER, PUBLIC, DIMENSION(jpj) ::   &   !:
       mjg                 !: local  ==> global  domain j-indice
-   INTEGER, PUBLIC, DIMENSION( jpiglo ) ::   &  !:  !!bug ==> other solution?
+   INTEGER, PUBLIC, DIMENSION( jpidta ) ::   &  !:  !!bug ==> other solution?
       mi0, mi1            !: global ==> local domain i-indice
       !                   !  (mi0=1 and mi1=0 if the global indice is not in the local domain)
-   INTEGER, PUBLIC, DIMENSION( jpjglo ) ::   &  !:
+   INTEGER, PUBLIC, DIMENSION( jpjdta ) ::   &  !:
       mj0, mj1            !: global ==> local domain j-indice
       !                   ! (mi0=1 and mi1=0 if the global indice is not in the local domain)

trunk/NEMO/OPA_SRC/DOM/domcfg.F90

@@ -100 +100 @@
       ! ============
 
-      ! local domain indices ==> global domain indices
+      ! local domain indices ==> data domain indices
       DO ji = 1, jpi
         mig(ji) = ji + jpizoom - 1 + nimpp - 1
@@ -108 +108 @@
       END DO
 
-      ! global domain indices ==> local domain indices
-      ! (return (m.0,m.1)=(1,0) if global domain gridpoint is not in the local domain)
-      DO ji = 1, jpiglo
-        mi0(ji) = MAX( 1, MIN( ji - jpizoom + 1 - nimpp + 1, jpi   ) )
-        mi1(ji) = MAX( 0, MIN( ji - jpizoom + 1 - nimpp + 1, jpim1 ) )
-      END DO
-      DO jj = 1, jpjglo
-        mj0(jj) = MAX( 1, MIN( jj - jpjzoom + 1 - njmpp + 1, jpj   ) )
-        mj1(jj) = MAX( 0, MIN( jj - jpjzoom + 1 - njmpp + 1, jpjm1 ) )
-      END DO
-
-      IF(lwp) THEN
-         WRITE(numout,*)
-         WRITE(numout,*) 'dom_glo : domain: data / global or zoom / local'
+      ! data domain indices ==> local domain indices
+      ! (return (m.0,m.1)=(1,0) if data domain gridpoint is to the west/south of the 
+      ! local domain, or (m.0,m.1)=(jp.+1,jp.) to the east/north of local domain. 
+      DO ji = 1, jpidta
+        mi0(ji) = MAX( 1, MIN( ji - jpizoom + 1 - nimpp + 1, jpi+1 ) )
+        mi1(ji) = MAX( 0, MIN( ji - jpizoom + 1 - nimpp + 1, jpi   ) )
+      END DO
+      DO jj = 1, jpjdta
+        mj0(jj) = MAX( 1, MIN( jj - jpjzoom + 1 - njmpp + 1, jpj+1 ) )
+        mj1(jj) = MAX( 0, MIN( jj - jpjzoom + 1 - njmpp + 1, jpj   ) )
+      END DO
+
+      IF(lwp) THEN
+         WRITE(numout,*)
+         WRITE(numout,*) 'dom_glo : domain: data / local '
          WRITE(numout,*) '~~~~~~~ '
          WRITE(numout,*) '          data input domain    : jpidta = ', jpidta,   &
@@ -133 +134 @@
             &                                           ' jpjzoom = ', jpjzoom
          WRITE(numout,*)
-         WRITE(numout,*) '          conversion local  ==> global/zoom i-index domain'
+         WRITE(numout,*) '          conversion local  ==> data i-index domain'
          WRITE(numout,25)              (mig(ji),ji = 1,jpi)
          WRITE(numout,*)
-         WRITE(numout,*) '          conversion global/zoom ==> local  i-index domain'
+         WRITE(numout,*) '          conversion data   ==> local  i-index domain'
          WRITE(numout,*) '             starting index'
-         WRITE(numout,25)              (mi0(ji),ji = 1,jpiglo)
+         WRITE(numout,25)              (mi0(ji),ji = 1,jpidta)
          WRITE(numout,*) '             ending index'
-         WRITE(numout,25)              (mi1(ji),ji = 1,jpiglo)
-         WRITE(numout,*)
-         WRITE(numout,*) '          conversion local  ==> global/zoom i-index domain'
+         WRITE(numout,25)              (mi1(ji),ji = 1,jpidta)
+         WRITE(numout,*)
+         WRITE(numout,*) '          conversion local  ==> data i-index domain'
          WRITE(numout,25)              (mjg(jj),jj = 1,jpj)
          WRITE(numout,*)
-         WRITE(numout,*) '          conversion global/zoom ==> local  i-index domain'
+         WRITE(numout,*) '          conversion data  ==> local i-index domain'
          WRITE(numout,*) '             starting index'
-         WRITE(numout,25)              (mj0(jj),jj = 1,jpjglo)
+         WRITE(numout,25)              (mj0(jj),jj = 1,jpjdta)
          WRITE(numout,*) '             ending index'
-         WRITE(numout,25)              (mj1(jj),jj = 1,jpjglo)
+         WRITE(numout,25)              (mj1(jj),jj = 1,jpjdta)
       ENDIF
  25   FORMAT( 100(10x,19i4,/) )
@@ -157 +158 @@
 
       ! zoom control
-      IF( jpiglo - jpizoom + 1  >  jpidta .OR.   &
-          jpjglo - jpjzoom + 1  >  jpjdta      ) THEN
+      IF( jpiglo + jpizoom - 1  >  jpidta .OR.   &
+          jpjglo + jpjzoom - 1  >  jpjdta      ) THEN
          IF(lwp)WRITE(numout,cform_err)
          IF(lwp)WRITE(numout,*)' global or zoom domain exceed the data domain ! '
@@ -168 +169 @@
 
       ! set zoom type flags
-      IF( lzoom .AND. jpizoom /= 1 )   lzoom_e = .TRUE.                     ! 
+      IF( lzoom .AND. jpizoom /= 1 )   lzoom_w = .TRUE.                     ! 
       IF( lzoom .AND. jpjzoom /= 1 )   lzoom_s = .TRUE.
-      IF( lzoom .AND. jpiglo + jpizoom -1 /= jpidta )   lzoom_w = .TRUE.
+      IF( lzoom .AND. jpiglo + jpizoom -1 /= jpidta )   lzoom_e = .TRUE.
       IF( lzoom .AND. jpjglo + jpjzoom -1 /= jpjdta )   lzoom_n = .TRUE.
 
@@ -192 +193 @@
          nstop = nstop + 1
       ENDIF
-      IF(  lzoom  .AND.  l_isl  ) THEN
+      IF(  lzoom  .AND.  lk_isl  ) THEN
          IF(lwp)WRITE(numout,cform_err)
          IF(lwp)WRITE(numout,*)' key_islands and zoom are not allowed'