Changeset 4355

Timestamp:

2014-01-17T18:55:02+01:00 (10 years ago)

Author:

hliu

Message:

update Wetting/drying branch. Will keep commit in the next a few days.

Location:

branches/2013/dev_r4050_NOC_WaD/NEMOGCM/NEMO/OPA_SRC

Files:

• DOM/dom_oce.F90 (modified) (1 diff)
• DOM/domain.F90 (modified) (2 diffs)
• DYN/wadlmt.F90 (added)
• oce.F90 (modified) (2 diffs)
• step.F90 (modified) (1 diff)
• step_oce.F90 (modified) (1 diff)

branches/2013/dev_r4050_NOC_WaD/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90

@@ -54 +54 @@
    REAL(wp), PUBLIC ::   rdtmax          !: maximum time step on tracers
    REAL(wp), PUBLIC ::   rdth            !: depth variation of tracer step
+
+
+   LOGICAL,  PUBLIC ::   ln_wad     =  .FALSE.  !: turn on wetting/drying (T: on, F: off)
+   REAL(wp), PUBLIC ::   rn_wadmin  = 0.10_wp   !: minimum water depth on dried cells
+   REAL(wp), PUBLIC ::   rn_wadmine = 0.01_wp   !: tolerrance of minimum water depth on dried cells
+   REAL(wp), PUBLIC ::   rn_landele = 20.0_wp   !: land elevation below which wetting/drying will be considered
 
    !                                                  !!! associated variables

branches/2013/dev_r4050_NOC_WaD/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

@@ -81 +81 @@
       !
                              CALL dom_nam      ! read namelist ( namrun, namdom, namcla )
+                             CALL dom_wad      ! read namelist ( namwad ), wetting/drying
                              CALL dom_clo      ! Closed seas and lake
                              CALL dom_hgr      ! Horizontal mesh
@@ -269 +270 @@
       !
    END SUBROUTINE dom_nam
+
+   SUBROUTINE dom_wad
+      !!----------------------------------------------------------------------
+      !!                     ***  ROUTINE dom_wad  ***
+      !!                    
+      !! ** Purpose :   read wetting/drying namelists and print the variables.
+      !!
+      !! ** input   : - namwad namelist
+      !!----------------------------------------------------------------------
+      USE ioipsl
+      NAMELIST/namwad/ ln_wad , rn_wadmin, rn_wadmine, rn_landele
+      !!----------------------------------------------------------------------
+
+      REWIND( numnam )              ! Namelist namrun : parameters of the run
+      READ  ( numnam, namwad )
+      !
+      IF(lwp) THEN                  ! control print
+         WRITE(numout,*)
+         WRITE(numout,*) 'dom_wad  : set up wetting/drying '
+         WRITE(numout,*) '~~~~~~~ '
+         WRITE(numout,*) '   Namelist namwad'
+         WRITE(numout,*) '      turn on(off) wetting/drying     ln_wad        = ', ln_wad
+         WRITE(numout,*) '      minimal dry cell depth          rn_ wadmin    = ', rn_wadmin 
+         WRITE(numout,*) '      tollerance of minimual depth    rn_wadmine    = ', rn_wadmine
+         WRITE(numout,*) ' threshold elevation for land masking rn_landele    = ', rn_landele
+      ENDIF
+
+   END SUBROUTINE dom_wad
 
 

branches/2013/dev_r4050_NOC_WaD/NEMOGCM/NEMO/OPA_SRC/oce.F90

@@ -55 +55 @@
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   snwice_fmass       !: time evolution of mass of snow+ice               [Kg/m2/s]
 
+
    !!----------------------------------------------------------------------
    !! NEMO/OPA 4.0 , NEMO Consortium (2011)
@@ -66 +67 @@
       !!                   ***  FUNCTION oce_alloc  ***
       !!----------------------------------------------------------------------
-      INTEGER :: ierr(3)
+      INTEGER :: ierr(4)
       !!----------------------------------------------------------------------
       !

branches/2013/dev_r4050_NOC_WaD/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -87 +87 @@
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+      !  Ocean dynamics : Wetting/Drying Limiter
+      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+                         CALL wad_lmt( kstp )         ! wetting/drying limiter
+
+      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
       ! Update data, open boundaries, surface boundary condition (including sea-ice)
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

branches/2013/dev_r4050_NOC_WaD/NEMOGCM/NEMO/OPA_SRC/step_oce.F90

@@ -116 +116 @@
    USE trcstp           ! passive tracer time-stepping      (trc_stp routine)
 #endif
+   USE wadlmt           ! wetting/drying limiter            (wad_lmt routine)
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)