Changeset 253 for trunk/NEMO/OPA_SRC/DOM

Timestamp:

2005-08-30T15:26:11+02:00 (19 years ago)

Author:

opalod

Message:

nemo_v1_update_001 : Add the 1D configuration possibility

Location:

trunk/NEMO/OPA_SRC/DOM

Files:

• domzgr.F90 (modified) (2 diffs)
• domzgr_s.h90 (modified) (1 diff)
• domzgr_zps.h90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -22 +22 @@
    USE closea
    USE solisl
+   USE ini1d           ! initialization of the 1D configuration
 
    IMPLICIT NONE
@@ -592 +593 @@
       ! ================
 
-      ! Suppress isolated ocean grid points
-
-      IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*)'                   suppress isolated ocean grid points'
-      IF(lwp) WRITE(numout,*)'                   -----------------------------------'
-
-      icompt = 0
-
-      DO jl = 1, 2
-
-         IF( nperio == 1 .OR. nperio  ==  4 .OR. nperio  ==  6 ) THEN
-            mbathy( 1 ,:) = mbathy(jpim1,:)
-            mbathy(jpi,:) = mbathy(  2  ,:)
-         ENDIF
-         DO jj = 2, jpjm1
-            DO ji = 2, jpim1
-               ibtest = MAX( mbathy(ji-1,jj), mbathy(ji+1,jj),   &
-                  mbathy(ji,jj-1),mbathy(ji,jj+1) )
-               IF( ibtest < mbathy(ji,jj) ) THEN
-                  IF(lwp) WRITE(numout,*) ' the number of ocean level at ',   &
-                     'grid-point (i,j) =  ',ji,jj,' is changed from ',   &
-                     mbathy(ji,jj),' to ', ibtest
-                  mbathy(ji,jj) = ibtest
-                  icompt = icompt + 1
-               ENDIF
+      IF( .NOT. lk_cfg_1d )   THEN
+
+         ! Suppress isolated ocean grid points
+
+         IF(lwp) WRITE(numout,*)
+         IF(lwp) WRITE(numout,*)'                   suppress isolated ocean grid points'
+         IF(lwp) WRITE(numout,*)'                   -----------------------------------'
+
+         icompt = 0
+
+         DO jl = 1, 2
+
+            IF( nperio == 1 .OR. nperio  ==  4 .OR. nperio  ==  6 ) THEN
+               mbathy( 1 ,:) = mbathy(jpim1,:)
+               mbathy(jpi,:) = mbathy(  2  ,:)
+            ENDIF
+            DO jj = 2, jpjm1
+               DO ji = 2, jpim1
+                  ibtest = MAX( mbathy(ji-1,jj), mbathy(ji+1,jj),   &
+                     mbathy(ji,jj-1),mbathy(ji,jj+1) )
+                  IF( ibtest < mbathy(ji,jj) ) THEN
+                     IF(lwp) WRITE(numout,*) ' the number of ocean level at ',   &
+                        'grid-point (i,j) =  ',ji,jj,' is changed from ',   &
+                        mbathy(ji,jj),' to ', ibtest
+                     mbathy(ji,jj) = ibtest
+                     icompt = icompt + 1
+                  ENDIF
+               END DO
             END DO
+
          END DO
-
-      END DO
-      IF( icompt == 0 ) THEN
-         IF(lwp) WRITE(numout,*)'     no isolated ocean grid points'
-      ELSE
-         IF(lwp) WRITE(numout,*)'    ',icompt,' ocean grid points suppressed'
-      ENDIF
-      IF( lk_mpp ) THEN
-         zbathy(:,:) = FLOAT( mbathy(:,:) )
-         CALL lbc_lnk( zbathy, 'T', 1. )
-         mbathy(:,:) = INT( zbathy(:,:) )
-      ENDIF
-
-      ! 3.2 East-west cyclic boundary conditions
-
-      IF( nperio == 0 ) THEN
-         IF(lwp) WRITE(numout,*) ' mbathy set to 0 along east and west',   &
-            ' boundary: nperio = ', nperio
+         IF( icompt == 0 ) THEN
+            IF(lwp) WRITE(numout,*)'     no isolated ocean grid points'
+         ELSE
+            IF(lwp) WRITE(numout,*)'    ',icompt,' ocean grid points suppressed'
+         ENDIF
          IF( lk_mpp ) THEN
-            IF( nbondi == -1 .OR. nbondi == 2 ) THEN
-               IF( jperio /= 1 )   mbathy(1,:) = 0
-            ENDIF
-            IF( nbondi == 1 .OR. nbondi == 2 ) THEN
-               IF( jperio /= 1 )   mbathy(nlci,:) = 0
-            ENDIF
-         ELSE
-            mbathy( 1 ,:) = 0
-            mbathy(jpi,:) = 0
-         ENDIF
-      ELSEIF( nperio == 1 .OR. nperio == 4 .OR. nperio ==  6 ) THEN
-         IF(lwp) WRITE(numout,*)' east-west cyclic boundary conditions',   &
-            ' on mbathy: nperio = ', nperio
-         mbathy( 1 ,:) = mbathy(jpim1,:)
-         mbathy(jpi,:) = mbathy(  2  ,:)
-      ELSEIF( nperio == 2 ) THEN
-         IF(lwp) WRITE(numout,*) '   equatorial boundary conditions',   &
-            ' on mbathy: nperio = ', nperio
-      ELSE
-         IF(lwp) WRITE(numout,*) '    e r r o r'
-         IF(lwp) WRITE(numout,*) '    parameter , nperio = ', nperio
-         !         STOP 'dom_mba'
-      ENDIF
-
-      ! Set to zero mbathy over islands if necessary  (lk_isl=F)
-      IF( .NOT. lk_isl ) THEN    ! No island
-         IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) '         mbathy set to 0 over islands'
-         IF(lwp) WRITE(numout,*) '         ----------------------------'
-
-         mbathy(:,:) = MAX( 0, mbathy(:,:) )
-
-         !  Boundary condition on mbathy
-         IF( .NOT.lk_mpp ) THEN 
-            !!bug ???  y reflechir!
-            !   ... mono- or macro-tasking: T-point, >0, 2D array, no slab
             zbathy(:,:) = FLOAT( mbathy(:,:) )
             CALL lbc_lnk( zbathy, 'T', 1. )
             mbathy(:,:) = INT( zbathy(:,:) )
+         ENDIF
+
+         ! 3.2 East-west cyclic boundary conditions
+
+         IF( nperio == 0 ) THEN
+            IF(lwp) WRITE(numout,*) ' mbathy set to 0 along east and west',   &
+               ' boundary: nperio = ', nperio
+            IF( lk_mpp ) THEN
+               IF( nbondi == -1 .OR. nbondi == 2 ) THEN
+                  IF( jperio /= 1 )   mbathy(1,:) = 0
+               ENDIF
+               IF( nbondi == 1 .OR. nbondi == 2 ) THEN
+                  IF( jperio /= 1 )   mbathy(nlci,:) = 0
+               ENDIF
+            ELSE
+               mbathy( 1 ,:) = 0
+               mbathy(jpi,:) = 0
+            ENDIF
+         ELSEIF( nperio == 1 .OR. nperio == 4 .OR. nperio ==  6 ) THEN
+            IF(lwp) WRITE(numout,*)' east-west cyclic boundary conditions',   &
+               ' on mbathy: nperio = ', nperio
+            mbathy( 1 ,:) = mbathy(jpim1,:)
+            mbathy(jpi,:) = mbathy(  2  ,:)
+         ELSEIF( nperio == 2 ) THEN
+            IF(lwp) WRITE(numout,*) '   equatorial boundary conditions',   &
+               ' on mbathy: nperio = ', nperio
+         ELSE
+            IF(lwp) WRITE(numout,*) '    e r r o r'
+            IF(lwp) WRITE(numout,*) '    parameter , nperio = ', nperio
+            !         STOP 'dom_mba'
+         ENDIF
+
+         ! Set to zero mbathy over islands if necessary  (lk_isl=F)
+         IF( .NOT. lk_isl ) THEN    ! No island
+            IF(lwp) WRITE(numout,*)
+            IF(lwp) WRITE(numout,*) '         mbathy set to 0 over islands'
+            IF(lwp) WRITE(numout,*) '         ----------------------------'
+
+            mbathy(:,:) = MAX( 0, mbathy(:,:) )
+
+            !  Boundary condition on mbathy
+            IF( .NOT.lk_mpp ) THEN 
+               !!bug ???  y reflechir!
+               !   ... mono- or macro-tasking: T-point, >0, 2D array, no slab
+               zbathy(:,:) = FLOAT( mbathy(:,:) )
+               CALL lbc_lnk( zbathy, 'T', 1. )
+               mbathy(:,:) = INT( zbathy(:,:) )
+            ENDIF
+
          ENDIF
 

trunk/NEMO/OPA_SRC/DOM/domzgr_s.h90

@@ -196 +196 @@
       END DO
 
+      ! ===========
+      ! Zoom domain 
+      ! ===========
+
+      IF( lzoom )   CALL zgr_bat_zoom
+
       ! 2.4 Control print
 

trunk/NEMO/OPA_SRC/DOM/domzgr_zps.h90

@@ -418 +418 @@
    ENDIF
 
+      ! ===========
+      ! Zoom domain 
+      ! ===========
+
+      IF( lzoom )   CALL zgr_bat_zoom
+
       ! ================
       ! Bathymetry check