Changeset 9023 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

Timestamp:

2017-12-13T18:08:50+01:00 (6 years ago)

Author:

timgraham

Message:

Merged METO_MERCATOR branch and resolved all conflicts in OPA_SRC

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) (4 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

@@ -672 +672 @@
       !
       INTEGER ::   ji, jj, jk                                       ! dummy loop indices
-      REAL(wp) ::  zlnwd                                            ! =1./0. when ln_wd = T/F
+      REAL(wp) ::  zlnwd                                            ! =1./0. when ln_wd_il = T/F
       !!----------------------------------------------------------------------
       !
       IF( ln_timing )   CALL timing_start('dom_vvl_interpol')
       !
-      IF(ln_wd) THEN
+      IF(ln_wd_il) THEN
         zlnwd = 1.0_wp
       ELSE
@@ -869 +869 @@
          ELSE                                   !* Initialize at "rest"
             !
-            IF( ln_wd .AND. ( cn_cfg == 'wad' ) ) 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( ll_wd ) THEN   ! MJB ll_wd edits start here - these are essential 
+               !
+               IF( cn_cfg == 'wad' ) 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  (:,:,:)
+               ELSE
+                  ! if not test case
+                  sshn(:,:) = -ssh_ref
+                  sshb(:,:) = -ssh_ref
+
+                  DO jj = 1, jpj
+                     DO ji = 1, jpi
+                        IF( ht_0(ji,jj)-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 test case else
+
+               ! Adjust vertical metrics for all wad
                DO jk = 1, jpk
-                  e3t_n(:,:,jk) =  e3t_0(:,:,jk) * ( ht_0(:,:) + sshn(:,:) ) &
+                  e3t_n(:,:,jk) =  e3t_0(:,:,jk) * ( ht_0(:,:) + sshn(:,:)  ) &
                     &                            / ( ht_0(:,:) + 1._wp - ssmask(:,:) ) * tmask(:,:,jk)   &
-                    &            + e3t_0(:,:,jk)                               * (1._wp -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
@@ -909 +919 @@
                sshn(:,:) = 0.0_wp
                !
-            END IF
+            END IF           ! end of ll_wd edits
 
             IF( ln_vvl_ztilde .OR. ln_vvl_layer) THEN
@@ -1022 +1032 @@
       !
 #if defined key_agrif
-      IF(.NOT.Agrif_Root() )   CALL ctl_stop( 'AGRIF not implemented with non-linear free surface' )
+      IF( (.NOT.Agrif_Root()).AND.(.NOT.ln_vvl_zstar) )CALL ctl_stop( 'AGRIF is implemented with zstar coordinate only' )
 #endif
       !