Skip to content

Commit a3a69dc

Browse files
committed
Remove extra getSizeAnchor functions to AnchorDesign_temp.py
-- remove extra getSizeAnchor functions into temp storage in AnchorDesign_temp.py (new file, could eventually turn into a full anchor design script) -- small bug fixes in examples -- resolve remaining conflicts in geography.py
1 parent 261a534 commit a3a69dc

File tree

7 files changed

+771
-4058
lines changed

7 files changed

+771
-4058
lines changed

examples/05_Anchors/anchor_soil_layered.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11

2-
import sys
3-
sys.path.append(r'C:\Code\FAModel_anchors\famodel')
42

5-
from project import Project
6-
from anchors.anchor import Anchor
3+
from famodel import Project
4+
from famodel.anchors.anchor import Anchor
75

86
# Step 1: Initialize and load soil
97
proj = Project()
@@ -44,7 +42,7 @@
4442
line_type=anchor.line_type, d=anchor.d, w=anchor.w,
4543
mass_update=True,
4644
plot=True)
47-
anchor.getCostAnchor()
45+
anchor.getCost()
4846
print(f'Material cost: {anchor.cost["Material cost"]:.2f} USD [2024]')
4947

5048
results = anchor.getSizeAnchor(
@@ -61,7 +59,7 @@
6159
print('\nFinal Optimized Anchor:')
6260
print('Design:', anchor.dd['design'])
6361
print('Capacity Results:', anchor.anchorCapacity)
64-
anchor.getCostAnchor()
62+
anchor.getCost()
6563
print(f'Material cost: {anchor.cost["Material cost"]:.2f} USD [2024]')
6664

6765

examples/05_Anchors/anchor_soil_uniform.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
from project import Project
3-
from anchors.anchor import Anchor
2+
from famodel import Project
3+
from famodel.anchors.anchor import Anchor
44

55
# Step 1: Initialize and load soil
66
proj = Project()
@@ -47,7 +47,7 @@
4747
line_type=anchor.line_type, d=anchor.d, w=anchor.w,
4848
mass_update=True,
4949
plot=True)
50-
anchor.getCostAnchor()
50+
anchor.getCost()
5151
print(f'Material cost: {anchor.cost["Material cost"]:.2f} USD [2024]')
5252

5353
results = anchor.getSizeAnchor(
@@ -63,7 +63,7 @@
6363
print('\nFinal Optimized Anchor:')
6464
print('Design:', anchor.dd['design'])
6565
print('Capacity Results:', anchor.anchorCapacity)
66-
anchor.getCostAnchor()
66+
anchor.getCost()
6767
print(f'Material cost: {anchor.cost["Material cost"]:.2f} USD [2024]')
6868

6969

examples/05_Anchors/anchor_suction.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
print(f'{key}: {value:.2f}')
107107

108108
# --- Step 4: Compute Costs ---
109-
anchor.getCostAnchor()
109+
anchor.getCost()
110110

111111
print(f"Mass: {anchor.anchorCapacity['Weight pile']/9.81:.2f} kg")
112112
print(f"Material unit cost: {anchor.cost['unit_cost']:.2f} USD/kg")
@@ -129,7 +129,7 @@
129129
print('Capacity Results:', anchor.anchorCapacity)
130130

131131
# # --- Step 6: Compute Costs ---
132-
anchor.getCostAnchor()
132+
anchor.getCost()
133133

134134
print(f"Mass: {anchor.anchorCapacity['Weight pile']/9.81:.2f} kg")
135135
print(f"Material unit cost: {anchor.cost['unit_cost']:.2f} USD/kg")

examples/05_Anchors/example_suction.ipynb

Lines changed: 91 additions & 3289 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)