Changeset 5066 for branches/UKMO/2014_Surge_Modelling/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

2015-02-06T17:02:20+01:00 (9 years ago)

Author:

rfurner

Message:

added current state of wetting and drying code to test...note it does not work

File:

• branches/UKMO/2014_Surge_Modelling/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (5 diffs)

branches/UKMO/2014_Surge_Modelling/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -30 +30 @@
    !!            3.4  ! 2011-11  (C. Harris) decomposition changes for running with CICE
    !!                 ! 2012-05  (C. Calone, J. Simeon, G. Madec, C. Ethe) Add grid coarsening 
+   !!            3.6.?! 2014-09  (H. Liu) Add Wetting and Drying 
    !!----------------------------------------------------------------------
 
@@ -233 +234 @@
       NAMELIST/namcfg/ cp_cfg, cp_cfz, jp_cfg, jpidta, jpjdta, jpkdta, jpiglo, jpjglo, &
          &             jpizoom, jpjzoom, jperio
+      NAMELIST/namwad/ ln_wd, rn_wdmin1, rn_wdmin2, rn_wdld, nn_wdit
       !!----------------------------------------------------------------------
       !
@@ -257 +259 @@
       READ  ( numnam_cfg, namcfg, IOSTAT = ios, ERR = 904 )
 904   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcfg in configuration namelist', .TRUE. )   
+
+      REWIND( numnam_ref )              ! Namelist namwad in reference namelist : Parameters for Wetting/Drying
+      READ  ( numnam_ref, namwad, IOSTAT = ios, ERR = 905)
+905   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namwad in reference namelist', lwp )
+
+      REWIND( numnam_cfg )              ! Namelist namwad in configuration namelist : Parameters for Wetting/Drying
+      READ  ( numnam_cfg, namwad, IOSTAT = ios, ERR = 906)
+906   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namwad in configuration namelist', lwp )
 
 ! Force values for AGRIF zoom (cf. agrif_user.F90)
@@ -311 +321 @@
          WRITE( numond, namctl )
          WRITE( numond, namcfg )
+         WRITE( numond, namwad )
       ENDIF
 
@@ -527 +538 @@
          WRITE(numout,*) '      lateral cond. type (between 0 and 6) jperio = ', jperio   
       ENDIF
+
+      IF(lwp) THEN                  ! control print
+         WRITE(numout,*)
+         WRITE(numout,*) 'namwad  : wetting and drying initialisation through namelist read'
+         WRITE(numout,*) '~~~~~~~ '
+         WRITE(numout,*) '   Namelist namwad'
+         WRITE(numout,*) '   key to turn on/off wetting/drying              ln_wd      = ', ln_wd
+         WRITE(numout,*) '   minimum water depth on dried cells             rn_wdmin1  = ', rn_wdmin1
+         WRITE(numout,*) '   tolerrance of min water depth on dried cells   rn_wdmin2  = ', rn_wdmin2
+         WRITE(numout,*) '   land elevation below which wad considered      rn_wdld    = ', rn_wdld
+         WRITE(numout,*) '   maximum number of iteration for W/D limiter    nn_wdit    = ', nn_wdit
+      ENDIF 
+
       !                             ! Parameter control
       !