Skip to content

Commit 9a1c0dc

Browse files
simmsasimmsa
committed
Merge remote-tracking branch 'upstream/develop' into package-cleanup-v2
2 parents aea8426 + 922b270 commit 9a1c0dc

48 files changed

Lines changed: 812 additions & 419 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ $ cat .gitignore
1111
*~
1212
*.png
1313
*.index
14+
*.dolfyn.log
1415

1516
# Directories
1617
**/__pycache__/
@@ -34,6 +35,8 @@ $ cat .gitignore
3435
# Exemptions
3536
!**/examples/data/wave/*.mat
3637
!**/tests/data/wave/*.mat
38+
!**/examples/data/dolfyn/test_data/*.dolfyn.log
3739

3840
# Files created during tests
3941
mhkit/tests/wave/plots/
42+
**/examples/data/dolfyn/test_data/test_save.nc

‎examples/data/dolfyn/AQD_HR.PRF‎

2.49 MB
Binary file not shown.

‎examples/data/dolfyn/AQD_test01.prf‎

7.25 MB
Binary file not shown.

‎examples/data/dolfyn/test_data/AQD_HR.nc‎

3.74 MB
Binary file not shown.

‎examples/data/dolfyn/test_data/AQD_test01.nc‎

12.9 MB
Binary file not shown.

‎examples/data/dolfyn/test_data/AWAC_test01.dolfyn.log‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,98 +4,98 @@ root - INFO - Position: 50, codes: (165, 4)
44
root - INFO - Reading header configuration (0x04) ping #0 @ 50...
55
root - INFO - Position: 274, codes: (165, 0)
66
root - INFO - Reading user configuration (0x00) ping #0 @ 274...
7+
root - INFO - Init completed
78
root - INFO - Position: 786, codes: (165, 32)
9+
root - INFO - Reading AWAC velocity data (0x20) ping #0 @ 786...
810
root - INFO - Position: 1086, codes: (165, 32)
11+
root - INFO - Reading AWAC velocity data (0x20) ping #1 @ 1086...
912
root - INFO - Position: 1386, codes: (165, 32)
13+
root - INFO - Reading AWAC velocity data (0x20) ping #2 @ 1386...
1014
root - INFO - Position: 1686, codes: (165, 32)
15+
root - INFO - Reading AWAC velocity data (0x20) ping #3 @ 1686...
1116
root - INFO - Position: 1986, codes: (165, 32)
17+
root - INFO - Reading AWAC velocity data (0x20) ping #4 @ 1986...
1218
root - INFO - Position: 2286, codes: (165, 32)
19+
root - INFO - Reading AWAC velocity data (0x20) ping #5 @ 2286...
1320
root - INFO - Position: 2586, codes: (165, 32)
21+
root - INFO - Reading AWAC velocity data (0x20) ping #6 @ 2586...
1422
root - INFO - Position: 2886, codes: (165, 32)
23+
root - INFO - Reading AWAC velocity data (0x20) ping #7 @ 2886...
1524
root - INFO - Position: 3186, codes: (165, 32)
25+
root - INFO - Reading AWAC velocity data (0x20) ping #8 @ 3186...
1626
root - INFO - Position: 3486, codes: (165, 32)
27+
root - INFO - Reading AWAC velocity data (0x20) ping #9 @ 3486...
1728
root - INFO - Position: 3786, codes: (165, 32)
29+
root - INFO - Reading AWAC velocity data (0x20) ping #10 @ 3786...
1830
root - INFO - Position: 4086, codes: (165, 32)
31+
root - INFO - Reading AWAC velocity data (0x20) ping #11 @ 4086...
1932
root - INFO - Position: 4386, codes: (165, 32)
33+
root - INFO - Reading AWAC velocity data (0x20) ping #12 @ 4386...
2034
root - INFO - Position: 4686, codes: (165, 32)
35+
root - INFO - Reading AWAC velocity data (0x20) ping #13 @ 4686...
2136
root - INFO - Position: 4986, codes: (165, 32)
37+
root - INFO - Reading AWAC velocity data (0x20) ping #14 @ 4986...
2238
root - INFO - Position: 5286, codes: (165, 32)
39+
root - INFO - Reading AWAC velocity data (0x20) ping #15 @ 5286...
2340
root - INFO - Position: 5586, codes: (165, 32)
41+
root - INFO - Reading AWAC velocity data (0x20) ping #16 @ 5586...
2442
root - INFO - Position: 5886, codes: (165, 32)
43+
root - INFO - Reading AWAC velocity data (0x20) ping #17 @ 5886...
2544
root - INFO - Position: 6186, codes: (165, 32)
45+
root - INFO - Reading AWAC velocity data (0x20) ping #18 @ 6186...
2646
root - INFO - Position: 6486, codes: (165, 32)
47+
root - INFO - Reading AWAC velocity data (0x20) ping #19 @ 6486...
2748
root - INFO - Position: 6786, codes: (165, 32)
49+
root - INFO - Reading AWAC velocity data (0x20) ping #20 @ 6786...
2850
root - INFO - Position: 7086, codes: (165, 32)
51+
root - INFO - Reading AWAC velocity data (0x20) ping #21 @ 7086...
2952
root - INFO - Position: 7386, codes: (165, 32)
53+
root - INFO - Reading AWAC velocity data (0x20) ping #22 @ 7386...
3054
root - INFO - Position: 7686, codes: (165, 32)
55+
root - INFO - Reading AWAC velocity data (0x20) ping #23 @ 7686...
3156
root - INFO - Position: 7986, codes: (165, 32)
57+
root - INFO - Reading AWAC velocity data (0x20) ping #24 @ 7986...
3258
root - INFO - Position: 8286, codes: (165, 32)
59+
root - INFO - Reading AWAC velocity data (0x20) ping #25 @ 8286...
3360
root - INFO - Position: 8586, codes: (165, 32)
61+
root - INFO - Reading AWAC velocity data (0x20) ping #26 @ 8586...
3462
root - INFO - Position: 8886, codes: (165, 32)
63+
root - INFO - Reading AWAC velocity data (0x20) ping #27 @ 8886...
3564
root - INFO - Position: 9186, codes: (165, 32)
65+
root - INFO - Reading AWAC velocity data (0x20) ping #28 @ 9186...
3666
root - INFO - Position: 9486, codes: (165, 32)
67+
root - INFO - Reading AWAC velocity data (0x20) ping #29 @ 9486...
3768
root - INFO - Position: 9786, codes: (165, 32)
69+
root - INFO - Reading AWAC velocity data (0x20) ping #30 @ 9786...
3870
root - INFO - Position: 10086, codes: (165, 32)
71+
root - INFO - Reading AWAC velocity data (0x20) ping #31 @ 10086...
3972
root - INFO - Position: 10386, codes: (165, 32)
73+
root - INFO - Reading AWAC velocity data (0x20) ping #32 @ 10386...
4074
root - INFO - Position: 10686, codes: (165, 32)
75+
root - INFO - Reading AWAC velocity data (0x20) ping #33 @ 10686...
4176
root - INFO - Position: 10986, codes: (165, 32)
77+
root - INFO - Reading AWAC velocity data (0x20) ping #34 @ 10986...
4278
root - INFO - Position: 11286, codes: (165, 32)
79+
root - INFO - Reading AWAC velocity data (0x20) ping #35 @ 11286...
4380
root - INFO - Position: 11586, codes: (165, 32)
81+
root - INFO - Reading AWAC velocity data (0x20) ping #36 @ 11586...
4482
root - INFO - Position: 11886, codes: (165, 32)
83+
root - INFO - Reading AWAC velocity data (0x20) ping #37 @ 11886...
4584
root - INFO - Position: 12186, codes: (165, 32)
85+
root - INFO - Reading AWAC velocity data (0x20) ping #38 @ 12186...
4686
root - INFO - Position: 12486, codes: (165, 32)
87+
root - INFO - Reading AWAC velocity data (0x20) ping #39 @ 12486...
4788
root - INFO - Position: 12786, codes: (165, 32)
89+
root - INFO - Reading AWAC velocity data (0x20) ping #40 @ 12786...
4890
root - INFO - Position: 13086, codes: (165, 32)
91+
root - INFO - Reading AWAC velocity data (0x20) ping #41 @ 13086...
4992
root - INFO - Position: 13386, codes: (165, 32)
93+
root - INFO - Reading AWAC velocity data (0x20) ping #42 @ 13386...
5094
root - INFO - Position: 13686, codes: (165, 32)
95+
root - INFO - Reading AWAC velocity data (0x20) ping #43 @ 13686...
5196
root - INFO - Position: 13986, codes: (165, 32)
97+
root - INFO - Reading AWAC velocity data (0x20) ping #44 @ 13986...
5298
root - INFO - Position: 14286, codes: (165, 32)
99+
root - INFO - Reading AWAC velocity data (0x20) ping #45 @ 14286...
53100
root - INFO - Position: 14586, codes: (165, 32)
54-
root - INFO - Position: 14886, codes: (165, 32)
55-
root - INFO - Position: 15186, codes: (165, 32)
56-
root - INFO - Position: 15486, codes: (165, 32)
57-
root - INFO - Position: 15786, codes: (165, 32)
58-
root - INFO - p0=1084, pos=16084, i=49
59-
root - INFO - Init completed
60-
root - INFO - Position: 786, codes: (165, 32)
61-
root - INFO - Reading AWAC velocity data (0x20) ping #0 @ 786...
62-
root - INFO - Position: 1086, codes: (165, 32)
63-
root - INFO - Reading AWAC velocity data (0x20) ping #1 @ 1086...
64-
root - INFO - Position: 1386, codes: (165, 32)
65-
root - INFO - Reading AWAC velocity data (0x20) ping #2 @ 1386...
66-
root - INFO - Position: 1686, codes: (165, 32)
67-
root - INFO - Reading AWAC velocity data (0x20) ping #3 @ 1686...
68-
root - INFO - Position: 1986, codes: (165, 32)
69-
root - INFO - Reading AWAC velocity data (0x20) ping #4 @ 1986...
70-
root - INFO - Position: 2286, codes: (165, 32)
71-
root - INFO - Reading AWAC velocity data (0x20) ping #5 @ 2286...
72-
root - INFO - Position: 2586, codes: (165, 32)
73-
root - INFO - Reading AWAC velocity data (0x20) ping #6 @ 2586...
74-
root - INFO - Position: 2886, codes: (165, 32)
75-
root - INFO - Reading AWAC velocity data (0x20) ping #7 @ 2886...
76-
root - INFO - Position: 3186, codes: (165, 32)
77-
root - INFO - Reading AWAC velocity data (0x20) ping #8 @ 3186...
78-
root - INFO - Position: 3486, codes: (165, 32)
79-
root - INFO - Reading AWAC velocity data (0x20) ping #9 @ 3486...
80-
root - INFO - Position: 3786, codes: (165, 32)
81-
root - INFO - Reading AWAC velocity data (0x20) ping #10 @ 3786...
82-
root - INFO - Position: 4086, codes: (165, 32)
83-
root - INFO - Reading AWAC velocity data (0x20) ping #11 @ 4086...
84-
root - INFO - Position: 4386, codes: (165, 32)
85-
root - INFO - Reading AWAC velocity data (0x20) ping #12 @ 4386...
86-
root - INFO - Position: 4686, codes: (165, 32)
87-
root - INFO - Reading AWAC velocity data (0x20) ping #13 @ 4686...
88-
root - INFO - Position: 4986, codes: (165, 32)
89-
root - INFO - Reading AWAC velocity data (0x20) ping #14 @ 4986...
90-
root - INFO - Position: 5286, codes: (165, 32)
91-
root - INFO - Reading AWAC velocity data (0x20) ping #15 @ 5286...
92-
root - INFO - Position: 5586, codes: (165, 32)
93-
root - INFO - Reading AWAC velocity data (0x20) ping #16 @ 5586...
94-
root - INFO - Position: 5886, codes: (165, 32)
95-
root - INFO - Reading AWAC velocity data (0x20) ping #17 @ 5886...
96-
root - INFO - Position: 6186, codes: (165, 32)
97-
root - INFO - Reading AWAC velocity data (0x20) ping #18 @ 6186...
98-
root - INFO - Position: 6486, codes: (165, 32)
99-
root - INFO - Reading AWAC velocity data (0x20) ping #19 @ 6486...
100-
root - INFO - Position: 6786, codes: (165, 32)
101-
root - INFO - Reading AWAC velocity data (0x20) ping #20 @ 6786...
101+
root - INFO - Reading AWAC velocity data (0x20) ping #46 @ 14586...

‎examples/data/dolfyn/test_data/AWAC_test01.nc‎

24 Bytes
Binary file not shown.

‎examples/data/dolfyn/test_data/AWAC_test01_clean.nc‎

24 Bytes
Binary file not shown.

‎examples/data/dolfyn/test_data/AWAC_test01_earth2inst.nc‎

24 Bytes
Binary file not shown.

‎examples/data/dolfyn/test_data/AWAC_test01_earth2principal.nc‎

24 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)