Skip to content

Commit 21bf46a

Browse files
lsirkislsirkis
committed
Editing some files to make merge easier
-- no major changes to functionality -- tests and examples will not work at this time, this is a WIP for the merge
1 parent 4407646 commit 21bf46a

31 files changed

+13010
-135
lines changed

‎.github/workflows/CI_FAModel.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
- name: Extras
4141
run: |
4242
conda install -y pytest meson ninja nlopt
43+
pip install scipy==1.11.2 # specific SciPy version needed for current LineDesign test results
4344
conda info
4445
4546
- name: Conda Install famodel
@@ -48,17 +49,16 @@ jobs:
4849
4950
- name: Overwrite MoorPy
5051
run: |
52+
pip uninstall -y moorpy # need to uninstall the old version to install the current dev branch
5153
pip install git+https://github.com/NREL/MoorPy@dev
52-
53-
- name: Test run
54-
run: |
55-
cd tests
56-
pytest .
5754
5855
- name: Example run
5956
run: |
6057
cd examples
6158
python example_driver.py false
6259
63-
60+
- name: Test run
61+
run: |
62+
cd tests
63+
pytest .
6464

‎README.md‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1-
# FAModel
1+
# Floating Array Design Toolset
22

3-
The FAModel (or Floating Array Model) package serves as a high-level library for
3+
The Floating Array Design (FAD) Toolset is a collection of tools for
4+
modeling and designing arrays of floating offshore structures. It was
5+
originally designed for floating wind systems but has applicability
6+
for many offshore applications.
7+
8+
A core part of the FAD Toolset is the Floating Array Model (FAModel),
9+
which serves as a high-level library for efficiently
410
modeling a floating wind array. It combines site condition information and a
511
description of the floating array design, and contains functions for evaluating
612
the array's behavior considering the site conditions. For example, it combines

‎examples/01_Visualization/05_visual_lease_boundaries.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99

1010
from famodel import Project
1111
import matplotlib.pyplot as plt
12+
import os
1213

1314
# define name of ontology input file
14-
input_file = '05_visual_lease_boundaries.yaml'
15+
dir = os.path.dirname(os.path.realpath(__file__))
16+
input_file = os.path.join(dir,'05_visual_lease_boundaries.yaml')
1517

1618
# initialize Project class with input file, we don't need RAFT for this so mark False
1719
project = Project(file=input_file,raft=False)

‎examples/01_Visualization/07_3D-visual_platform.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@
77

88
from famodel import Project
99
import matplotlib.pyplot as plt
10+
import os
1011

1112
# define name of ontology input file
12-
input_file = 'examples/01_Visualization/07_3D-visual_platform.yaml'
13+
dir = os.path.dirname(os.path.realpath(__file__))
14+
input_file = os.path.join(dir,'07_3D-visual_platform.yaml')
1315

1416
# initialize Project class with input file, we don't need RAFT for this so mark False
1517
project = Project(file=input_file,raft=True)
1618

1719
# plot
18-
project.plot3d(fowt=True)
20+
project.plot3d(plot_fowt=True)
1921

2022
plt.show()

‎examples/01_Visualization/07_3D-visual_platform.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ platform:
3434
members: # list all members here
3535

3636
- name : center_column # [-] an identifier (no longer has to be number)
37-
type : 2 # [-]
37+
type : rigid # [-]
3838
rA : [ 0, 0, -20] # [m] end A coordinates
3939
rB : [ 0, 0, 15] # [m] and B coordinates
4040
shape : circ # [-] circular or rectangular
4141
gamma : 0.0 # [deg] twist angle about the member's z-axis
42-
potMod : False # [bool] Whether to model the member with potential flow (BEM model) plus viscous drag or purely strip theory
42+
potMod : True # [bool] Whether to model the member with potential flow (BEM model) plus viscous drag or purely strip theory
4343
# --- outer shell including hydro---
4444
stations : [0, 1] # [-] location of stations along axis. Will be normalized such that start value maps to rA and end value to rB
4545
d : 10.0 # [m] diameters if circular or side lengths if rectangular (can be pairs)
@@ -56,13 +56,13 @@ platform:
5656

5757

5858
- name : outer_column # [-] an identifier (no longer has to be number)
59-
type : 2 # [-]
59+
type : rigid # [-]
6060
rA : [51.75, 0, -20] # [m] end A coordinates
6161
rB : [51.75, 0, 15] # [m] and B coordinates
6262
heading : [ 60, 180, 300] # [deg] heading rotation of column about z axis (for repeated members)
6363
shape : circ # [-] circular or rectangular
6464
gamma : 0.0 # [deg] twist angle about the member's z-axis
65-
potMod : False # [bool] Whether to model the member with potential flow (BEM model) plus viscous drag or purely strip theory
65+
potMod : True # [bool] Whether to model the member with potential flow (BEM model) plus viscous drag or purely strip theory
6666
# --- outer shell including hydro---
6767
stations : [0, 35] # [-] location of stations along axis. Will be normalized such that start value maps to rA and end value to rB
6868
d : 12.5 # [m] diameters if circular or side lengths if rectangular (can be pairs)
@@ -82,7 +82,7 @@ platform:
8282

8383

8484
- name : pontoon # [-] an identifier (no longer has to be number)
85-
type : 2 # [-]
85+
type : rigid # [-]
8686
rA : [ 5 , 0, -16.5] # [m] end A coordinates
8787
rB : [ 45.5, 0, -16.5] # [m] and B coordinates
8888
heading : [ 60, 180, 300] # [deg] heading rotation of column about z axis (for repeated members)
@@ -103,7 +103,7 @@ platform:
103103

104104

105105
- name : upper_support # [-] an identifier (no longer has to be number)
106-
type : 2 # [-]
106+
type : rigid # [-]
107107
rA : [ 5 , 0, 14.545] # [m] end A coordinates
108108
rB : [ 45.5, 0, 14.545] # [m] and B coordinates
109109
heading : [ 60, 180, 300] # [deg] heading rotation of column about z axis (for repeated members)

‎examples/01_Visualization/08_3D-visual_turbine.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ topsides:
3636
nBlades : 3 # number of blades
3737
Zhub : 150.0 # hub height [m]
3838
Rhub : 3.97 # hub radius [m]
39-
precone : 4.0 # [deg]
40-
shaft_tilt : 6.0 # [deg]
39+
precone : -4.0 # [deg]
40+
shaft_tilt : -6.0 # [deg]
4141
overhang : -12.0313 # [m]
4242
aeroMod : 1 # 0 aerodynamics off; 1 aerodynamics on
4343

@@ -1059,7 +1059,7 @@ topsides:
10591059
dlsMax : 5.0 # maximum node splitting section amount; can't be 0
10601060

10611061
name : tower # [-] an identifier (no longer has to be number)
1062-
type : 1 # [-]
1062+
type : rigid # [-]
10631063
rA : [ 0, 0, 15] # [m] end A coordinates
10641064
rB : [ 0, 0, 144.582] # [m] and B coordinates
10651065
shape : circ # [-] circular or rectangular
@@ -1085,12 +1085,12 @@ platform:
10851085
members: # list all members here
10861086

10871087
- name : center_column # [-] an identifier (no longer has to be number)
1088-
type : 2 # [-]
1088+
type : rigid # [-]
10891089
rA : [ 0, 0, -20] # [m] end A coordinates
10901090
rB : [ 0, 0, 15] # [m] and B coordinates
10911091
shape : circ # [-] circular or rectangular
10921092
gamma : 0.0 # [deg] twist angle about the member's z-axis
1093-
potMod : False # [bool] Whether to model the member with potential flow (BEM model) plus viscous drag or purely strip theory
1093+
potMod : True # [bool] Whether to model the member with potential flow (BEM model) plus viscous drag or purely strip theory
10941094
# --- outer shell including hydro---
10951095
stations : [0, 1] # [-] location of stations along axis. Will be normalized such that start value maps to rA and end value to rB
10961096
d : 10.0 # [m] diameters if circular or side lengths if rectangular (can be pairs)
@@ -1107,13 +1107,13 @@ platform:
11071107

11081108

11091109
- name : outer_column # [-] an identifier (no longer has to be number)
1110-
type : 2 # [-]
1110+
type : rigid # [-]
11111111
rA : [51.75, 0, -20] # [m] end A coordinates
11121112
rB : [51.75, 0, 15] # [m] and B coordinates
11131113
heading : [ 60, 180, 300] # [deg] heading rotation of column about z axis (for repeated members)
11141114
shape : circ # [-] circular or rectangular
11151115
gamma : 0.0 # [deg] twist angle about the member's z-axis
1116-
potMod : False # [bool] Whether to model the member with potential flow (BEM model) plus viscous drag or purely strip theory
1116+
potMod : True # [bool] Whether to model the member with potential flow (BEM model) plus viscous drag or purely strip theory
11171117
# --- outer shell including hydro---
11181118
stations : [0, 35] # [-] location of stations along axis. Will be normalized such that start value maps to rA and end value to rB
11191119
d : 12.5 # [m] diameters if circular or side lengths if rectangular (can be pairs)
@@ -1133,7 +1133,7 @@ platform:
11331133

11341134

11351135
- name : pontoon # [-] an identifier (no longer has to be number)
1136-
type : 2 # [-]
1136+
type : rigid # [-]
11371137
rA : [ 5 , 0, -16.5] # [m] end A coordinates
11381138
rB : [ 45.5, 0, -16.5] # [m] and B coordinates
11391139
heading : [ 60, 180, 300] # [deg] heading rotation of column about z axis (for repeated members)
@@ -1154,7 +1154,7 @@ platform:
11541154

11551155

11561156
- name : upper_support # [-] an identifier (no longer has to be number)
1157-
type : 2 # [-]
1157+
type : rigid # [-]
11581158
rA : [ 5 , 0, 14.545] # [m] end A coordinates
11591159
rB : [ 45.5, 0, 14.545] # [m] and B coordinates
11601160
heading : [ 60, 180, 300] # [deg] heading rotation of column about z axis (for repeated members)

‎examples/03_Frequency_Domain_Analysis_RAFT/01_platform.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ platform:
2222
members: # list all members here
2323

2424
- name : center_column # [-] an identifier (no longer has to be number)
25-
type : 2 # [-]
25+
type : rigid # [-]
2626
rA : [ 0, 0, -20] # [m] end A coordinates
2727
rB : [ 0, 0, 15] # [m] and B coordinates
2828
shape : circ # [-] circular or rectangular
2929
gamma : 0.0 # [deg] twist angle about the member's z-axis
30-
potMod : False # [bool] Whether to model the member with potential flow (BEM model) plus viscous drag or purely strip theory
30+
potMod : True # [bool] Whether to model the member with potential flow (BEM model) plus viscous drag or purely strip theory
3131
# --- outer shell including hydro---
3232
stations : [0, 1] # [-] location of stations along axis. Will be normalized such that start value maps to rA and end value to rB
3333
d : 10.0 # [m] diameters if circular or side lengths if rectangular (can be pairs)
@@ -44,13 +44,13 @@ platform:
4444

4545

4646
- name : outer_column # [-] an identifier (no longer has to be number)
47-
type : 2 # [-]
47+
type : rigid # [-]
4848
rA : [51.75, 0, -20] # [m] end A coordinates
4949
rB : [51.75, 0, 15] # [m] and B coordinates
5050
heading : [ 60, 180, 300] # [deg] heading rotation of column about z axis (for repeated members)
5151
shape : circ # [-] circular or rectangular
5252
gamma : 0.0 # [deg] twist angle about the member's z-axis
53-
potMod : False # [bool] Whether to model the member with potential flow (BEM model) plus viscous drag or purely strip theory
53+
potMod : True # [bool] Whether to model the member with potential flow (BEM model) plus viscous drag or purely strip theory
5454
# --- outer shell including hydro---
5555
stations : [0, 35] # [-] location of stations along axis. Will be normalized such that start value maps to rA and end value to rB
5656
d : 12.5 # [m] diameters if circular or side lengths if rectangular (can be pairs)
@@ -70,7 +70,7 @@ platform:
7070

7171

7272
- name : pontoon # [-] an identifier (no longer has to be number)
73-
type : 2 # [-]
73+
type : rigid # [-]
7474
rA : [ 5 , 0, -16.5] # [m] end A coordinates
7575
rB : [ 45.5, 0, -16.5] # [m] and B coordinates
7676
heading : [ 60, 180, 300] # [deg] heading rotation of column about z axis (for repeated members)
@@ -91,7 +91,7 @@ platform:
9191

9292

9393
- name : upper_support # [-] an identifier (no longer has to be number)
94-
type : 2 # [-]
94+
type : rigid # [-]
9595
rA : [ 5 , 0, 14.545] # [m] end A coordinates
9696
rB : [ 45.5, 0, 14.545] # [m] and B coordinates
9797
heading : [ 60, 180, 300] # [deg] heading rotation of column about z axis (for repeated members)

0 commit comments

Comments
 (0)