diff --git a/src/Huginn.jl b/src/Huginn.jl index 98b8cfe..2faff92 100644 --- a/src/Huginn.jl +++ b/src/Huginn.jl @@ -26,7 +26,7 @@ using Reexport # ############ PARAMETERS ############### # ############################################## -# cd(@__DIR__) +cd(@__DIR__) const global root_dir::String = dirname(Base.current_project()) const global root_plots::String = joinpath(root_dir, "plots") @@ -34,22 +34,22 @@ const global root_plots::String = joinpath(root_dir, "plots") # ############ PYTHON LIBRARIES ############## # ############################################## -# const netCDF4::PyObject = PyNULL() -# const cfg::PyObject = PyNULL() -# const utils::PyObject = PyNULL() -# const workflow::PyObject = PyNULL() -# const tasks::PyObject = PyNULL() -# const global_tasks::PyObject = PyNULL() -# const graphics::PyObject = PyNULL() -# const bedtopo::PyObject = PyNULL() -# const millan22::PyObject = PyNULL() -# const MBsandbox::PyObject = PyNULL() -# const salem::PyObject = PyNULL() +const netCDF4::PyObject = PyNULL() +const cfg::PyObject = PyNULL() +const utils::PyObject = PyNULL() +const workflow::PyObject = PyNULL() +const tasks::PyObject = PyNULL() +const global_tasks::PyObject = PyNULL() +const graphics::PyObject = PyNULL() +const bedtopo::PyObject = PyNULL() +const millan22::PyObject = PyNULL() +const MBsandbox::PyObject = PyNULL() +const salem::PyObject = PyNULL() -# # Essential Python libraries -# const xr::PyObject = PyNULL() -# const rioxarray::PyObject = PyNULL() -# const pd::PyObject = PyNULL() +# Essential Python libraries +const xr::PyObject = PyNULL() +const rioxarray::PyObject = PyNULL() +const pd::PyObject = PyNULL() # ############################################## # ############ HUGINN LIBRARIES ############## @@ -64,4 +64,4 @@ include("models/iceflow/IceflowModel.jl") # Everything related to running forward simulations of ice flow include("simulations/predictions/Prediction.jl") -end # module +end # module \ No newline at end of file diff --git a/src/models/iceflow/SIA2D/SIA2D_utils.jl b/src/models/iceflow/SIA2D/SIA2D_utils.jl index 5da8900..c71f3f6 100644 --- a/src/models/iceflow/SIA2D/SIA2D_utils.jl +++ b/src/models/iceflow/SIA2D/SIA2D_utils.jl @@ -144,7 +144,7 @@ end Computes the average ice surface velocity for a given glacier evolution period based on the initial and final ice thickness states. """ -function avg_surface_V!(simulation::SIM) where {F <: AbstractFloat, SIM <: Simulation} +function avg_surface_V!(simulation::SIM) where {SIM <: Simulation} # TODO: Add more datapoints to better interpolate this ft = simulation.parameters.simulation.float_type iceflow_model = simulation.model.iceflow