Fix tests/test_anchors.py after merge edits

Author: Moreno

tests/test_anchors.py

@@ -5,7 +5,6 @@
 import matplotlib.pyplot as plt
 import pytest
 
-<<<<<<< HEAD
 # --- Helper goes at module level ---
 def assign_soil(anchor, soil_label, project):
     soil_def = project.soilProps[soil_label]
@@ -20,13 +19,8 @@ def assign_soil(anchor, soil_label, project):
     anchor.setSoilProfile(profile_map)
     anchor.profile_name = 'CPT_Assigned'
 
-
-def test_anchor_loads():
-    # load in famodel project 
-=======
 @pytest.fixture
 def project():
->>>>>>> dev
     dir = os.path.dirname(os.path.realpath(__file__))
     return(Project(file=os.path.join(dir,'testOntology.yaml'), raft=False))
 
@@ -45,7 +39,6 @@ def test_anchor_loads(project):
     Vm = anch.loads.get('Vm')
     zlug = anch.dd['design']['zlug']
 
-<<<<<<< HEAD
     # Compute lug loads
     _, Ha, Va = anch.getLugForces(Hm, Vm, zlug, plot=False)
     anch.loads['Ha'] = Ha
@@ -56,10 +49,7 @@ def test_anchor_loads(project):
     assert 'Hm' in anch.loads
     assert anch.loads['Ha'] != anch.loads['Hm']
 
-def test_anchor_capacities():
-=======
 def test_anchor_capacities(project):
->>>>>>> dev
     # load in famodel project (suction pile anchor)
     project.getMoorPyArray(cables=1)
     anch = project.anchorList['FOWT1a']