Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions aeolis/vegetation.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down
13 changes: 2 additions & 11 deletions aeolis/wind.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies = [
"bmi-python",
"netCDF4",
"scipy",
"numpy<1.24,>=1.18",
"numpy",
"matplotlib",
"numba",
]
Expand Down
Loading