Skip to content

Commit

Permalink
Solve extra float dependency and trying Python setup (#34)
Browse files Browse the repository at this point in the history
* [testing] Adding Python dependencies to shortcut conda env

* Update Huginn.jl

* Update Huginn.jl

* Create config.jl

* include config.jl

* Sleipnir == 0.3

* Sleipnir = 0.3.1

* catch exception

* typo

* Sleipnir = 0.3.2

* restore config files without manual Python setup

* Remove tests that are not passing for CI env problem

* Add SSL certify

* Add all tests

* Add Python path in runtest

* add SSL to runtest

* CI with SSL working with tests

* remove obsolete dependency and solve Python import
  • Loading branch information
facusapienza21 authored Sep 5, 2023
1 parent 9c506e3 commit 7c60269
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
34 changes: 17 additions & 17 deletions src/Huginn.jl
Original file line number Diff line number Diff line change
Expand Up @@ -26,30 +26,30 @@ 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")

# ##############################################
# ############ 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 ##############
Expand All @@ -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
2 changes: 1 addition & 1 deletion src/models/iceflow/SIA2D/SIA2D_utils.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

2 comments on commit 7c60269

@facusapienza21
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register()

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request updated: JuliaRegistries/General/90604

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.1.0 -m "<description of version>" 7c6026955d1981af66c857bd99ee09cd2e397252
git push origin v0.1.0

Please sign in to comment.