Commit 10499f2
committed
Moving seabed_tools to main FAModel folder (and deleting submodule)
- The remaining functions in seabed_tools are either 1) used as helper functions to scripts like project.py to process different things, or 2) the main getDepthFromBathymetry functions
- Did not want to merge the functions into geography.py because that would create a project.py import dependence on the geography module
- So, we left those functions there and moved seabed_tools to the same directory as geography and helpers.py
- - At some point, the getDepthFromBathymetry functions can merge into something like helpers.py (like MoorPy), but going to leave it as import sbt for now
- Also, turbine.py uses the getInterpNum function, independent of anything seabed related, so that can likely eventually be a general helpers function
- Note: geography functions still also have a dependence on sbt.getDepthFromBathymetry
- processBoundary has a dependence on geography functions, but it doesn't need to
- Updated all the other import dependencies elsewhere1 parent 699e72d commit 10499f2
File tree
15 files changed
+15
-58
lines changed- famodel
- design
- seabed
- images
- turbine
15 files changed
+15
-58
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
| 15 | + | |
22 | 16 | | |
23 | 17 | | |
24 | 18 | | |
25 | 19 | | |
26 | 20 | | |
27 | 21 | | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
28 | 25 | | |
29 | 26 | | |
30 | 27 | | |
| |||
250 | 247 | | |
251 | 248 | | |
252 | 249 | | |
253 | | - | |
254 | | - | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
255 | 253 | | |
256 | 254 | | |
257 | 255 | | |
| |||
417 | 415 | | |
418 | 416 | | |
419 | 417 | | |
420 | | - | |
421 | | - | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
422 | 421 | | |
423 | 422 | | |
424 | 423 | | |
| |||
504 | 503 | | |
505 | 504 | | |
506 | 505 | | |
507 | | - | |
508 | | - | |
509 | | - | |
510 | 506 | | |
511 | 507 | | |
512 | 508 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| |||
This file was deleted.
Whitespace-only changes.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
0 commit comments