ladim 2.0.6__tar.gz → 2.0.8__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (45) hide show
  1. {ladim-2.0.6 → ladim-2.0.8}/PKG-INFO +1 -1
  2. {ladim-2.0.6 → ladim-2.0.8}/ladim/__init__.py +1 -1
  3. {ladim-2.0.6 → ladim-2.0.8}/ladim/config.py +1 -0
  4. {ladim-2.0.6 → ladim-2.0.8}/ladim/forcing.py +2 -0
  5. {ladim-2.0.6 → ladim-2.0.8}/ladim.egg-info/PKG-INFO +1 -1
  6. {ladim-2.0.6 → ladim-2.0.8}/tests/test_config.py +3 -1
  7. {ladim-2.0.6 → ladim-2.0.8}/LICENSE +0 -0
  8. {ladim-2.0.6 → ladim-2.0.8}/README.md +0 -0
  9. {ladim-2.0.6 → ladim-2.0.8}/ladim/__main__.py +0 -0
  10. {ladim-2.0.6 → ladim-2.0.8}/ladim/grid.py +0 -0
  11. {ladim-2.0.6 → ladim-2.0.8}/ladim/gridforce/ROMS.py +0 -0
  12. {ladim-2.0.6 → ladim-2.0.8}/ladim/gridforce/__init__.py +0 -0
  13. {ladim-2.0.6 → ladim-2.0.8}/ladim/gridforce/analytical.py +0 -0
  14. {ladim-2.0.6 → ladim-2.0.8}/ladim/gridforce/zROMS.py +0 -0
  15. {ladim-2.0.6 → ladim-2.0.8}/ladim/ibms/__init__.py +0 -0
  16. {ladim-2.0.6 → ladim-2.0.8}/ladim/ibms/light.py +0 -0
  17. {ladim-2.0.6 → ladim-2.0.8}/ladim/main.py +0 -0
  18. {ladim-2.0.6 → ladim-2.0.8}/ladim/model.py +0 -0
  19. {ladim-2.0.6 → ladim-2.0.8}/ladim/output.py +0 -0
  20. {ladim-2.0.6 → ladim-2.0.8}/ladim/plugins/__init__.py +0 -0
  21. {ladim-2.0.6 → ladim-2.0.8}/ladim/release.py +0 -0
  22. {ladim-2.0.6 → ladim-2.0.8}/ladim/sample.py +0 -0
  23. {ladim-2.0.6 → ladim-2.0.8}/ladim/solver.py +0 -0
  24. {ladim-2.0.6 → ladim-2.0.8}/ladim/state.py +0 -0
  25. {ladim-2.0.6 → ladim-2.0.8}/ladim/tracker.py +0 -0
  26. {ladim-2.0.6 → ladim-2.0.8}/ladim/utilities.py +0 -0
  27. {ladim-2.0.6 → ladim-2.0.8}/ladim.egg-info/SOURCES.txt +0 -0
  28. {ladim-2.0.6 → ladim-2.0.8}/ladim.egg-info/dependency_links.txt +0 -0
  29. {ladim-2.0.6 → ladim-2.0.8}/ladim.egg-info/entry_points.txt +0 -0
  30. {ladim-2.0.6 → ladim-2.0.8}/ladim.egg-info/requires.txt +0 -0
  31. {ladim-2.0.6 → ladim-2.0.8}/ladim.egg-info/top_level.txt +0 -0
  32. {ladim-2.0.6 → ladim-2.0.8}/postladim/__init__.py +0 -0
  33. {ladim-2.0.6 → ladim-2.0.8}/postladim/cellcount.py +0 -0
  34. {ladim-2.0.6 → ladim-2.0.8}/postladim/kde_plot.py +0 -0
  35. {ladim-2.0.6 → ladim-2.0.8}/postladim/particlefile.py +0 -0
  36. {ladim-2.0.6 → ladim-2.0.8}/postladim/variable.py +0 -0
  37. {ladim-2.0.6 → ladim-2.0.8}/pyproject.toml +0 -0
  38. {ladim-2.0.6 → ladim-2.0.8}/setup.cfg +0 -0
  39. {ladim-2.0.6 → ladim-2.0.8}/tests/test_forcing.py +0 -0
  40. {ladim-2.0.6 → ladim-2.0.8}/tests/test_grid.py +0 -0
  41. {ladim-2.0.6 → ladim-2.0.8}/tests/test_ladim.py +0 -0
  42. {ladim-2.0.6 → ladim-2.0.8}/tests/test_model.py +0 -0
  43. {ladim-2.0.6 → ladim-2.0.8}/tests/test_output.py +0 -0
  44. {ladim-2.0.6 → ladim-2.0.8}/tests/test_release.py +0 -0
  45. {ladim-2.0.6 → ladim-2.0.8}/tests/test_solver.py +0 -0
{ladim-2.0.6 → ladim-2.0.8}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: ladim
3
- Version: 2.0.6
3
+ Version: 2.0.8
4
4
  Summary: Lagrangian Advection and Diffusion Model
5
5
  Home-page: https://github.com/pnsaevik/ladim
6
6
  Author: Bjørn Ådlandsvik
{ladim-2.0.6 → ladim-2.0.8}/ladim/__init__.py RENAMED
@@ -1,3 +1,3 @@
1
- __version__ = '2.0.6'
1
+ __version__ = '2.0.8'
2
2
 
3
3
  from .main import main, run
{ladim-2.0.6 → ladim-2.0.8}/ladim/config.py RENAMED
@@ -100,6 +100,7 @@ def convert_1_to_2(c):
100
100
  out['forcing']['legacy_module'] = dict_get(c, 'gridforce.module', '') + '.Forcing'
101
101
  out['forcing']['start_time'] = np.datetime64(dict_get(c, 'time_control.start_time', '1970'), 's')
102
102
  out['forcing']['stop_time'] = np.datetime64(dict_get(c, 'time_control.stop_time', '1970'), 's')
103
+ out['forcing']['subgrid'] = dict_get(c, 'gridforce.subgrid', None)
103
104
  out['forcing']['dt'] = dt_sec
104
105
  out['forcing']['ibm_forcing'] = dict_get(c, 'gridforce.ibm_forcing', [])
105
106
 
{ladim-2.0.6 → ladim-2.0.8}/ladim/forcing.py RENAMED
@@ -47,6 +47,8 @@ class RomsForcing(Forcing):
47
47
  stop_time=conf.get('stop_time', None),
48
48
  dt=conf.get('dt', None),
49
49
  )
50
+ if conf.get('subgrid', None) is not None:
51
+ legacy_conf['subgrid'] = conf['subgrid']
50
52
 
51
53
  from .model import load_class
52
54
  LegacyForcing = load_class(conf.get('legacy_module', 'ladim.gridforce.ROMS.Forcing'))
{ladim-2.0.6 → ladim-2.0.8}/ladim.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: ladim
3
- Version: 2.0.6
3
+ Version: 2.0.8
4
4
  Summary: Lagrangian Advection and Diffusion Model
5
5
  Home-page: https://github.com/pnsaevik/ladim
6
6
  Author: Bjørn Ådlandsvik
{ladim-2.0.6 → ladim-2.0.8}/tests/test_config.py RENAMED
@@ -42,7 +42,9 @@ class Test_convert_1_to_2:
42
42
  'ibm_forcing': [],
43
43
  'legacy_module': 'ladim.gridforce.ROMS.Forcing',
44
44
  'start_time': np.datetime64('2015-09-07T01:00:00'),
45
- 'stop_time': np.datetime64('2015-09-07T01:05:00')},
45
+ 'stop_time': np.datetime64('2015-09-07T01:05:00'),
46
+ 'subgrid': None,
47
+ },
46
48
  'grid': {
47
49
  'file': '../forcing*.nc',
48
50
  'legacy_module': 'ladim.gridforce.ROMS.Grid',
{ladim-2.0.6 → ladim-2.0.8}/LICENSE RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/README.md RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/ladim/__main__.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/ladim/grid.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/ladim/gridforce/ROMS.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/ladim/gridforce/__init__.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/ladim/gridforce/zROMS.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/ladim/ibms/__init__.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/ladim/ibms/light.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/ladim/main.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/ladim/model.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/ladim/output.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/ladim/plugins/__init__.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/ladim/release.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/ladim/sample.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/ladim/solver.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/ladim/state.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/ladim/tracker.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/ladim/utilities.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/ladim.egg-info/SOURCES.txt RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/ladim.egg-info/requires.txt RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/postladim/__init__.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/postladim/cellcount.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/postladim/kde_plot.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/postladim/particlefile.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/postladim/variable.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/pyproject.toml RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/setup.cfg RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/tests/test_forcing.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/tests/test_grid.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/tests/test_ladim.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/tests/test_model.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/tests/test_output.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/tests/test_release.py RENAMED
File without changes
{ladim-2.0.6 → ladim-2.0.8}/tests/test_solver.py RENAMED
File without changes