Skip to content

Commit b6757eb

Browse files
committed
Making sure all hyperlinks and names reference 'fad' instead of 'famodel'
1 parent f532b29 commit b6757eb

File tree

10 files changed

+26
-27
lines changed

10 files changed

+26
-27
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ and designs.
3737
See example use cases in our [examples](./examples/README.md) folder.
3838

3939
For working with the library, it is important to understand the floating array
40-
model structure, which is described more [here](./famodel/README.md).
40+
model structure, which is described more [here](./fad/README.md).
4141

4242

4343
## Installation
@@ -121,7 +121,7 @@ Please navigate into the subfolders above for additional information.
121121
The easiest way to create a FAD project is to provide the array
122122
information in an ontology yaml file. FAD has been designed
123123
to work with a specific ontology yaml setup, which is described
124-
in detail in the [Ontology ReadMe](./famodel/ontology/README.md).
124+
in detail in the [Ontology ReadMe](./fad/ontology/README.md).
125125

126126
For examples of ontologies and driver files of common use cases,
127127
we recommend starting with the numbered examples in the examples folder.
@@ -133,15 +133,15 @@ in the ontology.
133133
To see an example with all use cases, the [example driver file](./examples/example_driver.py) creates a FAD Project
134134
object from a pre-set ontology file and shows the syntax and outputs of
135135
various capabilities. For guidance on creating your own ontology yaml file,
136-
it is recommended to read through the [Ontology ReadMe](./famodel/ontology/README.md),
136+
it is recommended to read through the [Ontology ReadMe](./fad/ontology/README.md),
137137
then either adapt one of the ontology samples or fill in the ontology template.
138138

139-
The [core model readme](./famodel/README.md) describes the Project class structure,
139+
The [core model readme](./fad/README.md) describes the Project class structure,
140140
as well as the properties and methods of each component class.
141141

142142
There are some limited helper functions to automatically fill in sections
143143
of a yaml from a MoorPy system or a list of platform locations.
144-
See [helpers](./famodel/helpers.py) for the full list of yaml writing capabilities.
144+
See [helpers](./fad/helpers.py) for the full list of yaml writing capabilities.
145145

146146

147147
## Authors

examples/01_Visualization/02_visual_moorings.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,6 @@ anchor_types:
8484
drag-embedment1:
8585
type : DEA # type of anchor (drag-embedment anchor)
8686
# additional anchor properties can be defined here, such as d (diameter), m (mass), etc., but are not required for visualization
87-
# To see the full list of anchor properties and anchor types, refer to the anchor readme (famodel/anchors/README.md)
87+
# To see the full list of anchor properties and anchor types, refer to the anchor readme (fad/anchors/README.md)
8888

8989

examples/01_Visualization/03_visual_cables.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ array_cables:
4444
# headingB: compass heading of dynamic cable relative to platform heading (if platform at end B is rotated +15, headingB should be true heading - 15)
4545
# In this case, we have a cable coming into fowt1 from fowt0 from the West, so headingB is 270 deg
4646
# For the 2nd cable from fowt1 to fowt2, the cable comes into fowt2 from the West, so headingB is also 270 deg
47-
# cableType: references a cable type from cable_types section or from famodel/cables/cableProps_default.yaml static cables.
47+
# cableType: references a cable type from cable_types section or from fad/cables/cableProps_default.yaml static cables.
4848
# If no static cable (i.e. a suspended cable design), put NONE
4949
# In this case, we have no static cable for the 1st cable because it is suspended,
50-
# but the 2nd cable has a static cable defined in famodel/cables/cableProps_default.yaml called 'static_cable_66'.
50+
# but the 2nd cable has a static cable defined in fad/cables/cableProps_default.yaml called 'static_cable_66'.
5151
data:
5252
- [ fowt0, fowt1, suspended_1, None, 90, 270, None] # suspended cable, so only one dynamic cable configuration, no static cable
5353
- [ fowt1, fowt2, lazy_wave1, lazy_wave1, 90, 270, static_cable_66]
@@ -60,11 +60,11 @@ dynamic_cable_configs:
6060
voltage: 66 # [kV]
6161
span : 195 # [m] horizontal distance to end of dynamic cable from attachment point
6262
A: 300 # cable conductor area [mm^2]
63-
cable_type: dynamic_cable_66 # ID of a cable section type from famodel/cables/cableProps_default.yaml. Cable props loaded automatically from this!
63+
cable_type: dynamic_cable_66 # ID of a cable section type from fad/cables/cableProps_default.yaml. Cable props loaded automatically from this!
6464
length: 353.505 # [m] length (unstretched)
6565

6666
sections:
67-
- type: Buoyancy_750m # name of buoy type from famodel/cables/cableProps_default.yaml - buoy design info read in automatically from this!
67+
- type: Buoyancy_750m # name of buoy type from fad/cables/cableProps_default.yaml - buoy design info read in automatically from this!
6868
L_mid: 200 # [m] length of cable to the midpoint of the buoyancy section from platform connection
6969
N_modules: 6 # number of buoyancy modules
7070
spacing: 11.23 # [m] distance between module centers
@@ -75,7 +75,7 @@ dynamic_cable_configs:
7575
name: Dynamic suspended cable configuration 1
7676
voltage: 33 # [kV]
7777
span: 1512 # [m] horizontal distance to end of dynamic cable from attachment point
78-
cable_type: dynamic_cable_66 # ID of a cable section type from famodel/cables/cableProps_default.yaml. Cable props loaded automatically from this!
78+
cable_type: dynamic_cable_66 # ID of a cable section type from fad/cables/cableProps_default.yaml. Cable props loaded automatically from this!
7979
A: 300 # cable conductor area [mm^2]
8080
length: 1650 # [m] length (unstretched)
8181

examples/02_Mooring_Analysis_MoorPy/02_moorings_cables.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ dynamic_cable_configs:
7676
voltage: 66 # [kV]
7777
span : 195 # [m] horizontal distance to end of dynamic cable from attachment point
7878
A: 300 # cable conductor area [mm^2]
79-
cable_type: dynamic_cable_66 # ID of a cable section type from famodel/cables/cableProps_default.yaml. Cable props loaded automatically from this!
79+
cable_type: dynamic_cable_66 # ID of a cable section type from fad/cables/cableProps_default.yaml. Cable props loaded automatically from this!
8080
length: 353.505 # [m] length (unstretched)
8181
rJTube : 5 # [m] radial distance from center of platform that J-tube is located, can be used instead of a J-tube designation in the platform description
8282

8383
sections:
84-
- type: Buoyancy_750m # name of buoy type from famodel/cables/cableProps_default.yaml - buoy design info read in automatically from this!
84+
- type: Buoyancy_750m # name of buoy type from fad/cables/cableProps_default.yaml - buoy design info read in automatically from this!
8585
L_mid: 200 # [m] length of cable from platform connection to midpoint of buoyancy section
8686
N_modules: 6 # number of buoyancy modules
8787
spacing: 11.23 # [m] spacing between buoyancy modules
@@ -92,7 +92,7 @@ dynamic_cable_configs:
9292
name: Dynamic suspended cable configuration 1
9393
voltage: 33 # [kV]
9494
span: 1512 # [m]
95-
cable_type: dynamic_cable_66 # ID of a cable section type from famodel/cables/cableProps_default.yaml. Cable props loaded automatically from this!
95+
cable_type: dynamic_cable_66 # ID of a cable section type from fad/cables/cableProps_default.yaml. Cable props loaded automatically from this!
9696
A: 300 # cable conductor area [mm^2]
9797
length: 1500 # [m] length (unstretched)
9898
rJTube : 58 # [m] radial distance from center of platform that J-tube is located

examples/02_Mooring_Analysis_MoorPy/04_array-watch-circle.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ dynamic_cable_configs:
8181
voltage: 66 # [kV]
8282
span : 195 # [m] horizontal distance to end of dynamic cable from attachment point
8383
A: 300 # cable conductor area [mm^2]
84-
cable_type: dynamic_cable_66 # ID of a cable section type from famodel/cables/cableProps_default.yaml. Cable props loaded automatically from this!
84+
cable_type: dynamic_cable_66 # ID of a cable section type from fad/cables/cableProps_default.yaml. Cable props loaded automatically from this!
8585
length: 353.505 # [m] length (unstretched)
8686
rJTube : 5 # [m] radial distance from center of platform that J-tube is located
8787

8888
sections:
89-
- type: Buoyancy_750m # name of buoy type from famodel/cables/cableProps_default.yaml - buoy design info read in automatically from this!
89+
- type: Buoyancy_750m # name of buoy type from fad/cables/cableProps_default.yaml - buoy design info read in automatically from this!
9090
L_mid: 200 # [m] from platform connection
9191
N_modules: 6
9292
spacing: 11.23 # [m]
@@ -97,7 +97,7 @@ dynamic_cable_configs:
9797
name: Dynamic suspended cable configuration 1
9898
voltage: 33 # [kV]
9999
span: 1512 # [m]
100-
cable_type: dynamic_cable_66 # ID of a cable section type from famodel/cables/cableProps_default.yaml. Cable props loaded automatically from this!
100+
cable_type: dynamic_cable_66 # ID of a cable section type from fad/cables/cableProps_default.yaml. Cable props loaded automatically from this!
101101
A: 300 # cable conductor area [mm^2]
102102
length: 1500 # [m] length (unstretched)
103103
rJTube : 58 # [m] radial distance from center of platform that J-tube is located

examples/02_Mooring_Analysis_MoorPy/05_moorings_cables_marine_growth.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ dynamic_cable_configs:
8484
voltage: 66 # [kV]
8585
span : 195 # [m] horizontal distance to end of dynamic cable from attachment point
8686
A: 300 # cable conductor area [mm^2]
87-
cable_type: dynamic_cable_66 # ID of a cable section type from famodel/cables/cableProps_default.yaml. Cable props loaded automatically from this!
87+
cable_type: dynamic_cable_66 # ID of a cable section type from fad/cables/cableProps_default.yaml. Cable props loaded automatically from this!
8888
length: 353.505 # [m] length (unstretched)
8989
rJTube : 5 # [m] radial distance from center of platform that J-tube is located, can be used instead of a J-tube designation in the platform description
9090

9191
sections:
92-
- type: Buoyancy_750m # name of buoy type from famodel/cables/cableProps_default.yaml - buoy design info read in automatically from this!
92+
- type: Buoyancy_750m # name of buoy type from fad/cables/cableProps_default.yaml - buoy design info read in automatically from this!
9393
L_mid: 200 # [m] length of cable from platform connection to midpoint of buoyancy section
9494
N_modules: 6 # number of buoyancy modules
9595
spacing: 11.23 # [m] spacing between buoyancy modules
@@ -100,7 +100,7 @@ dynamic_cable_configs:
100100
name: Dynamic suspended cable configuration 1
101101
voltage: 33 # [kV]
102102
span: 1512 # [m]
103-
cable_type: dynamic_cable_66 # ID of a cable section type from famodel/cables/cableProps_default.yaml. Cable props loaded automatically from this!
103+
cable_type: dynamic_cable_66 # ID of a cable section type from fad/cables/cableProps_default.yaml. Cable props loaded automatically from this!
104104
A: 300 # cable conductor area [mm^2]
105105
length: 1500 # [m] length (unstretched)
106106
rJTube : 58 # [m] radial distance from center of platform that J-tube is located

examples/04_Geography/example_geography.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"source": [
5454
"from pyproj.aoi import AreaOfInterest\n",
5555
"from pyproj.database import query_utm_crs_info\n",
56-
"import famodel.geography as geo\n",
56+
"import fad.geography as geo\n",
5757
"\n",
5858
"target_crs = geo.getTargetCRS([-125, -124], [40, 41])"
5959
]

examples/08_Design_Adjustment/02_Jtubes.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ dynamic_cable_configs:
3939
voltage: 66 # [kV]
4040
span : 195 # [m] horizontal distance to end of dynamic cable from attachment point
4141
A: 300 # cable conductor area [mm^2]
42-
cable_type: dynamic_cable_66 # ID of a cable section type from famodel/cables/cableProps_default.yaml. Cable props loaded automatically from this!
42+
cable_type: dynamic_cable_66 # ID of a cable section type from fad/cables/cableProps_default.yaml. Cable props loaded automatically from this!
4343
length: 353.505 # [m] length (unstretched)
4444

4545
sections:
46-
- type: Buoyancy_750m # name of buoy type from famodel/cables/cableProps_default.yaml - buoy design info read in automatically from this!
46+
- type: Buoyancy_750m # name of buoy type from fad/cables/cableProps_default.yaml - buoy design info read in automatically from this!
4747
L_mid: 200 # [m] from platform connection
4848
N_modules: 6
4949
spacing: 11.23 # [m]
@@ -54,7 +54,7 @@ dynamic_cable_configs:
5454
name: Dynamic suspended cable configuration 1
5555
voltage: 33 # [kV]
5656
span: 1512 # [m]
57-
cable_type: dynamic_cable_66 # ID of a cable section type from famodel/cables/cableProps_default.yaml. Cable props loaded automatically from this!
57+
cable_type: dynamic_cable_66 # ID of a cable section type from fad/cables/cableProps_default.yaml. Cable props loaded automatically from this!
5858
A: 300 # cable conductor area [mm^2]
5959
length: 1650 # [m] length (unstretched)
6060

fad-env.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: famodel-env
1+
name: fad-env
22
channels:
33
- conda-forge
44
- defaults

fad/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
from fad.project import Project
33
from fad.mooring.mooring import Mooring
44
from fad.platform.platform import Platform
5-
from fad.anchors.anchor import Anchor
6-
#from famodel.geography import *
5+
from fad.anchors.anchor import Anchor

0 commit comments

Comments
 (0)