Merge branch 'ruisdael_lsm' into ruisdael

dalesteam · Oct 16, 2020 · fa1a4b5 · fa1a4b5
2 parents 15a81a3 + 8230865
commit fa1a4b5
Show file tree

Hide file tree

Showing 12 changed files with 2,514 additions and 141 deletions.
diff --git a/data/van_genuchten_parameters.nc b/data/van_genuchten_parameters.nc
diff --git a/src/modgenstat.f90 b/src/modgenstat.f90
@@ -171,6 +171,7 @@ subroutine initgenstat
     cexpnr,dtav_glob,timeav_glob,dt_lim,btime,tres,lwarmstart,checknamelisterror
     use modstat_nc, only : lnetcdf, open_nc,define_nc,ncinfo,nctiminfo,writestat_dims_nc
     use modsurfdata, only : isurf,ksoilmax
+    use modlsm, only : kmax_soil
 
     implicit none
 
@@ -419,6 +420,8 @@ subroutine initgenstat
 
         if (isurf==1) then
           call open_nc(fname,  ncid,nrec,n3=kmax,ns=ksoilmax)
+        else if (isurf==11) then
+          call open_nc(fname,  ncid,nrec,n3=kmax,ns=kmax_soil)
         else
           call open_nc(fname,  ncid,nrec,n3=kmax)
         endif

diff --git a/src/modglobal.f90 b/src/modglobal.f90
@@ -98,6 +98,14 @@ module modglobal
       real,parameter :: epscloud = 1.e-5            !<    *limit for cloud calculation 0.01 g/kg
       real,parameter :: boltz    = 5.67e-8          !<    *Stefan-Boltzmann constant
 
+      ! Land-surface
+      real,parameter :: rho_solid_soil = 2700       !< Density of dry solid soil (kg m-3)
+      real,parameter :: rho_C_matrix   = 1.6e6      !< Volumetric soil heat capacity [J m-3 K-1]
+      real,parameter :: rho_C_water    = 4.18e6     !< Volumetric water heat capacity [J m-3 K-1]
+      real,parameter :: gamma_T_matrix = 3.4293695508945325 !< Heat conductivity soil [J s-1 m-1 K-1]
+      real,parameter :: gamma_T_water  = 0.57       !< Heat conductivity water [J s-1 m-1 K-1]
+
+
       logical :: lcoriol  = .true.  !<  switch for coriolis force
       logical :: lpressgrad = .true.  !<  switch for horizontal pressure gradient force