Skip to content

Commit b72b4ae

Browse files
committed
more spatial things
1 parent 04f333b commit b72b4ae

11 files changed

Lines changed: 2150 additions & 409 deletions

Project.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
name = "Microclimate"
22
uuid = "fa5d2a79-de00-40ba-a9f4-ff140fbe07ba"
3-
authors = ["m.kearney@unimelb.edu.au", "rafaelschouten@gmail.com"]
43
version = "0.1.0"
4+
authors = ["m.kearney@unimelb.edu.au", "rafaelschouten@gmail.com"]
55

66
[deps]
77
ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
88
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
9-
Geomorphometry = "714e3e49-7933-471a-9334-4a6a65a92f36"
10-
Stencils = "264155e8-78a8-466a-aa59-c9b28c34d21a"
119
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
1210
DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
1311
FluidProperties = "d16f1b92-71d3-42f3-aafa-43e5bb0efda8"
12+
Geomorphometry = "714e3e49-7933-471a-9334-4a6a65a92f36"
1413
Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
14+
KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
1515
ModelParameters = "4744a3fa-6c31-4707-899e-a3298e4618ad"
1616
OrdinaryDiffEqTsit5 = "b1df2697-797e-41e3-8120-5422d3b24e4a"
1717
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
1818
SolarRadiation = "d01e3663-6acb-4162-92ee-c50acb918cac"
1919
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
2020
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
2121
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
22+
Stencils = "264155e8-78a8-466a-aa59-c9b28c34d21a"
2223
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
2324
UnitfulMoles = "999f2bd7-36bf-5ba7-9bc1-c9473aa75374"
2425

@@ -44,6 +45,7 @@ Dates = "1"
4445
DelimitedFiles = "1"
4546
FluidProperties = "0.1"
4647
Interpolations = "0.15.1"
48+
KernelAbstractions = "0.9.40"
4749
Makie = "0.20, 0.21, 0.22, 0.23, 0.24"
4850
ModelParameters = "0.4"
4951
OrdinaryDiffEqTsit5 = "1.5"

src/Microclimate.jl

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,30 @@ export example_micro_terrain, example_monthly_weather, example_daily_environment
3636
# TODO replace this with CommonSolve.jl
3737
export solve
3838

39-
export cold_air_pooling, ColdAirPoolingMethod, ColdAirFlow
40-
export ColdAirCouplingMethod, ExponentialMixingCoupling, LinearCoolingCoupling, apply_cold_air_coupling!
39+
export ColdAirCouplingMethod, KLAM21Coupling, apply_cold_air_coupling!
4140
export surface_water_flow, surface_water_event, SurfaceWaterMethod, SurfaceWaterFlow
4241
export InfiltrationMethod, SimpleInfiltration, apply_infiltration!, apply_evaporation!, check_saturation!
4342

4443
# Spatial simulation
4544
export SpatialMicroState, SpatialMicroTerrain, SpatialMicroProblem
46-
export surface_temperature, surface_moisture
45+
export SpatialEnvironment, SpatialWeather, LandSurface, SpatialSoilProperties
46+
export vapor_pressure, regional_wind, cell_value
47+
export ColdAirModel, KLAM21, KLAM21State, cold_air_step!
48+
export MacleanColdAirDrainage, MacleanColdAirState
49+
# Cold air drainage components (composable)
50+
export DrainageConditions, AlwaysDraining, KlokOerlemansConditions, SimpleWindConditions
51+
export LapseRateMethod, FixedLapseRate, HessLapseRate, lapse_rate
52+
export TemperatureProfile, ParabolicProfile, LinearProfile, temperature_disturbance
53+
export FlowWeighting, LogFlowWeighting, LinearFlowWeighting, NoFlowWeighting, flow_weight
54+
export sky_emissivity, mixing_ratio, normalize_flow_by_basin, basin_max_elevation
55+
export surface_temperature, surface_moisture, cold_air_depth
4756

4857
include("constants.jl")
58+
include("spatial/terrain.jl")
59+
include("spatial/environment.jl")
60+
include("spatial/state.jl")
4961
include("spatial/cold_air.jl")
5062
include("spatial/surface_water.jl")
51-
include("spatial/state.jl")
52-
include("spatial/terrain.jl")
5363
include("spatial/solve.jl")
5464
include("landscape.jl")
5565
include("interpolation.jl")

0 commit comments

Comments
 (0)