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

Timestamp:

2017-12-01T10:48:12+01:00 (6 years ago)

Author:

deazer

Message:

Changed WAD option names to Iterative and Directional
Removed old Diagnostics
Updated Domain CFG to allow domain generation with ref height for wad cases
Cleaned up TEST_CASES/cfg.txt file (need to not include WAD2 etc)
TEST caaes run ok
SETTE runs OK
AMM15 5 level runs OK

File:

• branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) (4 diffs)

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

@@ -680 +680 @@
       !
       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( nn_timing == 1 )   CALL timing_start('dom_vvl_interpol')
       !
-      IF(ln_wd) THEN
+      IF(ln_wd_il) THEN
         zlnwd = 1.0_wp
       ELSE
@@ -877 +877 @@
             !
 
-! MJB ln_rwd edits start here - these are essential 
-
-            IF( (ln_wd .OR. ln_rwd)) THEN 
+! MJB ln_wd edits start here - these are essential 
+
+            IF( (ln_wd_il .OR. ln_wd_dl)) THEN 
 
               ! Wetting and drying test case
@@ -888 +888 @@
                   un   (:,:,:)   = ub  (:,:,:)
                   vn   (:,:,:)   = vb  (:,:,:)
-               ELSEIF( ln_wd .or. ln_rwd   ) THEN ! if not test case
+               ELSEIF( ln_wd_il .or. ln_wd_dl   ) THEN ! if not test case
                   sshn(:,:) = -rn_ssh_ref
                   sshb(:,:) = -rn_ssh_ref
@@ -902 +902 @@
                      ENDDO
                   ENDDO
-               ENDIF !If wad elseif ln_wd or ln_rwd
+               ENDIF !If wad elseif ln_wd_il or ln_wd_dl
 
                ! Adjust vertical metrics for all wad