Skip to content

Commit 3d44b0d

Browse files
committed
Move files to directory structure, remove copilot explaination from docs
1 parent bd567de commit 3d44b0d

39 files changed

+13031
-8045
lines changed

famodel/installation/01_unload4installation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
conceptName = "3_ILIA_al[cr]_grd"
3434

3535
# FILE LOCATIONS
36-
filePath = os.path.dirname(os.path.abspath(__file__))
36+
filePath = os.path.join(os.path.dirname(os.path.abspath(__file__)), "input_files")
3737
inputFile = os.path.join(filePath, category, f"{conceptName}.yaml")
3838

3939
# Load the design

famodel/installation/02_load4installation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
conceptName = "3_ILIA_al[cr]_grd"
3131

3232
# FILE LOCATIONS
33-
filePath = os.path.dirname(os.path.abspath(__file__))
33+
filePath = os.path.join(os.path.dirname(os.path.abspath(__file__)), "input_files")
3434
inputFile = os.path.join(filePath, category, f"proj_{conceptName}.yaml")
3535
mtricFile = os.path.join(filePath, category, f"{conceptName}_mtr.xlsx")
3636
windFile = os.path.join(filePath, "sites/wind_data/humboldt_rose_1.csv")

famodel/installation/03_step1_materialItems.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def create_mtrlPkg(moor):
8989

9090
# FILE LOCATIONS
9191
filePath = os.path.dirname(os.path.abspath(__file__))
92-
inputFile = os.path.join(filePath, category, f"proj_{conceptName}.yaml")
92+
inputFile = os.path.join(filePath, "input_files", category, f"proj_{conceptName}.yaml")
9393

9494
# Load project
9595
proj = Project(file=inputFile)
@@ -99,6 +99,6 @@ def create_mtrlPkg(moor):
9999
for moor in proj.mooringList.values():
100100
mtrlPkgs.append(create_mtrlPkg(moor))
101101

102-
output = os.path.join(filePath, "mtrlPkgs.pkl") # TODO: make intermediate files saved to a separate folder
102+
output = os.path.join(filePath, "temp_files", "mtrlPkgs.pkl") # TODO: make intermediate files saved to a separate folder
103103
with open(output, 'wb') as f:
104104
pickle.dump(mtrlPkgs, f)

famodel/installation/04_step2_actionItems.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727

2828
# FILE LOCATIONS
2929
filePath = os.path.dirname(os.path.abspath(__file__))
30-
itemFile = os.path.join(filePath, "mtrlPkgs.pkl")
30+
itemFile = os.path.join(filePath, "temp_files", "mtrlPkgs.pkl")
3131

3232
with open(itemFile, 'rb') as f:
3333
pkgs = pickle.load(f)
3434

35-
vesselFile = os.path.join(filePath, "vesselDesc.yaml")
35+
vesselFile = os.path.join(filePath, "input_files/agent_yamls", "vesselDesc.yaml")
3636
vesselNames = ['AHTS']
3737

3838
with open(vesselFile) as file:

0 commit comments

Comments
 (0)