Changeset 6986 for branches/2016/dev_r6393_NOC_WAD/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

Timestamp:

2016-10-04T17:46:55+02:00 (8 years ago)

Author:

acc

Message:

Branch dev_r6393_NOC_WAD. Introduced some WAD test cases, tidied and corrected WAD code

File:

• branches/2016/dev_r6393_NOC_WAD/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) (2 diffs)

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

@@ -874 +874 @@
             !
          ELSE                                   !* Initialize at "rest"
-            e3t_b(:,:,:) = e3t_0(:,:,:)
-            e3t_n(:,:,:) = e3t_0(:,:,:)
-            sshn(:,:) = 0.0_wp
-
-            IF( ln_wd ) THEN
+            !
+            IF( ln_wd .AND. ( cp_cfg == 'wad' ) ) THEN
+               !
+               CALL wad_istate                  ! WAD test configuration : start from 
+                                                ! uniform T-S fields and initial ssh slope
+               ! needs to be called here and in istate which is called later.
+               ! Adjust vertical metrics
+               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))
+               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
-                     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 
+                     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 - bathy(ji,jj)
                      sshn(ji,jj) = rn_wdmin1 - bathy(ji,jj)
@@ -891 +902 @@
                 ENDDO
               ENDDO
+               !
+            ELSE
+               !
+               e3t_b(:,:,:) = e3t_0(:,:,:)
+               e3t_n(:,:,:) = e3t_0(:,:,:)
+               sshn(:,:) = 0.0_wp
+               !
             END IF