Merge remote-tracking branch 'origin/main' into new_base

Author: lsirkis

famodel/mooring/mooring.py

@@ -279,7 +279,7 @@ def reposition(self, r_center=None, heading=None, project=None,
         # heading 2D unit vector
         u = np.array([np.cos(phi), np.sin(phi)])
 
-        if np.any(r_center):
+        if r_center is not None:
             if self.shared == 1:
                 r_centerA = np.array(r_center)[0]
                 r_centerB = np.array(r_center)[1]

famodel/project.py

@@ -4260,9 +4260,6 @@ def unload(self,file='project.yaml'):
         for i,anch in enumerate(self.anchorList.values()):  
             newanch = True
             name = anch.dd['name'] if 'name' in anch.dd else str(len(anchConfigs))
-            if len(anch.attachments)>1:
-                # shared anchor, add to arrayAnch list
-                arrayAnch.append([anch.id,name,anch.r[0],anch.r[1],0])
             # add mass if available
             aad = deepcopy(anch.dd['design'])
             if anch.mass is not None and anch.mass>0:
@@ -4276,6 +4273,9 @@ def unload(self,file='project.yaml'):
                     name = ac[0] # reset name to matching config name
             if newanch:
                 anchConfigs[name] = aad
+            if len(anch.attachments)>1:
+                # shared anchor, add to arrayAnch list
+                arrayAnch.append([anch.id,name,anch.r[0],anch.r[1],0])
 
             mapAnchNames[anch.id] = name
 
@@ -4378,15 +4378,15 @@ def unload(self,file='project.yaml'):
                         if fairleads:
                             # append mooring line to array_moor section
                             arrayMoor.append([current_config, 
-                                              mapAnchNames[atts[is_anch][0].id], 
-                                              moor.attached_to[1].id, 
+                                              atts[0].id, 
+                                              atts[1].id, 
                                               'None',
                                               flB])
                         else:
                             # append mooring line to array_moor section
                             arrayMoor.append([current_config,
-                                              mapAnchNames[atts[is_anch][0].id], 
-                                              moor.attached_to[1].id])
+                                              atts[0].id, 
+                                              atts[1].id])
                     else:
                         # not shared anchor or shared mooring, add line to mooring system 
                         if fairleads: