Changeset 9051 for branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/src/domzgr.f90

Timestamp:

2017-12-14T15:47:12+01:00 (6 years ago)

Author:

flavoni

Message:

put back correct routines for TOOLS/DOMAINcfg, do not change these routines in merge development or merge phase

File:

• branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/src/domzgr.f90 (modified) (2 diffs)

branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/src/domzgr.f90

@@ -1957 +1957 @@
          WRITE(numout,*) '        Bottom cell (Zb) (m) = H*rn_zb_a + rn_zb_b'
       ENDIF
-      ! CEOD
-      ! Add on some reference level to make nagative bathy positive to create
-      ! sensible e3t_0's
-! Can used commented code here to force bathy near open bdy not to have any WAD
-! points
-
-!CEOD MAKE points on the perimeter assuming a bondary is here on shallower than
-!10m so that tide can be specified here.
-!      DO jj = 1, jpj
-!         DO ji = 1, jpi
-!            !CEODIF( mig(ji) <= 2 .or. mjg(jj) <= 2  .or. mig(ji) >= jpiglo-2 .or.  mjg(jj) >=jpjglo-2) then
-!            IF( mig(ji) <= 10   .or. mjg(jj) <=10  .or.  mjg(ji) >=jpiglo-10+1 .or. mjg(jj) >=jpjglo-10+1   ) then
-!               IF( bathy(ji,jj) + rn_wd_ref_depth  > 0.0)   then
-!                  bathy(ji,jj) = max(5.0,bathy(ji,jj)) !
-!               ENDIF
-!               IF( bathy(ji,jj)  + rn_wd_ref_depth   <= 0.0)   then
-!                  bathy(ji,jj) =  -rn_wd_ref_depth*2._wp ! Make sure it is land
-!               ENDIF
-!            ENDIF
-!         END DO
-!      END DO
-
-      IF( ln_wd) THEN
-         bathy(:,:) = bathy(:,:) + rn_wd_ref_depth !  Arbitrary reference level for WAD, This needs
-      ELSE
-         bathy(:,:) = bathy(:,:)  !  Arbitrary reference level for WAD, This needs
-      ENDIF
-                                                !  to be accounted for in istate in the actual model and bdys etc.
+
       hift(:,:) = rn_sbot_min                     ! set the minimum depth for the s-coordinate
       hifu(:,:) = rn_sbot_min
@@ -2105 +2078 @@
       hbatt(:,:) = zenv(:,:) 
       IF( MINVAL( gphit(:,:) ) * MAXVAL( gphit(:,:) ) <= 0._wp ) THEN
-          IF ( jphgr_msh == 2 .OR. jphgr_msh == 3) CALL ctl_stop( 'dom:zgr_sco:  if jphgr_msh = 2 or 3 and  & 
-                                      & s-coordinates stop, if not correction at Equator is applied, but it is wrong')
          CALL ctl_warn( ' s-coordinates are tapered in vicinity of the Equator' )
          DO jj = 1, jpj