diff --git a/src/crop/almass.jl b/src/crop/almass.jl index dbc316b564b1d5725f45ceca38b1909ed6cb0966..fde9c9695e38a2829512cf2ab5032c4d264b0794 100644 --- a/src/crop/almass.jl +++ b/src/crop/almass.jl @@ -8,7 +8,7 @@ module ALMaSS using Persefone: - EventType, + Management, FarmPlot, Length, m, @@ -86,7 +86,7 @@ mutable struct CropState LAItotal::Float64 LAIgreen::Float64 #biomass::Float64 #XXX I need to figure out how to calculate this - events::Vector{EventType} + events::Vector{Management} end croptype(cs::CropState) = cs.croptype diff --git a/src/crop/cropmodels.jl b/src/crop/cropmodels.jl index 0a16bc5e6fa292e51b7717f8ac6ef7e59b52906e..f175b9f7530ad9e9f6e37b7ffbf6e5f00a99a5a9 100644 --- a/src/crop/cropmodels.jl +++ b/src/crop/cropmodels.jl @@ -62,7 +62,7 @@ function make_cropstate(model::SimulationModel, cropmodel::AbstractString) cs = ALMaSS.CropState( model.crops["natural grass"], phase, - 0.0, 0.0m, 0.0, 0.0, Vector{EventType}() + 0.0, 0.0m, 0.0, 0.0, Vector{Management}() ) elseif cropmodel == "simple" cs = SimpleCrop.CropState( diff --git a/test/crop_tests.jl b/test/crop_tests.jl index 7a097ce492e756a6ac7fb49d614e81ce89d0b02e..1cdbe4fc0454a25917fc713e80e5b2904e8d078b 100644 --- a/test/crop_tests.jl +++ b/test/crop_tests.jl @@ -22,7 +22,7 @@ end ct = Ps.ALMaSS.CropType("olive tree", missing, missing, missing, missing, missing, missing, missing) fp = FarmPlot(0, [(0,0)], - Ps.ALMaSS.CropState(ct, Ps.ALMaSS.janfirst, 0.0, 0.0m, 0.0, 0.0, Ps.EventType[])) + Ps.ALMaSS.CropState(ct, Ps.ALMaSS.janfirst, 0.0, 0.0m, 0.0, 0.0, Ps.Management[])) @test fp isa FarmPlot @test fp isa FarmPlot{Ps.ALMaSS.CropState} @test croptype(fp) isa Ps.ALMaSS.CropType diff --git a/test/nature_tests.jl b/test/nature_tests.jl index d38df481ab08df74e933f9b6c12b5fb9ff4fee8e..a5ef3f91df4d2c9dea80527dc129fda8615a9f09 100644 --- a/test/nature_tests.jl +++ b/test/nature_tests.jl @@ -47,7 +47,7 @@ end) # end eval @testset "Habitat macros" begin # set up the testing landscape model = inittestmodel() - model.landscape[6,6] = Pixel(Ps.agriculture, 1, [], []) + model.landscape[6,6] = Pixel(Ps.agriculture, 1, [], [], []) fp = Ps.FarmPlot( 1, [(6,6)], Ps.ALMaSS.CropState(