Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Solve some compatebility and propose nopybeach branch #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Solve some compatebility and propose nopybeach branch #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions JAT/Jarkus_Analysis_Toolbox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,12 +565,12 @@ def normalize_dimensions(self):
# Retrieve normalization type that should be applied from the configuration file
norm_type = self.config['user defined']['normalization']['type']
if norm_type == 'mean':
for i, col in dimensions.iteritems():
for i, col in dimensions.items():
# Get the mean cross-shore location per transect and subtract that from the values of the variable for each transect
normalized.loc[:, i] = col - col.mean()
elif norm_type == 'norm_year':
norm_year = self.config['user defined']['normalization'][' year']
for i, col in dimensions.iteritems():
for i, col in dimensions.items():
# Get norm value for the cross-shore location in the norm year and subtract that from the values of the variable for each transect
normalized.loc[:, i] = col - col[norm_year]

Expand Down
14 changes: 5 additions & 9 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,12 @@
url="https://github.com/christavanijzendoorn/JAT.git",
packages=setuptools.find_packages(),
install_requires=[
'numpy==1.17.2',
'pandas==0.25.1',
'netCDF4==1.4.1',
'scipy==1.3.1',
'numpy',
'pandas',
'netCDF4',
'scipy',
'matplotlib',
'cftime==1.0.3.4',
'joblib==0.13.2',
'pybeach',
'pyyaml==5.2',
'Pillow'],
'pyyaml',],
classifiers=[
"Programming Language :: Python :: 3",
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
Expand Down