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.

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

Integration of the double-linked node list ParticleSet structure to 'master' #1034

Merged
merged 250 commits into from
Jan 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
250 commits
Select commit Hold shift + click to select a range
7918917
integrate_nodes_to_master - added barebone files as start of the exte…
CKehl Jun 1, 2021
390dd7c
integrate_nodes_to_master (#1034) - located and marked the origin of …
CKehl Jun 1, 2021
a6e2da7
integrate_nodes_to_master (#1034) - (temporarily) fixing the hdf5 lib…
CKehl Jun 1, 2021
e0725ac
integrate_nodes_to_master (#1034) - added sortedcontainers to the dep…
CKehl Jun 3, 2021
ccb1ef4
integrate_nodes_to_master (#1034) - added some first stand-alone file…
CKehl Jun 3, 2021
95c068a
integrate_nodes_to_master (#1034) - added the node-folder to the inst…
CKehl Jun 3, 2021
4ba8676
integrate_nodes_to_master (#1034) - revisit of the code compiler to a…
CKehl Jun 7, 2021
7325191
integrate_nodes_to_master (#1034) - added the consistent-compilation …
CKehl Jun 7, 2021
c196fd1
integrate_nodes_to_master (#1034) - integrate new classes into the pa…
CKehl Jun 7, 2021
4e908e3
integrate_nodes_to_master (#1034) - add an ID generator that should f…
CKehl Jun 7, 2021
b3c0538
integrate_nodes_to_master (#1034) - add an MPI-based messaging (-> me…
CKehl Jun 7, 2021
635bf57
integrate_nodes_to_master (#1034) - integrate ID generators and messa…
CKehl Jun 7, 2021
631ced5
integrate_nodes_to_master (#1034) - add the Python classes provding t…
CKehl Jun 7, 2021
40b6d7a
integrate_nodes_to_master - changed global parcels package init
CKehl Jul 7, 2021
7101245
integrate_nodes_to_master - add node-based ctypes JIT main function t…
CKehl Jul 7, 2021
1b9e7e6
integrate_nodes_to_master - fixing consitency and coherence issues wi…
CKehl Jul 7, 2021
fd08849
integrate_nodes_to_master - add the C-Interface and C-Library class t…
CKehl Jul 7, 2021
ff19e4c
integrate_nodes_to_master - add functioning Python class of Node stru…
CKehl Jul 7, 2021
8e45fcf
integrate_nodes_to_master - implementation of the double-linked list …
CKehl Jul 7, 2021
dfa73d9
integrate_nodes_to_master - added a module init for the nodes
CKehl Jul 7, 2021
b6a38ee
integrate_nodes_to_master - add functioning version of a node-based k…
CKehl Jul 7, 2021
754fc9a
integrate_nodes_to_master - added node-based kernel to kernel module
CKehl Jul 7, 2021
20e4628
integrate_nodes_to_master - add functioning version of a node-based k…
CKehl Jul 7, 2021
114a728
integrate_nodes_to_master - added node-based particle file to particl…
CKehl Jul 7, 2021
2b4a2bf
integrate_nodes_to_master - made necessary adjustments to the cptr-ha…
CKehl Jul 7, 2021
c1ebf6d
integrate_nodes_to_master - prepared base particle set for extension …
CKehl Jul 7, 2021
8f8dfeb
integrate_nodes_to_master - added first implementation for ParticleSe…
CKehl Jul 7, 2021
e3298f7
integrate_nodes_to_master - added node-based particle set to particle…
CKehl Jul 7, 2021
d08482f
integrate_nodes_to_master - added some documentation TODO's about the…
CKehl Jul 7, 2021
c26b9e1
integrate_nodes_to_master - added a functioning node-based, non-index…
CKehl Jul 7, 2021
f894bac
integrate_nodes_to_master - added node-based collection to collection…
CKehl Jul 7, 2021
8106d86
integrate_nodes_to_master - added node-based particle set tests to th…
CKehl Jul 7, 2021
6edc6cd
integrate_nodes_to_master - added node-based particle set tests to th…
CKehl Jul 7, 2021
a42e178
integrate_nodes_to_master - AoS-collection: fixed time-chunk loading …
CKehl Jul 7, 2021
4727ff7
integrate_nodes_to_master - SoA-collection: fixed the delete function…
CKehl Jul 7, 2021
dddfb7f
integrate_nodes_to_master - base kernel: correct handling of single-s…
CKehl Jul 7, 2021
4b351f1
integrate_nodes_to_master - AoS kernel: correct handling of single-st…
CKehl Jul 7, 2021
82efa58
integrate_nodes_to_master - SoA kernel: correct handling of single-st…
CKehl Jul 7, 2021
efb9977
integrate_nodes_to_master - added a normal 'remove' function to SoA a…
CKehl Jul 7, 2021
64c3de1
integrate_nodes_to_master - fixing kernel assertion error
CKehl Jul 7, 2021
8bcfffa
integrate_nodes_to_master (#1044) - fixing errors when checking for t…
CKehl Jul 8, 2021
da74de8
integrate_nodes_to_master (#1044) - fixing flake8 errors.
CKehl Jul 8, 2021
635637f
integrate_nodes_to_master (#1034) - fixing more flake8 errors my loca…
CKehl Jul 8, 2021
0401250
integrate_nodes_to_master (#1034) - fixing the bug in the kernel gene…
CKehl Jul 13, 2021
d12e4e9
integrate_nodes_to_master (#1034) - fixed error in python notebook tu…
CKehl Jul 14, 2021
3943342
integrate_nodes_to_master (#1034) - fixed error in python notebook tu…
CKehl Jul 14, 2021
3b3ffe5
integrate_nodes_to_master (#1034) - fixing compilation issues on MacO…
CKehl Jul 16, 2021
a9b3d65
integrate_nodes_to_master (#1034) - try fixing the compilation with r…
CKehl Jul 20, 2021
b5ae884
integrate_nodes_to_master (#1034) - added first tests to test_advecti…
CKehl Jul 20, 2021
91febaa
integrate_nodes_to_master (#1034) - try fixing the compilation with r…
CKehl Jul 20, 2021
82ef35e
integrate_nodes_to_master (#1034) - trying to revert HDF5 library loc…
CKehl Jul 20, 2021
5564fb9
integrate_nodes_to_master (#1034) - added pandas as prerequisite inst…
CKehl Jul 20, 2021
eee8f30
integrate_nodes_to_master (#1034) - removed some explicit dependencie…
CKehl Jul 20, 2021
edcd4c9
integrate_nodes_to_master (#1034) - getiin' f*****' furious. Trying t…
CKehl Jul 20, 2021
dd43381
integrate_nodes_to_master (#1034) - still not working - what is wrong…
CKehl Jul 20, 2021
5f70e87
integrate_nodes_to_master (#1034) - last working test version with pa…
CKehl Jul 20, 2021
6363b3f
integrate_nodes_to_master (#1034) - modified the multi-stage GNU comp…
CKehl Jul 20, 2021
2598997
integrate_nodes_to_master (#1034) - modified the multi-stage GNU comp…
CKehl Jul 20, 2021
fecb3f5
integrate_nodes_to_master (#1034) - adding compilation log outputs to…
CKehl Jul 21, 2021
ebbe0c3
integrate_nodes_to_master (#1034) - always add 'lib' prefix and do no…
CKehl Jul 21, 2021
096212b
integrate_nodes_to_master (#1034) - remove the 'lib' prefix from the …
CKehl Jul 21, 2021
567a1cd
integrate_nodes_to_master (#1034) - re-add the 'lib' prefix from the …
CKehl Jul 22, 2021
2d5f1ec
integrate_nodes_to_master (#1034) - getting rid of the AttributeError…
CKehl Jul 22, 2021
c11ee4a
integrate_nodes_to_master (#1034) - fixed the '_isParticle(key)' func…
CKehl Jul 22, 2021
47f7b03
integrate_nodes_to_master (#1034) - further randomized the single-lib…
CKehl Jul 22, 2021
21a1113
integrate_nodes_to_master (#1034) - further randomized the single-lib…
CKehl Jul 22, 2021
70c90df
integrate_nodes_to_master (#1034) - printing out libdir content in ca…
CKehl Jul 22, 2021
c4eb678
integrate_nodes_to_master (#1034) - doing some modifications to get r…
CKehl Jul 22, 2021
78ccd67
integrate_nodes_to_master (#1034) - revert lib-appendage in codeinter…
CKehl Jul 23, 2021
bcf4f30
integrate_nodes_to_master (#1034) - expanded advection tests; found s…
CKehl Jul 23, 2021
a1c5155
integrate_nodes_to_master (#1034) - fixing linter errors from PEP8
CKehl Jul 23, 2021
9668a41
integrate_nodes_to_master (#1034) - applying a more consistent compil…
CKehl Jul 30, 2021
acf62ee
integrate_nodes_to_master (#1034) - seems the error is all along that…
CKehl Jul 30, 2021
dd5e5bd
integrate_nodes_to_master (#1034) - removing 'lib'-appendage
CKehl Jul 30, 2021
b2e94f0
integrate_nodes_to_master (#1034) - adapt the npct.load_library(...) …
CKehl Jul 30, 2021
3f08a44
integrate_nodes_to_master (#1034) - fix linter errors
CKehl Jul 30, 2021
6e9e931
integrate_nodes_to_master (#1034) - fix win32 error
CKehl Jul 30, 2021
34c1b03
integrate_nodes_to_master (#1034) - moved the parameter idgen of Pset…
CKehl Aug 27, 2021
08ef5da
integrate_nodes_to_master (#1034) - fixing test_pset_add_shorthand.
CKehl Aug 30, 2021
cb0bb4c
integrate_nodes_to_master (#1034) - fixing infinite-loop error on par…
CKehl Aug 31, 2021
a7d809a
integrate_nodes_to_master (#1034) - made tests with adding and remove…
CKehl Sep 1, 2021
9b91804
integrate_nodes_to_master (#1034) - fixing PEP8 errors from the linter
CKehl Sep 1, 2021
5a60511
integrate_nodes_to_master (#1034) - finished implementing all particl…
CKehl Sep 1, 2021
dcdadcf
integrate_nodes_to_master (#1034) - fixing PEP8 errors from the linter
CKehl Sep 1, 2021
d302ccf
integrate_nodes_to_master (#1034) - added and expanded tests on parti…
CKehl Sep 1, 2021
08a88fd
integrate_nodes_to_master (#1034) - fixing PEP8 errors from the linter
CKehl Sep 1, 2021
0278c4b
integrate_nodes_to_master (#1034) - extended tests for node-based par…
CKehl Sep 1, 2021
a953b52
integrate_nodes_to_master (#1034) - reversed variable naming in test …
CKehl Sep 1, 2021
1253024
integrate_nodes_to_master (#1034) - changing the final test in 'test_…
CKehl Sep 2, 2021
77fdf87
integrate_nodes_to_master (#1034) - added the 'kernel' property to no…
CKehl Sep 2, 2021
82e20e0
integrate_nodes_to_master (#1034) - extended tests for node-based par…
CKehl Sep 2, 2021
a9e2ccc
integrate_nodes_to_master (#1034) - half-extended tests for node-base…
CKehl Sep 2, 2021
79191ba
integrate_nodes_to_master (#1034) - extended tests for node-based par…
CKehl Sep 2, 2021
f1fe3f8
integrate_nodes_to_master (#1034) - patch fixing an issue in the stom…
CKehl Sep 2, 2021
b689fca
integrate_nodes_to_master (#1034) - half-extended the node-based list…
CKehl Sep 2, 2021
d6bfece
integrate_nodes_to_master (#1034) - located, corrected and test for o…
CKehl Sep 3, 2021
ff103df
integrate_nodes_to_master (#1034) - fixing PEP8 errors from the linter
CKehl Sep 3, 2021
f312bcf
integrate_nodes_to_master (#1034) - fixing PEP8 errors from the linter
CKehl Sep 3, 2021
08e0ea4
integrate_nodes_to_master (#1034) - extended tests for node-based par…
CKehl Sep 3, 2021
351b1a2
integrate_nodes_to_master (#1034) - skipping the stommel-nodes test i…
CKehl Sep 6, 2021
47a9fc2
integrate_nodes_to_master (#1034) - fixing PEP8 errors from the linter
CKehl Sep 6, 2021
6c0cd45
integrate_nodes_to_master (#1034) - extended tests for node-based par…
CKehl Sep 6, 2021
6879c86
integrate_nodes_to_master (#1034) - extended tests for node-based par…
CKehl Sep 6, 2021
357e22d
integrate_nodes_to_master (#1034) - smaller correction.
CKehl Sep 6, 2021
dac078a
integrate_nodes_to_master (#1034) - extended tests for node-based par…
CKehl Sep 6, 2021
d88eb9c
integrate_nodes_to_master (#1034) - extended tests for node-based par…
CKehl Sep 6, 2021
fb14664
integrate_nodes_to_master (#1034) - fixing an error in fieldset writi…
CKehl Sep 6, 2021
f1f461b
integrate_nodes_to_master (#1034) - added first tests for ID generati…
CKehl Sep 16, 2021
241622d
integrate_nodes_to_master (#1034) - fixing errors in ID generation.
CKehl Sep 16, 2021
d308c4b
fixing id-generator issues and expanding its tests; fixing linter iss…
CKehl Sep 17, 2021
a4c8ed2
skipping ID-generator tests ofr Spatial- and Spatiotemporal ID genera…
CKehl Sep 17, 2021
a3b20f9
integrate_nodes_to_master (#1034) - fixing linter errors.
CKehl Sep 17, 2021
ed69cb5
integrate_nodes_to_master (#1034) - changed the bin-ranges for the id…
CKehl Sep 23, 2021
2e9a01c
integrate_nodes_to_master (#1034) - implemented id-release and Genera…
CKehl Sep 23, 2021
25a5004
integrate_nodes_to_master (#1034) - fixing linter errors.
CKehl Sep 23, 2021
5d140f4
integrate_nodes_to_master (#1034) - adding first test for the C-libra…
CKehl Oct 7, 2021
88c5efa
integrate_nodes_to_master (#1034) - added multi-library compilation t…
CKehl Oct 8, 2021
74dc749
integrate_nodes_to_master (#1034) - added register/deregister functio…
CKehl Oct 8, 2021
32d7819
integrate_nodes_to_master (#1034) - added single- and multi-particle …
CKehl Oct 11, 2021
0dd9757
integrate_nodes_to_master (#1034) - gives possibility of individual p…
CKehl Oct 11, 2021
15ff2e6
integrate_nodes_to_master (#1034) - fixing linter.
CKehl Oct 11, 2021
7d579cc
integrate_nodes_to_master (#1034) - added tests and complied with the…
CKehl Oct 14, 2021
4dc40a3
integrate_nodes_to_master (#1034) - rename 'add_same/add_collection' …
CKehl Oct 14, 2021
c15afae
integrate_nodes_to_master (#1034) - implemented split-functions and i…
CKehl Oct 15, 2021
a660a8f
integrate_nodes_to_master (#1034) - added node tests; still need to f…
CKehl Oct 19, 2021
e4e96aa
integrate_nodes_to_master (#1034) - fixed the node.remove() test.
CKehl Oct 19, 2021
ac1f4be
integrate_nodes_to_master (#1034) - added first swath of docstrings a…
CKehl Oct 19, 2021
e6f5a67
integrate_nodes_to_master (#1034) - added last docstrings to Particle…
CKehl Oct 20, 2021
84ba146
integrate_nodes_to_master (#1034) - added docstrings to ParticleColle…
CKehl Oct 20, 2021
722b9c1
integrate_nodes_to_master (#1034) - added docstrings to ParticleColle…
CKehl Oct 21, 2021
0cdbe25
integrate_nodes_to_master (#1034) - fixing linter for CollectionSOA.
CKehl Oct 21, 2021
35bfa23
integrate_nodes_to_master (#1034) - fixing the memory containement ca…
CKehl Oct 21, 2021
0ff4e4c
integrate_nodes_to_master (#1034) - fixing linter for test_fieldset.py.
CKehl Oct 21, 2021
a02dde8
integrate_nodes_to_master (#1034) - fixing linter for test_fieldset.py.
CKehl Oct 21, 2021
25d047b
integrate_nodes_to_master (#1034) - fixing test_fieldset.py.
CKehl Oct 22, 2021
a244f8a
integrate_nodes_to_master (#1034) - fixing test_fieldset.py.
CKehl Oct 22, 2021
e75c541
integrate_nodes_to_master (#1034) - fixing linter of test_fieldset.py.
CKehl Oct 22, 2021
c6df593
integrate_nodes_to_master (#1034) - adding docstrings, removing comme…
CKehl Oct 22, 2021
0472e68
integrate_nodes_to_master (#1034) - adding docstrings to the C-librar…
CKehl Oct 22, 2021
c3ce0ca
integrate_nodes_to_master (#1034) - fixing linter of codeinterface.py.
CKehl Oct 22, 2021
34c7e2c
integrate_nodes_to_master (#1034) - fixing issues from removing the n…
CKehl Oct 25, 2021
940f0e0
integrate_nodes_to_master (#1034) - fixing errors in caluclating the …
CKehl Oct 25, 2021
efb3da1
integrate_nodes_to_master (#1034) - adapting test_fieldset.py by addi…
CKehl Oct 25, 2021
19fc93e
integrate_nodes_to_master (#1034) - fixing errors on the ParticleFile…
CKehl Oct 25, 2021
a71dfb6
integrate_nodes_to_master (#1034) - adding docstrings to BaseKernel c…
CKehl Oct 25, 2021
c1561e5
integrate_nodes_to_master (#1034) - fixing merging issues from the pr…
CKehl Oct 25, 2021
929e5ae
integrate_nodes_to_master (#1034) - fixing linter issues.
CKehl Oct 25, 2021
4277f19
integrate_nodes_to_master (#1034) - trying to fix the memory containm…
CKehl Oct 26, 2021
5570b18
integrate_nodes_to_master (#1034) - fixing containment request by rat…
CKehl Oct 26, 2021
e544914
integrate_nodes_to_master (#1034) - removed comments, unnecessary log…
CKehl Oct 26, 2021
ed302cf
integrate_nodes_to_master (#1034) - trying to recode the memory conta…
CKehl Oct 26, 2021
473d79a
integrate_nodes_to_master (#1034) - adding docstrings and removing co…
CKehl Oct 27, 2021
c573455
integrate_nodes_to_master (#1034) - removing one parameter to the mem…
CKehl Oct 27, 2021
5a4c81d
integrate_nodes_to_master (#1034) - adding docstrings and removing co…
CKehl Oct 27, 2021
950aaa5
integrate_nodes_to_master (#1034) - first round of adding docstrings …
CKehl Oct 27, 2021
c8a1528
integrate_nodes_to_master (#1034) - wrapping up adding docstrings and…
CKehl Oct 28, 2021
2e2034f
integrate_nodes_to_master (#1034) - trying to fix the fieldset test.
CKehl Oct 28, 2021
35c4b43
integrate_nodes_to_master (#1034) - adding docstrings and removing co…
CKehl Oct 28, 2021
fc81fb2
integrate_nodes_to_master (#1034) - trying to fix the fieldset test b…
CKehl Oct 28, 2021
f1b5cf2
integrate_nodes_to_master (#1034) - improving the AOS size calculatio…
CKehl Oct 28, 2021
9605cff
integrate_nodes_to_master (#1034) - removed last lingering comments i…
CKehl Oct 28, 2021
dc57d93
integrate_nodes_to_master (#1034) - fixing the naming of '__create_pr…
CKehl Nov 10, 2021
1791f6a
Adding support for progressbar in particlessetnodes
erikvansebille Nov 9, 2021
8fca495
integrate_nodes_to_master (#1034) - reverted to '_create_progressbar_…
CKehl Nov 10, 2021
ebfbee9
integrate_nodes_to_master (#1034) - fixing linter.
CKehl Nov 10, 2021
6c5cc21
integrate_nodes_to_master (#1034) - removed comments in example_stomm…
CKehl Nov 10, 2021
5284271
integrate_nodes_to_master (#1034) - removed comments in tests of the …
CKehl Nov 10, 2021
152ac9e
integrate_nodes_to_master (#1034) - removed comments in fieldset tests.
CKehl Nov 10, 2021
6330687
integrate_nodes_to_master (#1034) - removed unnecessary imports in fi…
CKehl Nov 10, 2021
5cc4c85
integrate_nodes_to_master (#1034) - removed comments in advection tests.
CKehl Nov 10, 2021
fd69fc7
integrate_nodes_to_master (#1034) - removed comments in grid tests.
CKehl Nov 10, 2021
0c56059
integrate_nodes_to_master (#1034) - removed comments in ID generator …
CKehl Nov 10, 2021
aa9218a
integrate_nodes_to_master (#1034) - removed comments in kernel execut…
CKehl Nov 10, 2021
8e74c42
integrate_nodes_to_master (#1034) - removed comments in node tests.
CKehl Nov 10, 2021
09264ec
integrate_nodes_to_master (#1034) - removed comments in particle file…
CKehl Nov 10, 2021
4b55a84
integrate_nodes_to_master (#1034) - removed comments in particle set …
CKehl Nov 10, 2021
ba07b75
integrate_nodes_to_master (#1034) - removed comments in particle tests.
CKehl Nov 10, 2021
14957ba
integrate_nodes_to_master (#1034) - adding final docstrings to Partic…
CKehl Nov 10, 2021
b3ef3a2
Update parcels/collection/collectionaos.py
CKehl Nov 18, 2021
56d4812
Update parcels/kernel/kernelnodes.py
CKehl Nov 18, 2021
5fd6589
Update parcels/particlefile/particlefilenodes.py
CKehl Nov 18, 2021
d92076d
Update parcels/particlefile/particlefilenodes.py
CKehl Nov 18, 2021
d882a0a
Update parcels/__init__.py
CKehl Nov 18, 2021
c8ac9af
Update parcels/collection/collectionaos.py
CKehl Nov 18, 2021
986e7a3
Update parcels/collection/collectionnodes.py
CKehl Nov 30, 2021
7592606
Update parcels/collection/collections.py
CKehl Nov 30, 2021
0dd6721
Update parcels/collection/collections.py
CKehl Nov 30, 2021
ad1ff09
Update parcels/collection/collections.py
CKehl Nov 30, 2021
bc3a5df
Update parcels/compilation/__init__.py
CKehl Nov 30, 2021
c2435d0
Update parcels/compilation/codecompiler.py
CKehl Nov 30, 2021
f23252a
Update parcels/compilation/codecompiler.py
CKehl Nov 30, 2021
5e9952e
Update parcels/compilation/codecompiler.py
CKehl Nov 30, 2021
cfc6a60
Update parcels/kernel/basekernel.py
CKehl Nov 30, 2021
67eb392
Update parcels/kernel/kernelaos.py
CKehl Nov 30, 2021
d19fe45
Update parcels/kernel/kernelnodes.py
CKehl Nov 30, 2021
e040241
Update parcels/kernel/kernelsoa.py
CKehl Nov 30, 2021
42f16d2
Update parcels/nodes/__init__.py
CKehl Nov 30, 2021
63840d9
Update parcels/compilation/codeinterface.py
CKehl Nov 30, 2021
5266e52
Apply suggestions from code review
CKehl Nov 30, 2021
65ac3ed
integrate_nodes_to_master (#1034) - fixing some open issues and remov…
CKehl Dec 7, 2021
63e9e7c
integrate_nodes_to_master (#1034) - further fixes and linter fixes.
CKehl Dec 7, 2021
7cefd27
Update parcels/particle.py
CKehl Dec 7, 2021
60777c8
Update parcels/particle.py
CKehl Dec 7, 2021
2c5fc49
Update parcels/particle.py
CKehl Dec 7, 2021
6cd0657
Update parcels/particle.py
CKehl Dec 7, 2021
5540179
Update parcels/particlefile/baseparticlefile.py
CKehl Dec 7, 2021
32e5f72
Update parcels/particlefile/baseparticlefile.py
CKehl Dec 7, 2021
4b5dea6
Update parcels/collection/collectionnodes.py
CKehl Dec 7, 2021
2f253a8
integrate_nodes_to_master (#1034) - in docstrings, changed 'pycollect…
CKehl Dec 8, 2021
dce12f5
integrate_nodes_to_master (#1034) - shortened the pid_orig statement …
CKehl Dec 8, 2021
8108eae
integrate_nodes_to_master (#1034) - removing unnecessary comment in c…
CKehl Dec 8, 2021
2c959c6
integrate_nodes_to_master (#1034) - turned all 'is_<...>' function si…
CKehl Dec 8, 2021
f66144e
integrate_nodes_to_master (#1034) - removed end-of-line comment in JI…
CKehl Dec 8, 2021
02b7234
integrate_nodes_to_master (#1034) - reacting to comments on baseparti…
CKehl Dec 8, 2021
28394f6
integrate_nodes_to_master (#1034) - removing comments in baseparticle…
CKehl Dec 8, 2021
3cc43c8
integrate_nodes_to_master (#1034) - removing comments in convert_npyd…
CKehl Dec 8, 2021
9b0fc91
integrate_nodes_to_master (#1034) - removing comments in parcels/tool…
CKehl Dec 8, 2021
8722314
integrate_nodes_to_master (#1034) - chaing variable naming in test_fi…
CKehl Dec 8, 2021
4879387
integrate_nodes_to_master (#1034) - removed logger statements in part…
CKehl Dec 8, 2021
d94e6cc
integrate_nodes_to_master (#1034) - removed comment blocks in particl…
CKehl Dec 8, 2021
6d00b0d
integrate_nodes_to_master (#1034) - needed to switch-back the Linux e…
CKehl Dec 8, 2021
687868b
Update parcels/collection/collectionnodes.py
CKehl Dec 8, 2021
0f6214e
Update parcels/nodes/PyNode.py
CKehl Dec 8, 2021
d4db09a
Update parcels/nodes/node.c
CKehl Dec 8, 2021
c37b308
integrate_nodes_to_master (#1034) - fixing a loop termination conditi…
CKehl Dec 8, 2021
6b94016
integrate_nodes_to_master (#1034) - fixing errors in the nodelist tea…
CKehl Dec 9, 2021
d900ba9
integrate_nodes_to_master (#1034) - fix ID generator problem, asking …
CKehl Dec 9, 2021
f754dc2
integrate_nodes_to_master (#1034) - fix linter error.
CKehl Dec 9, 2021
08eb333
integrate_nodes_to_master (#1034) - fix ID generator problem, asking …
CKehl Dec 9, 2021
acaf67e
integrate_nodes_to_master (#1034) - found issue with failing plot-scr…
CKehl Dec 10, 2021
3c1c18f
integrate_nodes_to_master (#1034) - bugfix for the split-test: adding…
CKehl Dec 10, 2021
23a3645
integrate_nodes_to_master (#1034) - incorporated review comments.
CKehl Dec 21, 2021
0385a28
Apply suggestions from code review
CKehl Dec 20, 2021
07e2b42
integrate_nodes_to_master (#1034) - incorporated review comments.
CKehl Dec 21, 2021
fb812ca
Apply suggestions from code review
CKehl Dec 21, 2021
c4c9f5e
integrate_nodes_to_master (#1034) - incorporated review comments.
CKehl Dec 22, 2021
4b4f8f2
Apply suggestions from code review
CKehl Dec 22, 2021
a041ba6
integrate_nodes_to_master (#1034) - fixing PEP8 linter errors.
CKehl Dec 22, 2021
8930aa5
integrate_nodes_to_master (#1034) - fixing the linux env file again.
CKehl Jan 4, 2022
621d18e
integrate_nodes_to_master (#1034) - fixing issues with file writing p…
CKehl Jan 4, 2022
f2dbb4d
integrate_nodes_to_master (#1034) - fixing issues with file writing.
CKehl Jan 4, 2022
73cb1d4
integrate_nodes_to_master (#1034) - fixing issues with file writing.
CKehl Jan 4, 2022
e0c9880
Apply suggestions from code review
CKehl Jan 5, 2022
4ac1caf
integrate_nodes_to_master (#1034) - fixing issues with file writing a…
CKehl Jan 5, 2022
a7a7edf
integrate_nodes_to_master (#1034) - fixing linter issues.
CKehl Jan 5, 2022
e250250
merge branches
CKehl Jan 5, 2022
e3f7bd6
Update tests/test_fieldset.py
CKehl Jan 5, 2022
8d78b41
Apply suggestions from code review
CKehl Jan 5, 2022
b1162e2
integrate_nodes_to_master (#1034) - incorporates feedback on code reu…
CKehl Jan 5, 2022
640b1d4
integrate_nodes_to_master (#1034) - regenerate python notebook for tu…
CKehl Jan 5, 2022
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
11 changes: 7 additions & 4 deletions environment_py3_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,33 @@ channels:
- defaults
- conda-forge
dependencies:
- python>3.4
- python>=3.4
- cachetools>=1.0.0
- cgen
- gcc_linux-64
CKehl marked this conversation as resolved.
Show resolved Hide resolved
- coverage
- ffmpeg>=3.2.3
- flake8>=2.1.0
- git
- gcc_linux-64
- mpi4py>=3.0.1
- mpich>=3.2.1
- jupyter
- matplotlib>=2.0.2
- netcdf4>=1.1.9
- hdf5>=1.10.6
- numpy>=1.9.1
- py>=1.4.27
- pymbolic
- python-dateutil
- scipy>=0.16.0
- six >=1.10.0
- six>=1.10.0
- tqdm
- xarray>=0.10.8
- cftime>=1.3.1
- pandas>=0.19.2,<1.3.0
- dask>=2.0
- cftime>=1.3.1
- pytest
- nbval
- scikit-learn
- pykdtree
- sortedcontainers>=2.1.0
3 changes: 3 additions & 0 deletions environment_py3_osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ dependencies:
- jupyter
- matplotlib>=2.0.2
- netcdf4>=1.1.9
- hdf5>=1.10.6
- numpy>=1.9.1
- py>=1.4.27
- pymbolic
Expand All @@ -24,9 +25,11 @@ dependencies:
- six>=1.10.0
- tqdm
- xarray>=0.10.8
- pandas>=0.19.2,<1.3.0
- dask>=2.0
- cftime>=1.3.1
- pytest
- nbval
- scikit-learn
- pykdtree
- sortedcontainers>=2.1.0
2 changes: 2 additions & 0 deletions environment_py3_win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ dependencies:
- m2w64-toolchain
- matplotlib>=2.0.2
- netcdf4>=1.1.9
- hdf5>=1.10.6
- numpy>=1.9.1
- py>=1.4.27
- pymbolic
Expand All @@ -27,3 +28,4 @@ dependencies:
- pytest
- nbval
- pykdtree
- sortedcontainers>=2.2.2
1 change: 1 addition & 0 deletions parcels/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@
from parcels.gridset import * # noqa
from parcels.grid import * # noqa
from parcels.tools import * # noqa
from parcels.nodes import * # noqa
1 change: 1 addition & 0 deletions parcels/collection/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
from .iterators import * # noqa: F401
from .collectionaos import * # noqa: F401
from .collectionsoa import * # noqa: F401
from .collectionnodes import * # noqa: F401
Loading