Changeset 6838 for branches/UKMO/dev_r5518_convadj

Timestamp:

2016-08-03T14:24:59+02:00 (8 years ago)

Author:

timgraham

Message:

Correction to variable name and modified namelist_ref

Location:

branches/UKMO/dev_r5518_convadj/NEMOGCM

Files:

• CONFIG/SHARED/namelist_ref (modified) (2 diffs)
• NEMO/OPA_SRC/ZDF/zdfconvadj.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_convadj/NEMOGCM/CONFIG/SHARED/namelist_ref

@@ -904 +904 @@
 !!    namzdf_ddm    double diffusive mixing parameterization            ("key_zdfddm")
 !!    namzdf_tmx    tidal mixing parameterization                       ("key_zdftmx")
+!!    namzdf_convadj  convective adjustment (cliff)                     
 !!======================================================================
 !
@@ -1009 +1010 @@
    ln_tmx_itf  = .true.    !  ITF specific parameterisation
    rn_tfe_itf  = 1.        !  ITF tidal dissipation efficiency
+/
+
+!-----------------------------------------------------------------------
+&namzdf_convadj    !   Convective adjustment (cliff) parameterization   
+!-----------------------------------------------------------------------
+  ln_convadj      = .false.        ! Use convective adjustment or not
+  cn_convadj_mask = 'convadj.nc'   ! Name of mask file defining grid points where scheme should be used
+  nn_con          = 5              ! Number of iterations at each timestep
 /
 

branches/UKMO/dev_r5518_convadj/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfconvadj.F90

@@ -28 +28 @@
    INTEGER nn_con                      ! Number of times to convect
    CHARACTER(300) cn_convadj_mask      ! NetCDF mask file indicating points
-   LOGICAL , PUBLIC ::   ln_zdfconvadj ! convadj flag - used in step and tra_ldfiso
+   LOGICAL , PUBLIC ::   ln_convadj ! convadj flag - used in step and tra_ldfiso
    
    REAL(wp) , PUBLIC, SAVE, ALLOCATABLE, DIMENSION(:,:) :: convadj_mask !: mask of points where adjustment applied