diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 00000000..6461ac3b --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,21 @@ +FROM continuumio/miniconda3 + +# Set the working directory + +# WORKDIR /workspace + +# Install Python +RUN conda install python -y + +# Copy the project files +# COPY . . + +# Install the necessary packages + +# RUN pip install . + +# Clean up +RUN conda clean -afy + +# Set the default command +CMD ["bash"] diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..04ece7b0 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,7 @@ +{ + "name": "AEOLIS Development Container", + "build": { + "dockerfile": "Dockerfile", + "context": ".." + } +} diff --git a/CITATION.cff b/CITATION.cff index 958be39f..7f77b222 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -69,5 +69,5 @@ keywords: - sediment license: GPL-3.0 commit: 0adaedfc8015f18b3b551bed1dda38d630cd8c95 -version: 3.0.0.rc3 -date-released: '2023-10-18' +version: 3.0.1 +date-released: '2025-07-11' diff --git a/README.md b/README.md index fef06dae..f6d87982 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ Read our [Contribution Guidelines](CONTRIBUTING.md) to know how you can help to Please, cite this software as follows: -*de Vries, S., Hallin, C., van IJzendoorn, C., van Westen, B., Cohn, N., Strypsteen, G., Skaden, J., Agrawal, N., & Garcia Alvarez, M. (2023). AeoLiS (Version 3.0.0.rc2) [Computer software]. https://github.com/openearth/aeolis-python* +*de Vries, S., Hallin, C., van IJzendoorn, C., van Westen, B., Cohn, N., Strypsteen, G., Skaden, J., Agrawal, N., & Garcia Alvarez, M. (2023). AeoLiS (Version 3.0.1) [Computer software]. https://github.com/openearth/aeolis-python* ## Acknowlegdements diff --git a/aeolis/vegetation.py b/aeolis/vegetation.py index 809c6a86..f8afd0f0 100644 --- a/aeolis/vegetation.py +++ b/aeolis/vegetation.py @@ -28,23 +28,13 @@ import logging from scipy import ndimage, misc import numpy as np -import math -#import matplotlib.pyplot as plt from aeolis.wind import * import aeolis.rotation # package modules import aeolis.wind -#from aeolis.utils import * import numpy as np -from scipy.integrate import quad -from scipy.integrate import romberg -from scipy.optimize import root_scalar -from scipy.signal import convolve -from scipy.special import sici -from scipy.special import erfi -import matplotlib.pyplot as plt # initialize logger logger = logging.getLogger(__name__) diff --git a/aeolis/wind.py b/aeolis/wind.py index 0ea51ffc..43ad78a2 100644 --- a/aeolis/wind.py +++ b/aeolis/wind.py @@ -28,18 +28,9 @@ import numpy as np import logging -import operator -#import scipy.special -#import scipy.interpolate -from scipy import ndimage, misc -import matplotlib.pyplot as plt -from scipy.integrate import quad -from scipy.integrate import romberg + +from scipy import ndimage from scipy.optimize import root_scalar -from scipy.signal import convolve -from scipy.special import sici -from scipy.special import erfi -from scipy.interpolate import griddata # package modules diff --git a/pyproject.toml b/pyproject.toml index 8e7782e4..297f1c27 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ exclude = [ [project] name = "aeolis" -version = "3.0.0.rc3" +version = "3.0.1" authors = [ { name="Sierd de Vries", email="sierd.devries@tudelft.nl" }, ] @@ -31,7 +31,7 @@ dependencies = [ "bmi-python", "netCDF4", "scipy", - "numpy<1.24,>=1.18", + "numpy", "matplotlib", "numba", ]