adjust file struct of datatype

Author: kongdd

Diff for: src/DataType/DataType.jl

@@ -17,12 +17,27 @@ include("CanopyLayer.jl")
 include("Soil.jl")
 
 include("InterTempVars.jl")
-include("Radiation.jl")
 include("Met.jl")
 include("OUTPUT.jl")
-include("State.jl")
 
+@with_kw mutable struct Radiation
+  Rs_o_df::FT = 0.0
+  Rs_u_df::FT = 0.0
 
+  Rs_o_dir::FT = 0.0
+  Rs_u_dir::FT = 0.0
+
+  Rns_o_df::FT = 0.0
+  Rns_u_df::FT = 0.0
+  Rns_g_df::FT = 0.0
+
+  Rns_o_dir::FT = 0.0
+  Rns_u_dir::FT = 0.0
+  Rns_g_dir::FT = 0.0
+
+  Rs_df::FT = 0.0
+  Rs_dir::FT = 0.0
+end
 
 @with_kw mutable struct Cpools
   Ccd::NTuple{3,Cdouble} = nzero(3)
@@ -36,6 +51,20 @@ include("State.jl")
   Cp::NTuple{3,Cdouble} = nzero(3)
 end
 
+@with_kw mutable struct State{FT}
+  "Surface Temperature: [Ts0, Tsn, Tsm0, Tsn1, Tsn2]"
+  Ts::Vector{FT} = zeros(FT, 5)         # 4:8
+  Tsoil_prev::Vector{FT} = zeros(FT, 6) # 10:15
+  θ_prev::Vector{FT} = zeros(FT, 6)      # 22:27
+  ice_ratio::Vector{FT} = zeros(FT, 6)   # 28:33
+
+  Qhc_o::FT = 0.0
+  m_water::Layer2 = Layer2{FT}()     # [15, 18] + 1
+  m_snow::Layer3 = Layer3{FT}() # [16, 19, 20] + 1
+end
+
+export State
+
 # # current not used
 # @with_kw mutable struct TSoil
 #   T_ground::Cdouble = 0.0
@@ -69,14 +98,7 @@ function fill_res!(df::DataFrame, Res::T, k::Int) where {T<:TypeDF}
 end
 
 
-
-
-
-export 
-  Leaf, 
-  Soil, AbstractSoil, 
-  Met, Results, Cpools,
-  InterTempVars,
-  OutputET, Radiation
+export Leaf, Soil, AbstractSoil, 
+  Met, Results, Cpools, InterTempVars, OutputET, Radiation
 
 export FT, init_dbl

Diff for: src/DataType/InterTempVars.jl

@@ -40,41 +40,6 @@ InterTempLeafs(x0) = InterTempLeafs(; x0)
 #   end
 # end
 
-export SurfaceMass
-
-@with_kw mutable struct SurfaceMass{FT<:AbstractFloat}
-  ρ_snow::FT = 0.0
-  prcp_g::FT = 0.0
-
-  z_water::FT = 0.0
-  z_snow::FT = 0.0
-
-  perc_snow_o::FT = 0.0 # Xcs_o
-  perc_snow_u::FT = 0.0 # Xcs_u
-  perc_snow_g::FT = 0.0 # Xcs_g
-
-  perc_water_o::FT = 0.0 # Xcl_o
-  perc_water_u::FT = 0.0 # Xcl_u
-
-  area_snow_o::FT = 0.0 # Ac_snow_o
-  area_snow_u::FT = 0.0 # Ac_snow_u
-
-  pre_mass_water_o::FT = 0.0 # Wcl_o
-  pre_mass_water_u::FT = 0.0 # Wcl_u
-
-  mass_water_o::FT = 0.0 # Wcl_o
-  mass_water_u::FT = 0.0 # Wcl_u
-  mass_water_g::FT = 0.0 # Wcl_g
-
-  mass_snow_o::FT = 0.0 # Wcs_o
-  mass_snow_u::FT = 0.0 # Wcs_u
-  mass_snow_g::FT = 0.0 # Wcs_g
-
-  albedo_v_snow::FT = 0.0
-  albedo_n_snow::FT = 0.0
-end
-
-
 
 @with_kw mutable struct InterTempVars
   Tc_u::Vector{FT} = zeros(MAX_Loop)

Diff for: src/DataType/Met.jl

@@ -27,7 +27,6 @@ end
 # Met(Srad, LR, temp, rh, rain, wind) = 
 #   Met(; Srad, LR, temp, rh, rain, wind)
 
-
 """
 # Arguments
 - `Srad`: W m-2

Diff for: src/DataType/Radiation.jl

@@ -33,3 +33,21 @@ function init_state!(state::State, soil::AbstractSoil, Ta)
   state.ice_ratio .= soil.ice_ratio[1:6]
   return nothing
 end
+
+# function update_state!(state::State, var_n::Vector{Float64})
+#   Tsoil = state.Tsoil
+#   var_n[3+1] = Tsoil[1]       # Ts0, 3
+#   var_n[4+1] = Tsoil[2]       # Tsn, 4 
+#   var_n[5+1] = Tsoil[3]       # Tsm0, 5
+#   var_n[6+1] = Tsoil[4]       # Tsn1, 6
+#   var_n[7+1] = Tsoil[5]       # Tsn1, 7
+
+#   var_n[11+1] = state.Qhc_o   # Qhc_o, 11, sensible heat flux
+
+#   var_n[15+1] = state.m_water.o
+#   var_n[18+1] = state.m_water.u
+
+#   var_n[16+1] = state.m_snow.o
+#   var_n[19+1] = state.m_snow.u
+#   var_n[20+1] = state.m_snow.g
+# end

Diff for: src/DataType/State.jl

@@ -1,6 +1,4 @@
-function besp_main(d::DataFrame, lai::Vector, par::NamedTuple;
-  version="julia", debug=false, kw...)
-
+function besp_main(d::DataFrame, lai::Vector, par::NamedTuple; version="julia", debug=false, kw...)
   meteo = Met()
   mid_res = Results()
   mid_ET = OutputET()
@@ -30,23 +28,17 @@ function besp_main(d::DataFrame, lai::Vector, par::NamedTuple;
     state = zeros(41)
     state_n = zeros(41)
   end
+  Ta = d.tem[1]
+  Init_Soil_var_o(soil, state, Ta, param, par)
 
-  init = true
   for i = 1:n
     jday = d.day[i]
     hour = d.hour[i]
-
     _day = ceil(Int, i / 24)
     mod(_day, 50) == 0 && (hour == 1) && println("Day = $_day")
 
     _lai = lai[_day] * param[3] / par.clumping # re-calculate LAI & renew clump index
     fill_meteo!(meteo, d, i)
-
-    if init
-      Init_Soil_var_o(soil, state, meteo.temp, param, par)
-      init = false
-    end
-
     CosZs = s_coszs(jday, hour, par.lat, par.lon) # cos_solar zenith angle
 
     # /***** start simulation modules *****/

Diff for: src/DataType/SurfaceMass.jl

@@ -92,7 +92,6 @@ function snowpack_stage1_jl(Tair::Float64, prcp::Float64,
   m_snow.g = max(0.0, m_snow_pre.g + δ_zs * ρ_new) # [kg m-2]
 
   if δ_zs > 0
-    # 可能导致了ρ_snow的极低。
     ρ_snow[] = (ρ_snow[] * z_snow + ρ_new * δ_zs) / (z_snow + δ_zs) # 计算混合密度
   else
     ρ_snow[] = (ρ_snow[] - 250) * exp(-0.001 * kstep / 3600.0) + 250.0