Changeset 5769 for branches/2015/dev_r5187_UKMO13_simplification/NEMOGCM/TOOLS/SCOORD_GEN/src/scoord_gen.F90

Timestamp:

2015-10-01T10:24:30+02:00 (9 years ago)

Author:

timgraham

Message:

1) Added tapering near equator if domain crosses equator
2) Added all variables that are needed for mesh_mask file to the output file.

File:

• branches/2015/dev_r5187_UKMO13_simplification/NEMOGCM/TOOLS/SCOORD_GEN/src/scoord_gen.F90 (modified) (4 diffs)

branches/2015/dev_r5187_UKMO13_simplification/NEMOGCM/TOOLS/SCOORD_GEN/src/scoord_gen.F90

@@ -57 +57 @@
 
       WRITE(*,*)
-      WRITE(*,*) 'domzgr_sco : s-coordinate or hybrid z-s-coordinate'
+      WRITE(*,*) 'scoord_gen : s-coordinate or hybrid z-s-coordinate'
       WRITE(*,*) '~~~~~~~~~~~'
       WRITE(*,*) '   Namelist namzgr_sco'
@@ -66 +66 @@
       WRITE(*,*) '        Critical depth                               rn_hc         = ',rn_hc
       WRITE(*,*) '        maximum cut-off r-value allowed              rn_rmax       = ',rn_rmax
+      WRITE(*,*) '        Tapering in vicinity of equator              ln_eq_taper   = ',ln_eq_taper
+      WRITE(*,*) '        Horizontal Coordinate File                   cn_coord_hgr  = ',cn_coord_hgr
       WRITE(*,*) '     Song and Haidvogel 1994 stretching              ln_s_sh94     = ',ln_s_sh94
       WRITE(*,*) '        Song and Haidvogel 1994 stretching coefficients'
@@ -126 +128 @@
          END DO
       END DO
-      WRITE(*,*) 'domzgr_sco print', bathy(196,147)
       ! 
       ! smooth the bathymetry (if required)
@@ -199 +200 @@
       !
       ! Envelope bathymetry saved in hbatt
+      hbatt(:,:) = zenv(:,:) 
       ! TODO - get this section to work
-      hbatt(:,:) = zenv(:,:) 
-!      IF( MINVAL( gphit(:,:) ) * MAXVAL( gphit(:,:) ) <= 0. ) THEN
- !        CALL ctl_warn( ' s-coordinates are tapered in vicinity of the Equator' )
- !        DO jj = 1, jpj
- !           DO ji = 1, jpi
- !              ztaper = EXP( -(gphit(ji,jj)/8.)**2. )
- !              hbatt(ji,jj) = rn_sbot_max * ztaper + hbatt(ji,jj) * ( 1. - ztaper )
- !           END DO
- !        END DO
- !     ENDIF
+      IF( ln_eq_taper) THEN
+        CALL READ_GPHIT()
+        IF( MINVAL( gphit(:,:) ) * MAXVAL( gphit(:,:) ) <= 0. ) THEN
+          CALL ctl_warn( ' s-coordinates are tapered in vicinity of the Equator' )
+          DO jj = 1, jpj
+             DO ji = 1, jpi
+                ztaper = EXP( -(gphit(ji,jj)/8.)**2. )
+                hbatt(ji,jj) = rn_sbot_max * ztaper + hbatt(ji,jj) * ( 1. - ztaper )
+             END DO
+          END DO
+      ENDIF
       !
       !                                        ! ==============================