Changeset 7547

Timestamp:

2017-01-11T14:42:32+01:00 (7 years ago)

Author:

acc

Message:

Branch dev_merge_2016. Added WAD documentation (temporary location) and tidied WAD_TEST_CASES module usrdef_nam.F90

Location:

branches/2016/dev_merge_2016/NEMOGCM/CONFIG/WAD_TEST_CASES

Files:

• EXP00/namelist_cfg (modified) (1 diff)
• MY_DOCS (added)
• MY_DOCS/Figures (added)
• MY_DOCS/Figures/Fig_WAD_TC1.pdf (added)
• MY_DOCS/Figures/Fig_WAD_TC2.pdf (added)
• MY_DOCS/Figures/Fig_WAD_TC3.pdf (added)
• MY_DOCS/Figures/Fig_WAD_TC4.pdf (added)
• MY_DOCS/Figures/Fig_WAD_TC5.pdf (added)
• MY_DOCS/Figures/Fig_WAD_TC6.pdf (added)
• MY_DOCS/Figures/Fig_WAD_dynhpg.pdf (added)
• MY_DOCS/Namelists (added)
• MY_DOCS/Namelists/nam_wad (added)
• MY_DOCS/Namelists/nam_wad_usr (added)
• MY_DOCS/Preamble.tex (added)
• MY_DOCS/WAD_doc.pdf (added)
• MY_DOCS/WAD_doc.tex (added)
• MY_SRC/usrdef_nam.F90 (modified) (2 diffs)

branches/2016/dev_merge_2016/NEMOGCM/CONFIG/WAD_TEST_CASES/EXP00/namelist_cfg

@@ -450 +450 @@
    ln_wd             = .true.   ! T/F activation of wetting and drying
    rn_wdmin1         =  0.35    ! Minimum wet depth on dried cells
-   rn_wdmin2         =   0.000  ! Tolerance of min wet depth on dried cells
+   rn_wdmin2         =  0.0001  ! Tolerance of min wet depth on dried cells
    rn_wdld           =  2.5     ! Land elevation below which wetting/drying is allowed
    nn_wdit           =  50      ! Max iterations for W/D limiter

branches/2016/dev_merge_2016/NEMOGCM/CONFIG/WAD_TEST_CASES/MY_SRC/usrdef_nam.F90

@@ -75 +75 @@
       kk_cfg = nn_wad_test
       !
-      ! Global Domain size:  WAD_TEST_CASES domain is 50 km x 34 grid-points x 10 m
+      ! Global Domain size:  WAD_TEST_CASES domain is 52 km x 34 km x 10 m
       kpi = INT(  50.e3 / rn_dx ) + 2
-      kpj = 34
+      kpj = INT(  32.e3 / rn_dx ) + 2
       kpk = INT(  10.  / rn_dz ) + 1
       !
@@ -87 +87 @@
       WRITE(ldtxt(ii),*) '      horizontal resolution                    rn_dx  = ', rn_dx, ' meters'   ;   ii = ii + 1
       WRITE(ldtxt(ii),*) '      vertical   resolution                    rn_dz  = ', rn_dz, ' meters'   ;   ii = ii + 1
-      WRITE(ldtxt(ii),*) '      WAD_TEST_CASES domain = 64 km  x  3 grid-points  x  20 m'                ;   ii = ii + 1
+      WRITE(ldtxt(ii),*) '      WAD_TEST_CASES domain = 52 km  x  34 km x 10 m'                ;   ii = ii + 1
       WRITE(ldtxt(ii),*) '         resulting global domain size :        jpiglo = ', kpi                ;   ii = ii + 1
       WRITE(ldtxt(ii),*) '                                               jpjglo = ', kpj                ;   ii = ii + 1