Changeset 7022 for branches/2016/dev_r6393_NOC_WAD/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90

Timestamp:

2016-10-11T18:18:38+02:00 (8 years ago)

Author:

acc

Message:

Branch dev_r6393_NOC_WAD. WAD TEST CASES 4 (parabolic bowl) and 5 (double slope) now initialised correctly and tested

File:

• branches/2016/dev_r6393_NOC_WAD/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90 (modified) (2 diffs)

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

@@ -399 +399 @@
       !
       INTEGER  ::   ji, jj            ! dummy loop indices
+      REAL(wp) ::   zi, zj
       !!----------------------------------------------------------------------
       !
@@ -450 +451 @@
             IF(lwp) WRITE(numout,*) '~~~~~~~~~~'
             !
+            DO ji = 1, jpi
+               zi = MAX(1.0-FLOAT((mig(ji)-25)**2)/400.0, 0.0 )
+               DO jj = 1, jpj
+                  zj = MAX(1.0-FLOAT((mjg(jj)-17)**2)/144.0, 0.0 )
+                  sshn(ji,jj) = -8.5_wp + 8.5_wp*zi*zj
+               END DO
+            END DO
+
+            !
+            !                                    ! ===========================
+         CASE ( 5 )                              ! WAD 5 configuration
+            !                                    ! ====================
+            !
+            IF(lwp) WRITE(numout,*)
+            IF(lwp) WRITE(numout,*) 'istate_wad : Double slope with shelf'
+            IF(lwp) WRITE(numout,*) '~~~~~~~~~~'
+            !
+            ! Needed rn_wdmin2 increased to 0.01 for this case?
             do ji = 1,jpi
-             sshn(ji,:) = ( -5.5_wp + 3.9_wp*FLOAT(jpidta - mig(ji))/FLOAT(jpidta-1))*tmask(ji,:,1)
-             ! very small displacement test:
-             !sshn(ji,:) = ( -0.05_wp + 0.05_wp*FLOAT(jpidta - mig(ji))/FLOAT(jpidta-1))*tmask(ji,:,1)
+             sshn(ji,:) = ( -5.5_wp + 9.0_wp*FLOAT(mig(ji))/FLOAT(jpidta-1))*tmask(ji,:,1)
             end do