Changeset 8870 for branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.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/DYN/wet_dry.F90 (modified) (8 diffs)

branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90

@@ -7 +7 @@
    !! Wetting and drying includes initialisation routine and routines to
    !! compute and apply flux limiters and preserve water depth positivity
-   !! only effects if wetting/drying is on (ln_wd == .true.)
+   !! only effects if wetting/drying is on (ln_wd_il == .true. or ln_wd_dl==.true. )
    !!==============================================================================
    !! History :  3.6  ! 2014-09  ((H.Liu)  Original code
@@ -38 +38 @@
    REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:) ::   wdramp, wdrampu, wdrampv ! for hpg limiting
 
-   LOGICAL,  PUBLIC  ::   ln_wd       !: Wetting/drying activation switch (T:on,F:off)
+   LOGICAL,  PUBLIC  ::   ln_wd_il    !: Wetting/drying il activation switch (T:on,F:off)
+   LOGICAL,  PUBLIC  ::   ln_wd_dl    !: Wetting/drying dl activation switch (T:on,F:off)
    REAL(wp), PUBLIC  ::   rn_wdmin0   !: depth at which wetting/drying starts
-   LOGICAL,  PUBLIC  ::   ln_rwd      !: ROMS Wetting/drying activation switch (T:on,F:off)
    REAL(wp), PUBLIC  ::   rn_wdmin1   !: minimum water depth on dried cells
    REAL(wp), PUBLIC  ::   rn_wdmin2   !: tolerance of minimum water depth on dried cells
@@ -46 +46 @@
                                            !: will be considered
    INTEGER , PUBLIC  ::   nn_wdit     !: maximum number of iteration for W/D limiter
-   LOGICAL,  PUBLIC  ::   ln_rwd_bc   !: ROMS scheme: True implies 3D velocities are set to the barotropic values at points 
+   LOGICAL,  PUBLIC  ::   ln_wd_dl_bc !: DL scheme: True implies 3D velocities are set to the barotropic values at points 
                                       !: where the flow is from wet points on less than half the barotropic sub-steps  
-   LOGICAL,  PUBLIC  ::   ln_rwd_rmp  !: use a ramp for the rwd flux limiter between 2 rn_wdmin1 and rn_wdmin1 (rather than a cut-off at rn_wdmin1)      
+   LOGICAL,  PUBLIC  ::   ln_wd_dl_rmp !: use a ramp for the dl flux limiter between 2 rn_wdmin1 and rn_wdmin1 (rather than a cut-off at rn_wdmin1)      
    REAL(wp), PUBLIC  ::   rn_ssh_ref  !: height of z=0 with respect to the geoid; 
    REAL(wp), PUBLIC  ::   rn_ht_0     !: the height at which ht_0 = 0   
 
-   LOGICAL,  PUBLIC  ::   ln_wd_diag  ! True implies wad diagnostic at chosen point are printed out
-   INTEGER , PUBLIC  ::   jn_wd_i, jn_wd_j, jn_wd_k   ! indices at which diagnostic outputs are generated 
 
    PUBLIC   wad_init                  ! initialisation routine called by step.F90
@@ -71 +69 @@
       !! ** input   : - namwad namelist
       !!----------------------------------------------------------------------
-      NAMELIST/namwad/ ln_wd, ln_rwd, rn_wdmin0, ln_rwd, rn_wdmin1, rn_wdmin2, rn_wdld, nn_wdit, ln_wd_diag, ln_rwd_bc, &
-                     &  rn_ht_0, jn_wd_i, jn_wd_j, jn_wd_k,ln_rwd_rmp
+      NAMELIST/namwad/ ln_wd_il, ln_wd_dl, rn_wdmin0, ln_wd_dl, rn_wdmin1, rn_wdmin2, rn_wdld, nn_wdit, ln_wd_dl_bc, &
+                     &  rn_ht_0,ln_wd_dl_rmp
 
       INTEGER  ::   ios                 ! Local integer output status for namelist read
@@ -93 +91 @@
          WRITE(numout,*) '~~~~~~~~'
          WRITE(numout,*) '   Namelist namwad'
-         WRITE(numout,*) '      Logical for NOC  wd scheme         ln_wd      = ', ln_wd
-         WRITE(numout,*) '      Logical for ROMS wd scheme         ln_rwd     = ', ln_rwd
+         WRITE(numout,*) '      Logical for Iter Lim wd option ln_wd_il       = ', ln_wd_il
+         WRITE(numout,*) '      Logical for Dir. Lim wd option ln_wd_dl       = ', ln_wd_dl
          WRITE(numout,*) '      Depth at which wet/drying starts rn_wdmin0    = ', rn_wdmin0
          WRITE(numout,*) '      Minimum wet depth on dried cells rn_wdmin1    = ', rn_wdmin1
@@ -100 +98 @@
          WRITE(numout,*) '      land elevation threshold         rn_wdld      = ', rn_wdld
          WRITE(numout,*) '      Max iteration for W/D limiter    nn_wdit      = ', nn_wdit
-         WRITE(numout,*) '      Logical for WAD diagnostics      ln_wd_diag   = ', ln_wd_diag
-         WRITE(numout,*) '      T => baroclinic u,v = 0 at dry pts: ln_rwd_bc = ', ln_rwd_bc     
-         WRITE(numout,*) '      use a ramp for rwd limiter:      ln_rwd_rmp   = ', ln_rwd_rmp
+         WRITE(numout,*) '      T => baroclinic u,v = 0 at dry pts: ln_wd_dl_bc = ', ln_wd_dl_bc     
+         WRITE(numout,*) '      use a ramp for rwd limiter:      ln_wd_dl_rwd_rmp   = ', ln_wd_dl_rmp
          WRITE(numout,*) '      the height (z) at which ht_0 = 0:rn_ht_0      = ', rn_ht_0  
-         WRITE(numout,*) '      i-index for diagnostic point     jn_wd_i      = ', jn_wd_i
-         WRITE(numout,*) '      j-index for diagnostic point     jn_wd_j      = ', jn_wd_j
-         WRITE(numout,*) '      k-index for diagnostic point     jn_wd_k      = ', jn_wd_k
       ENDIF
       !
-      IF(ln_wd .OR. ln_rwd) THEN
+      IF(ln_wd_il .OR. ln_wd_dl) THEN
          ALLOCATE( wdmask(jpi,jpj),   STAT=ierr )
          ALLOCATE( wdramp(jpi,jpj), wdrampu(jpi,jpj), wdrampv(jpi,jpj), STAT=ierr ) 
@@ -147 +141 @@
       IF( nn_timing == 1 )  CALL timing_start('wad_lmt')
 
-      IF(ln_wd) THEN
+      IF(ln_wd_il) THEN
 
         CALL wrk_alloc( jpi, jpj, zflxp, zflxn, zflxu, zflxv, zflxu1, zflxv1 )
@@ -333 +327 @@
       IF( nn_timing == 1 )  CALL timing_start('wad_lmt_bt')
 
-      IF(ln_wd) THEN
+      IF(ln_wd_il) THEN
 
         CALL wrk_alloc( jpi, jpj, zflxp, zflxn, zflxu1, zflxv1 )