Update defaults

docs/udales-namoptions-overview.md

@@ -14,17 +14,19 @@ This list refers to the original code-base [DALES](https://github.com/dalesteam/
 | lwarmstart | .false. | .true. or .false. | If .true. simulation reads in restart file to initialize fields.  | - |
 | startfile | '' | 'initd00001234_xxx_xxx.000'| Name of restart file, the last three digits should match iexpnr. | - |
 | runtime | 300 | > 0 | Simulation time. | [s] |
-| dtmax | 20 | > 0 | Maximum allowed numerical integration timestep. | [s] |
 | trestart | 10000. | 0 < trestart < runtime | Time at which restart files are written, trestart > runtime will prevent restart files being written.  | [s] |
+| dtmax | 20 | > 0 | Maximum allowed numerical integration timestep. | [s] |
 | ladaptive | .false. | .true. or .false. | Switch for adaptive time-stepping, .true. recommended. | - |
-| irandom | 0 | `INTEGER` > 0 | Seed for random number generation. | - |
-| randu | 0.0 |`REAL` > 0 | Amplitude of velocity field randomisation. | [m/s] |
-| randthl | 0.0 | `REAL` > 0 | Amplitude of temperature field randomisation. | [K] |
-| randq | 0.0 | `REAL` > 0 | Amplitude of moisture field randomisation. | [kg/kg] |
 | courant | 1.1 | 1 <= courant <=2 | Courant number, default sets it to 1.5 or 1.1 (if Kappa or upwind scheme is used). | - |
+| lrandomize | .true. | .true. or .false. | Switch that determines whether initial field is randomised.| - | 
+| irandom | 43 | `INTEGER` > 0 | Seed for random number generation. | - |
+| randu | 0.01 |`REAL` > 0 | Amplitude of velocity field randomisation. | [m/s] |
+<!---
+| randthl | 0.0 | `REAL` > 0 | Amplitude of temperature field randomisation. | [K] |
+| randqt | 0.0 | `REAL` > 0 | Amplitude of moisture field randomisation. | [kg/kg] |
+--->
 | libm | .true. | .true. or .false. | Switch that determines whether the Immersed Boundary Method is turned on. | - |
 | lles | .true. | .true. or .false. | Switch that determines whether the subgrid model is turned on or constant ekm and ekh are used (DNS). | - |
-| lrandomize | .true. | .true. or .false. | Switch that determines whether initial field is randomised.| - | 
 | nprocx | -  | `INTEGER` > 0 | Number of pencils in the x-direction (see 2decomp documentation [https://2decomp-fft.github.io/]), must be a divisor of itot. | - |
 | nprocy | -  | `INTEGER` > 0 | Number of pencils in the y-direction (see 2decomp documentation [https://2decomp-fft.github.io/]), must be a divisor of jtot and ktot. | - |
 
@@ -45,8 +47,8 @@ This list refers to the original code-base [DALES](https://github.com/dalesteam/
 
 | Name | Default | Possible values | Description | Unit |
 | ---- | ------- | --------------- | ----------- | ---- |
-| ps | -1 | `REAL` > 0 | Air pressure at surface, recommend using standard pressure.| [Pa] |
-| igrw_damp | 0 | 0, 1. | Switch to enable gravity wave damping.| - |
+| ps | 101325 | `REAL` > 0 | Air pressure at surface, recommend using standard pressure.| [Pa] |
+| igrw_damp | 0 | 0, 1, 2, 3 | Integer switch to enable gravity wave damping.| - |
 | ltempeq | .false. | .true. or .false. | Switch for solving temperature equation. | - |
 | lbuoyancy | .false. | .true. or .false. | Switch for buoyancy force in temperature equation. | - |
 | lmoist | .false. | .true. or .false. | Switch for solving moisture equation. | - |
@@ -93,7 +95,7 @@ Possible advection schemes:
 | Name | Default | Possible values | Description | Unit |
 | ---- | ------- | --------------- | ----------- | ---- |
 | lqlnr | .false. | .true. or .false. | Logical for calculation of liquid water concentration. | - |
-| ipoiss | 0 | 0 | Poisson solver. 0 = Fast Fourier Transform. | - |
+| ipoiss | 0 | 0 | Poisson solver. 0 = using 2D Fast Fourier Transform. | - |
 | iadv_mom | 2 | 2 | Advection scheme for momentum. | - |
 | iadv_tke | 2 | 2 | Advection scheme for TKE. Only used if `loneeqn = True`. | - |
 | iadv_thl | 2 | 2 | Advection scheme for temperature. | - |
@@ -156,7 +158,7 @@ BCs at the bottom (BCbot; only effective if not covered with ground facets): 1 =
 
 | Name | Default | Possible values | Description | Unit |
 | ---- | ------- | --------------- | ----------- | ---- |
-| lvreman | .false. | .true. or .false. | Switch for Vreman (2004) sub-grid scheme. | - |
+| lvreman | .true. | .true. or .false. | Switch for Vreman (2004) sub-grid scheme. | - |
 <!-- | c_vreman | 0.07 | `REAL` | Model constant for Vreman scheme. | - | --->
 <!---
 | lbuoycorr | .false. | .true. or .false. | Switch for buoyancy correlation in the Vreman scheme. | - |

src/modglobal.f90

@@ -367,7 +367,7 @@ module modglobal
                          POISS_FFT3D = 2, &
                          POISS_FFT2D_2DECOMP = 3
 
-   integer :: ipoiss   = POISS_CYC
+   integer :: ipoiss   = POISS_FFT2D
 
    !Advection scheme
    integer, parameter :: iadv_upw = 1  !< first order upwind scheme

src/modstartup.f90

@@ -39,9 +39,9 @@ module modstartup
    ! public :: startup,trestart
    save
 
-   integer(KIND=selected_int_kind(6)) :: irandom = 0 !    * number to seed the randomnizer with
+   integer(KIND=selected_int_kind(6)) :: irandom = 43 !    * number to seed the randomnizer with
    integer :: krand = huge(0)  ! returns the largest integer that is not an infinity
-   real :: randu = 0.0, randthl = 0.0, randqt = 0.0 !    * uvw,thl and qt amplitude of randomnization
+   real :: randu = 0.01, randthl = 0.0, randqt = 0.0 !    * uvw,thl and qt amplitude of randomnization
 
    contains
 

src/modsubgrid.f90

@@ -82,7 +82,7 @@ subroutine initsubgrid
   end subroutine initsubgrid
 
   subroutine subgridnamelist
-    use modglobal, only : pi,ifnamopt,fname_options,lles
+    use modglobal, only : pi,ifnamopt,fname_options,lles,lbuoyancy
     use modmpi,    only : myid, nprocs, comm3d, mpierr, my_real, mpi_logical, mpi_integer
 
     implicit none
@@ -123,6 +123,8 @@ subroutine subgridnamelist
        lles =.true.
     endif
 
+    if (lbuoyancy) lbuoycorr = .true.
+
 
   end subroutine subgridnamelist
 
@@ -334,8 +336,8 @@ subroutine closure
              end do
            end do
          end do
-         ekm(:,:,:) = ekm(:,:,:) + numol                             ! add molecular viscosity
-         ekh(:,:,:) = ekh(:,:,:) + numol*prandtlmoli                 ! add molecular diffusivity
+        !  ekm(:,:,:) = ekm(:,:,:) + numol                             ! add molecular viscosity
+        !  ekh(:,:,:) = ekh(:,:,:) + numol*prandtlmoli                 ! add molecular diffusivity
 
        else  ! neutral case
 

src/modsubgriddata.f90

@@ -37,7 +37,7 @@ module modsubgriddata
   logical :: ldelta       = .false. !<  switch for subgrid length formulation (on/off)
   logical :: lmason       = .false. !<  switch for decreased length scale near the surface
   logical :: lsmagorinsky = .false. !<  switch for smagorinsky subgrid scheme
-  logical :: lvreman      = .false. !<  switch for Vreman (2004) subgrid scheme
+  logical :: lvreman      = .true. !<  switch for Vreman (2004) subgrid scheme
   logical :: lbuoycorr    = .false. !<  switch for buoyancy correction in Vreman (2004) subgrid scheme
   logical :: loneeqn      = .false. !<  switch for one-eqn subgrid scheme
   real :: cf      = 2.5  !< filter constant

src/modsurfdata.f90

@@ -38,7 +38,7 @@ module modsurfdata
   ! Surface properties
   real, allocatable :: tskin      (:,:) !<  Skin temperature [K]
   real, allocatable :: qskin      (:,:) !<  Skin specific humidity [kg/kg]
-  real              :: ps       = -1    !<  Surface pressure [Pa]
+  real              :: ps       = 101325    !<  Surface pressure [Pa]
 
   ! Surface energy balance
   logical           :: lmostlocal  = .false.  !<  Switch to apply MOST locally to get local Obukhov length