diff --git a/mapies/grids/monarch.py b/mapies/grids/monarch.py index 1e8b52d62b70d0116ba4014d4d98512712872c14..7f16556805de89c19ba25e3c8854072afa7e470a 100644 --- a/mapies/grids/monarch.py +++ b/mapies/grids/monarch.py @@ -10,13 +10,10 @@ from functools import partial, wraps import geopandas as gpd from geopandas import GeoDataFrame from shapely.geometry import Polygon, Point -from util.func_tools import * +from mapies.util.func_tools import * import logging -#from nes import * -# Grid without using NES - @dataclass class Grid: diff --git a/mapies/mapies.py b/mapies/mapies.py index d8b64edfdcdd37ce056ce45ca2a623f6fe83c808..ce32fbf8f8751678ade6fba6109758d8031ad426 100644 --- a/mapies/mapies.py +++ b/mapies/mapies.py @@ -4,7 +4,7 @@ from functools import wraps from datetime import datetime, timedelta import sys -from util.func_tools import timeit, time_domain_selection, frequency_int, error_estimation +from mapies.util.func_tools import timeit, time_domain_selection, frequency_int, error_estimation import time import logging import numpy as np diff --git a/mapies/tropomi.py b/mapies/tropomi.py index 888a13968574e1b19c54c558ace3f597811b1561..aaf5cdc6f20a01102f05d5525dce958bf056111e 100644 --- a/mapies/tropomi.py +++ b/mapies/tropomi.py @@ -6,8 +6,8 @@ from datetime import datetime, timedelta from functools import wraps -from mapies import MAPIES -from util.func_tools import timeit, get_file_list, time_converter, inflate_array +from mapies.mapies import MAPIES +from mapies.util.func_tools import timeit, get_file_list, time_converter, inflate_array import time import numpy as np import pandas as pd diff --git a/mapies/viirs.py b/mapies/viirs.py index 090c2a75a90beebfc54fc011e10714a1401ac1ea..7c931cc66ee9209a2ab35f119177054a5c87b7d7 100644 --- a/mapies/viirs.py +++ b/mapies/viirs.py @@ -11,15 +11,14 @@ import numpy as np import pandas as pd import xarray as xr -from mapies import MAPIES -from util.func_tools import * +from mapies.mapies import MAPIES +from mapies.util.func_tools import * #timeit, get_file_list, time_converter, frequency_int, error_estimation, time_domain_selection, geo_to_rot -from grids.monarch import RotatedGrid +from mapies.grids.monarch import RotatedGrid from pathlib import Path - # TODO: still need to do a load of filtering huuuhhh # TODO: Create Yaml config file for time, lat, lon, uncertainty const etc. diff --git a/requirements.txt b/requirements.txt index e7a51743af9c33c0ece7565f121c396b6cf9b15b..7ad86ce9792e90cbe8f6cd592a4a2859a98203b2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +./ attrs==24.2.0 Cartopy==0.21.1 certifi==2024.8.30 diff --git a/run/run-nord3.sh b/run/run-nord3.sh deleted file mode 100644 index 2234324d9d6a4f15340f5ccf3987a7d0215b294f..0000000000000000000000000000000000000000 --- a/run/run-nord3.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -#SBATCH -A bsc32 -# -# -#SBATCH --cpus-per-task=1 -#16 -#SBATCH -n 1 -#SBATCH -t 0-01:00:00 -#SBATCH -J mapies -#SBATCH -e /esarchive/scratch/cmeikle/out-logs/mapies-%j.err -#SBATCH -o /esarchive/scratch/cmeikle/out-logs/mapies-%j.out -#BSUB -x - -export PYTHONPATH=../mapies - -module load xarray/0.19.0-foss-2019b-Python-3.7.4 -module load pandas/1.3.5-foss-2019b-Python-3.7.4 -module load geopandas/0.10.2-foss-2019b-Python-3.7.4 -module load dask/2022.2.0-foss-2019b-Python-3.7.4 -module load NES/1.1.3-nord3-v2-foss-2019b-Python-3.7.4 -module load Cartopy/0.20.3-foss-2019b-Python-3.7.4 -module load netcdf4-python/1.5.3-foss-2019b-Python-3.7.4 - - -python3 run_viirs.py \ No newline at end of file diff --git a/run/run_viirs.py b/run/run_viirs.py index 379cedbc416b213980fad5dfaf18e75cb4ce79e4..1743ac4f3e486c911ee913bcaebc17df1a9566cc 100644 --- a/run/run_viirs.py +++ b/run/run_viirs.py @@ -1,4 +1,4 @@ -from viirs import VIIRS +from mapies.viirs import VIIRS if __name__ == "__main__": diff --git a/setup.py b/setup.py index ec3ed241fd020636b4f6288d3ea18dae8b5c7f3a..e8e3567304f03cf6c6c39a88af791ceee23181f7 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ from setuptools import find_packages from setuptools import setup # Could update this using versioneer -version="0.0.3" +version="0.0.4" setup( name="mapies", @@ -20,5 +20,9 @@ setup( author="Calum Meikle", author_email="calum.meikle@bsc.es", packages=find_packages(), + # Include all YAML files inside the 'config' folder + package_data={"mapies": ["config/*.yaml"]}, + include_package_data=True, ) +