Changeset 2465 for trunk

Timestamp:

2010-12-08T14:58:55+01:00 (13 years ago)

Author:

cetlod

Message:

v3.2 : move the call of zgr_bat_ctl & zgr_bat_zoom at the right place, see ticket:671

File:

• trunk/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -116 +116 @@
       IF( ln_zps )   CALL zgr_zps      ! Partial step z-coordinate
       IF( ln_sco )   CALL zgr_sco      ! s-coordinate or hybrid z-s coordinate
+      !
+     ! final adjustment of mbathy & check
+     ! -----------------------------------
+     IF( lzoom       )   CALL zgr_bat_zoom     ! correct mbathy in case of zoom subdomain
+     IF( .NOT.lk_c1d )   CALL zgr_bat_ctl      ! check bathymetry (mbathy) and suppress isoated ocean points
+
 
 !!bug gm control print:
@@ -478 +484 @@
       IF( ln_zps .OR. ln_sco )   CALL ctl_stop( ' CAUTION: 300 levels only with level bathymetry' )
 #endif
-      !                                               ! =============== !
-      IF( lzoom        )   CALL zgr_bat_zoom          !   Zoom domain   !
-      !                                               ! =============== !
-
-      !                                               ! =================== !
-      IF( .NOT. lk_c1d )   CALL zgr_bat_ctl           !   Bathymetry check  !
-      !                                               ! =================== !
+      !                         
    END SUBROUTINE zgr_bat
 
@@ -979 +979 @@
          WRITE(numout,*) 'domzgr gdep3w(mbathy)'   ;   CALL prihre(zprt(:,:,1),jpi,jpj,1,jpi,1,1,jpj,1,1.e-3,numout)
       ENDIF  
-       
-      !                                               ! =============== !
-      IF( lzoom )   CALL zgr_bat_zoom                 !   Zoom domain   !
-      !                                               ! =============== !
-
-      !                                               ! =================== !
-      IF( .NOT. lk_c1d )   CALL zgr_bat_ctl           !   Bathymetry check  !
-      !                                               ! =================== !
+      !                                     
    END SUBROUTINE zgr_zps
 
@@ -1472 +1465 @@
 
 
-      !                                               ! ===========
-      IF( lzoom )   CALL zgr_bat_zoom                 ! Zoom domain 
-      !                                               ! ===========
-
-      !                                               ! =================== !
-      IF( .NOT. lk_c1d )   CALL zgr_bat_ctl           !   Bathymetry check  !
-      !                                               ! =================== !
-
       !                                               ! =============
       IF(lwp) THEN                                    ! Control print