Changeset 8865 for branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

Timestamp:

2017-12-01T05:41:32+01:00 (6 years ago)

Author:

deazer

Message:

Moving Changes from CS15mini config into NEMO main src
Updating TEST configs to run wit this version of the code
all sette tests pass at this revision other than AGRIF
Includes updates to dynnxt and tranxt required for 3D rives in WAD case to be conservative.

Next commit will update naming conventions and tidy the code.

File:

• branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) (1 diff)

branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

@@ -876 +876 @@
          ELSE                                   !* Initialize at "rest"
             !
-            IF( ln_wd .AND. ( cn_cfg == 'wad' ) ) THEN
+
+! MJB ln_rwd edits start here - these are essential 
+
+            IF( (ln_wd .OR. ln_rwd)) THEN 
+
               ! Wetting and drying test case
-              CALL usr_def_istate( gdept_b, tmask, tsb, ub, vb, sshb  )
-                       tsn  (:,:,:,:) = tsb (:,:,:,:)       ! set now values from to before ones
-                       sshn (:,:)     = sshb(:,:)
-                       un   (:,:,:)   = ub  (:,:,:)
-                       vn   (:,:,:)   = vb  (:,:,:)
-                                                ! uniform T-S fields and initial ssh slope
-               ! needs to be called here and in istate which is called later.
-               ! Adjust vertical metrics
+               IF( cn_cfg == 'wad' ) THEN
+                  CALL usr_def_istate( gdept_b, tmask, tsb, ub, vb, sshb  )
+                  tsn  (:,:,:,:) = tsb (:,:,:,:)       ! set now values from to before ones
+                  sshn (:,:)     = sshb(:,:)
+                  un   (:,:,:)   = ub  (:,:,:)
+                  vn   (:,:,:)   = vb  (:,:,:)
+               ELSEIF( ln_wd .or. ln_rwd   ) THEN ! if not test case
+                  sshn(:,:) = -rn_ssh_ref
+                  sshb(:,:) = -rn_ssh_ref
+
+                  DO jj = 1, jpj
+                     DO ji = 1, jpi
+                        IF( ht_0(ji,jj)-rn_ssh_ref <  rn_wdmin1 ) THEN ! if total depth is less than min depth
+
+                           sshb(ji,jj) = rn_wdmin1 - (ht_0(ji,jj) )
+                           sshn(ji,jj) = rn_wdmin1 - (ht_0(ji,jj) )
+                           ssha(ji,jj) = rn_wdmin1 - (ht_0(ji,jj) )
+                        ENDIF
+                     ENDDO
+                  ENDDO
+               ENDIF !If wad elseif ln_wd or ln_rwd
+
+               ! Adjust vertical metrics for all wad
                DO jk = 1, jpk
-                  e3t_n(:,:,jk) =  e3t_0(:,:,jk) * ( ht_0(:,:) + sshn(:,:) ) &
-                    &                            / ( ht_0(:,:) + 1._wp - ssmask(:,:) ) * tmask(:,:,jk)   &
-                    &            + e3t_0(:,:,jk)                               * (1._wp -tmask(:,:,jk))
+                    e3t_n(:,:,jk) =  e3t_0(:,:,jk) * ( ht_0(:,:) - rn_ht_0 + sshn(:,:)  ) &
+                      &                            / ( ht_0(:,:) + 1._wp - ssmask(:,:) ) * tmask(:,:,jk)   &
+                      &            + e3t_0(:,:,jk)                               * (1._wp -tmask(:,:,jk))
                END DO
                e3t_b(:,:,:) = e3t_n(:,:,:)
-               !
-            ELSEIF( ln_wd ) THEN
-               !
-              DO jj = 1, jpj
-                DO ji = 1, jpi
-                  IF( e3t_0(ji,jj,1) <= 0.5_wp * rn_wdmin1 ) THEN
-                     ! potential bug
-                     ! Warning this assumes 2 layers only over wetting locations. needs investigating
-                     e3t_b(ji,jj,:) = 0.5_wp * rn_wdmin1
-                     e3t_n(ji,jj,:) = 0.5_wp * rn_wdmin1
-                     e3t_a(ji,jj,:) = 0.5_wp * rn_wdmin1
-                     sshb(ji,jj) = rn_wdmin1 - ht_wd(ji,jj)           !!gm I don't understand that !
-                     sshn(ji,jj) = rn_wdmin1 - ht_wd(ji,jj)
-                     ssha(ji,jj) = rn_wdmin1 - ht_wd(ji,jj)
-                  ENDIF
-                ENDDO
-              ENDDO
+
+               DO ji = 1, jpi
+                  DO jj = 1, jpj
+                     IF ( ht_0(ji,jj) .LE. 0.0 .AND. NINT(ssmask(ji,jj)) .EQ. 1) THEN
+                       CALL ctl_stop( 'dom_vvl_rst: ht_0 must be positive at potentially wet points' )
+                     ENDIF
+                  END DO 
+               END DO 
+ 
                !
             ELSE