Changeset 7030

Timestamp:

2016-10-14T14:24:48+02:00 (8 years ago)

Author:

acc

Message:

Branch dev_r6393_NOC_WAD. Added over-topping test case to WAD_TEST_CASES (jp_cfg=6). Also removed last references to redundant wduflt and wdvflt arrays

Location:

branches/2016/dev_r6393_NOC_WAD/NEMOGCM/NEMO/OPA_SRC

Files:

• DOM/domzgr.F90 (modified) (1 diff)
• DYN/dynhpg.F90 (modified) (2 diffs)
• DYN/wet_dry.F90 (modified) (4 diffs)

branches/2016/dev_r6393_NOC_WAD/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -529 +529 @@
                         zdta(:,jpjdta-2:jpjdta) = -4._wp
                         !                                    ! ===========================
+                     CASE ( 6 )                              ! WAD 6 configuration
+                        !                                    ! ====================
+                        !
+                        IF(lwp) WRITE(numout,*)
+                        IF(lwp) WRITE(numout,*) 'zgr_bat : Parabolic channel with gaussian ridge'
+                        IF(lwp) WRITE(numout,*) '~~~~~~~~~~'
+                        !
+                        DO ji = 1, jpidta
+                          zi = MAX(1.0-FLOAT((ji-25)**2)/484.0, -2.0 )
+                          zj = 0.95*MAX(EXP(-1.0*FLOAT((ji-25)**2)/32.0) , 0.0 )
+                          zdta(ji,:) = MAX(rn_bathy*(zi-zj), -2.0)
+                          IF(lwp)write(numout,*) 'ZDTA ',ji,zi,zdta(ji,1)
+                        END DO
+                        zdta(1:2,:) = -4._wp
+                        zdta(jpidta-1:jpidta,:) = -4._wp
+                        zdta(:,1) = -4._wp
+                        zdta(:,jpjdta) = -4._wp
+                        zdta(:,1:3) = -4._wp
+                        zdta(:,jpjdta-2:jpjdta) = -4._wp
+                        !                                    ! ===========================
                      CASE DEFAULT
                         !                                    ! ===========================

branches/2016/dev_r6393_NOC_WAD/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90

@@ -461 +461 @@
              IF(ll_tmp1.AND.ll_tmp2) THEN
                zcpx(ji,jj) = 1.0_wp
-               wduflt(ji,jj) = 1.0_wp
              ELSE IF(ll_tmp3) THEN
                ! no worries about sshn(ji+1,jj)-sshn(ji,jj) = 0, it won't happen ! here
                zcpx(ji,jj) = ABS((sshn(ji+1,jj) + bathy(ji+1,jj) - sshn(ji,jj) - bathy(ji,jj)) / &
                            &     (sshn(ji+1,jj) - sshn(ji,jj)))
-               wduflt(ji,jj) = 1.0_wp
              ELSE
                zcpx(ji,jj) = 0._wp
-               wduflt(ji,jj) = 0.0_wp
              END IF
       
@@ -479 +476 @@
              IF(ll_tmp1.AND.ll_tmp2) THEN
                zcpy(ji,jj) = 1.0_wp
-               wdvflt(ji,jj) = 1.0_wp
              ELSE IF(ll_tmp3) THEN
                ! no worries about sshn(ji,jj+1)-sshn(ji,jj) = 0, it won't happen ! here
                zcpy(ji,jj) = ABS((sshn(ji,jj+1) + bathy(ji,jj+1) - sshn(ji,jj) - bathy(ji,jj)) / &
                            &     (sshn(ji,jj+1) - sshn(ji,jj)))
-               wdvflt(ji,jj) = 1.0_wp
              ELSE
                zcpy(ji,jj) = 0._wp
-               wdvflt(ji,jj) = 0.0_wp
              END IF
            END DO

branches/2016/dev_r6393_NOC_WAD/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90

@@ -33 +33 @@
    !! ---------------------------------------------------------------------
 
-   REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:) ::   wduflt, wdvflt !: u- and v- filter
    REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:) ::   wdmask         !: u- and v- limiter 
 
@@ -88 +87 @@
 
       IF(ln_wd) THEN
-         ALLOCATE( wduflt(jpi,jpj), wdvflt(jpi,jpj), wdmask(jpi,jpj), STAT=ierr )
+         ALLOCATE( wdmask(jpi,jpj), STAT=ierr )
          IF( ierr /= 0 ) CALL ctl_stop('STOP', 'wad_init : Array allocation error')
       ENDIF
@@ -474 +473 @@
 
             !
+            !                                     ! ===========================
+         CASE ( 6 )                               ! WAD 6 configuration
+            !                                     ! ====================
+            !
+            IF(lwp) WRITE(numout,*)
+            IF(lwp) WRITE(numout,*) 'istate_wad : Parobolic EW channel with gaussian ridge' 
+            IF(lwp) WRITE(numout,*) '~~~~~~~~~~'
+            !
+            do ji = 1,jpi
+             !6a
+             sshn(ji,:) = ( -5.5_wp + 9.0_wp*FLOAT(jpidta - mig(ji))/FLOAT(jpidta-1))*tmask(ji,:,1)
+             !Some variations in initial slope that have been tested
+             !6b
+             !sshn(ji,:) = ( -5.5_wp + 6.5_wp*FLOAT(jpidta - mig(ji))/FLOAT(jpidta-1))*tmask(ji,:,1)
+             !6c
+             !sshn(ji,:) = ( -5.5_wp + 7.5_wp*FLOAT(jpidta - mig(ji))/FLOAT(jpidta-1))*tmask(ji,:,1)
+             !6d
+             !sshn(ji,:) = ( -4.5_wp + 8.0_wp*FLOAT(jpidta - mig(ji))/FLOAT(jpidta-1))*tmask(ji,:,1)
+            end do
+
+            !
             !                                    ! ===========================
          CASE DEFAULT                            ! NONE existing configuration
@@ -487 +507 @@
       do jj = 1,jpj
          do ji = 1,jpi
-            IF( bathy(ji,jj) + sshn(ji,jj) < 0.4_wp) THEN
-               sshn(ji,jj) = tmask(ji,jj,1)*(0.4_wp - bathy(ji,jj))
+            IF( bathy(ji,jj) + sshn(ji,jj) < rn_wdmin1 ) THEN
+               sshn(ji,jj) = tmask(ji,jj,1)*( rn_wdmin1 - bathy(ji,jj) )
             ENDIF
          end do