Updates for loading and unloading cable info

-- update to load in of 3D cable design from addCablesConnections to match new cable appendage storage method
-- update to unload function to properly unload cable appendage info. Relevant for cost calcs

Author: lsirkis

famodel/helpers.py

@@ -431,24 +431,36 @@ def getCableDD(dd,selected_cable,cableConfig,cableType_def,connVal):
             dd['joints'].append({'cost':joint_cost}) # default 0
 
         # add routing if necessary
-        if dd['cables'][j]['type']=='static':
+        if 'static' in dd['cables'][j]['cable_type']:
             cd['routing'] = []
             # if len(connDict[i]['coordinates'])>2:
             #     for coord in connDict[i]['coordinates'][1:-1]:
             #         cd['routing'].append(coord)
             cableType = 'static_cable_'+cableType_def[-2:]
         else:
             cableType = 'dynamic_cable_'+cableType_def[-2:]
+            Acondd, jAcondd = getDynamicCables(cableConfig['cableTypes'][selected_cable['sections'][j]],
+                                               cableConfig['cableTypes'],
+                                               cableConfig['cableAppendages'],
+                                               depth
+                                               )
+            cd.update(Acondd)
             cd['rJTube'] = 5
+            # for now reset these back
+            cd['A'] = selected_cable['A']
+            cd['z_anch'] = -depth
+            # if dd['connector_cost']:
+            #     cd['appendages'] = [{'type:'cable_connector',
+            #                          'cost':dd['connector_cost']}]
 
 
-        if not 'cable_type' in cd or not cd['cable_type']:
+        if not 'cable_type' in cd or not isinstance(cd['cable_type'],dict):
             cp = loadCableProps(None)
             cabProps = getCableProps(connVal['conductor_area'],cableType,cableProps=cp)
             # fix units
             cabProps['power'] = cabProps['power']*1e6
             cd['cable_type'] = cabProps
-
+            
         cd['cable_type']['name'] = selected_cable['sections'][j]
 
     return(dd)
@@ -572,15 +584,15 @@ def getCableDesign(connVal, cableType_def, cableConfig, configType, depth=None):
     # else:
     #     raise Exception(f"No cable matching the selection criteria found for cable {connVal['cable_id']}")   
     dd = getCableDD(dd,selected_cable,cableConfig,cableType_def,connVal) 
-    i_dc = [i for i,sec in enumerate(dd['cables']) if sec['type']=='dynamic']         
+    i_dc = [i for i,sec in enumerate(dd['cables']) if 'dynamic' in sec['cable_type']]         
     dd['name'] = cableType_def
     dc_cands = []
     # pull out the dc definitions of candidate cables
     for cand in cable_candidates:
         cand = dict(cand)
         for sec in cand['sections']:
             typedef = cableConfig['cableTypes'][sec]
-            if typedef['type']=='dynamic' and typedef not in dc_cands:
+            if 'dynamic' in typedef['cable_type'] and typedef not in dc_cands:
                 dc_cands.append(cableConfig['cableTypes'][sec])
     for i in i_dc:
         dd['cables'][i] = cableDesignInterpolation(

famodel/project.py

@@ -4780,10 +4780,19 @@ def unload(self,file='project.yaml'):
                             ctn = 'dyn_cab_'+str(cIdx)
                     # collect buoyancy sections (and appendages) info if applicable
                     bs = []
+                    ac = 0
                     if 'appendages' in sub.dd:
                         for app in sub.dd['appendages']:
                             if not app['type'] in appendageTypes:
                                 appendageTypes[app['type']] = app
+                            elif appendageTypes[app['type']] != app:
+                                # adjust new name
+                                app['type'] = app['type']+'_'+str(ac)
+                                while app['type'] in appendageTypes and appendageTypes[app['type']] != app:
+                                    ac += 1
+                                    app['type'] = app['type'][:-1]+str(ac)
+                                appendageTypes[app['type']] = app
+                                
                             bs.append({'type':app['type']})
                     if 'buoyancy_sections' in sub.dd:
                         for b in sub.dd['buoyancy_sections']: