Corrosion/creep/MG updated #2/2

-- update marine growth to work with state process
   - mooring.addMarineGrowth() now contains while loop to adjust change depths for settling instead of project.getMarineGrowth
-- added mooring.applied_states dictionary which lists the applied states as keys (i.e. marine_growth, corrosion) and the settings for these states as values (i.e. mg dict list)
-- add mooring.reset() to reset the mooring.ss to pristine values and clear the applied_states property
-- update tests and examples to not use ss_mod
-- add reset() at beginning of updateDesign in lineDesign to clear out any corrosion etc applied in previous iterations
-- removed while loop from project.getMarineGrowth() since this is now done in the cable and mooring methdos
-- added dynamicCable.applied_states similar to mooring, but only key currently is 'marine_growth'

Author: lsirkis

examples/example_driver.py

@@ -21,6 +21,7 @@
 from famodel.project import Project
 import os
 import matplotlib.pyplot as plt
+from copy import deepcopy
 
 # set yaml file location and name
 dir = os.path.dirname(os.path.realpath(__file__))
@@ -32,7 +33,7 @@
 # create project object
 project = Project(file=ontology_file, raft=False)
 # create moorpy system of the array, include cables in the system
-project.getMoorPyArray(cables=True)
+project.getMoorPyArray()
 # plot in 3d, using moorpy system for the mooring and cable plots
 project.plot2d()
 project.plot3d()
@@ -102,11 +103,12 @@
 #### add marine growth to the mooring lines and cables ####
 print('\nAdding marine growth\n')
 # marine growth dictionary is read in from YAML, see Ontology ReadMe for description
+reg_line_d = deepcopy(project.mooringList['FOWT1a'].ss.lineList[1].type['d_nom'])
 project.getMarineGrowth(display=False)
 # moorpy system lines with marine growth are stored in the respective objects under ss_mod (pristine lines are stored under ss)
 # check the difference in nominal diameter for a given line:
-reg_line_d = project.mooringList['FOWT1a'].ss.lineList[1].type['d_nom']
-mg_line_d = project.mooringList['FOWT1a'].ss_mod.lineList[-1].type['d_nom']
+mg_line_d = project.mooringList['FOWT1a'].ss.lineList[-1].type['d_nom']
+
 print('\nPristine line polyester nominal diameter just below surface: ',reg_line_d)
 print('Marine growth line polyester nominal diameter just below surface: ',mg_line_d)
 

famodel/cables/dynamic_cable.py

@@ -113,6 +113,9 @@ def __init__(self, id, dd=None, subsystem=None, rA=[0,0,0], rB=[0,0,0],
         # alternate designs to interpolate between when depth changes
         self.alternate_designs = None
 
+        # dict of states applied to this Cable object subsystem
+        self.applied_states = {'marine_growth':None}
+        
         # Dictionaries for addition information
         self.loads = {}
         self.safety_factors = {} # calculated safety factor
@@ -121,6 +124,7 @@ def __init__(self, id, dd=None, subsystem=None, rA=[0,0,0], rB=[0,0,0],
         self.cost = {}
         self.failure_probability = {}
 
+        
 
     def makeCableType(self,cabDict):
         '''
@@ -437,7 +441,7 @@ def updateTensions(self):
 
         return(self.loads['TAmax'],self.loads['TBmax'])
 
-    def createSubsystem(self, case=0,pristine=True,dd=None):
+    def createSubsystem(self, case=0, dd=None):
         ''' Creates a subsystem for cable and buoyancy section(s) configuration from the design dictionary
         
         Parameters
@@ -472,12 +476,12 @@ def createSubsystem(self, case=0,pristine=True,dd=None):
         # If no buoyancy sections, it's just one section of the bare cable
         if not 'buoyancy_sections' in dd or not dd['buoyancy_sections']:
             #self.dd['sections'].append({'type':self.cableType,'length':self.L})
-            types.append(cableType)
+            types.append(deepcopy(cableType))
             lengths.append(self.L) 
 
         if 'sections' in dd and dd['sections']: # this will be the case for marine growth or possibly other cases
             for i, sec in enumerate(dd['sections']):
-                types.append(sec['type'])
+                types.append(deepcopy(sec['type']))
                 lengths.append(sec['length'])
         elif 'buoyancy_sections' in dd:       
             # Parse buoyancy sections to compute their properties and all lengths
@@ -609,14 +613,12 @@ def createSubsystem(self, case=0,pristine=True,dd=None):
 
 
         # save it in the object
-        if pristine:
-            self.ss = ss
-            return(self.ss)
-        else:
-            self.ss_mod = ss
-            return(self.ss_mod)
+        self.ss = ss
+        return(self.ss)
 
-    def addMarineGrowth(self, mgDict, buoy_mg, updateDepths=False,tol=2):
+    def addMarineGrowth(self, mgDict, buoy_mg, 
+                        updateDepths=False, tol=2, 
+                        starting_ss=None, display=False):
         '''Creates a new design dictionary (does not overwrite old one) to account for marine 
         growth on the subystem, then calls createSubsystem() to recreate the cable
 
@@ -647,12 +649,11 @@ def addMarineGrowth(self, mgDict, buoy_mg, updateDepths=False,tol=2):
             List of cutoff depths the changePoints should be located at
 
         '''
-        def getMG(mgDict, buoy_mg):
+        def getMG(mgDict, buoy_mg, oldLine=None):
             # create a reference subsystem if it doesn't already exist
-            if not self.ss:
-                self.createSubsystem(pristine=1)
-            # set location of reference subsystem
-            oldLine = self.ss
+            if not oldLine:
+                oldLine = self.createSubsystem(pristine=1)
+
             # set up variables
             LTypes = [] # list of line types for new lines (types listed are from reference object)
             Lengths = [] # lengths of each section for new line
@@ -940,22 +941,27 @@ def getMG(mgDict, buoy_mg):
 
             # call createSubsystem() to make moorpy subsystem with marine growth
             if self.shared>0:
-                self.createSubsystem(case=int(self.shared),dd=nd1,pristine=0)
+                self.createSubsystem(case=int(self.shared),dd=nd1)
             else:
-                self.createSubsystem(dd=nd1,pristine=0)
+                self.createSubsystem(dd=nd1)
 
             return(changeDepths,changePoints)
 
         ############################################################################################################################
+        if starting_ss:
+            ss = deepcopy(starting_ss)
+        else:
+            ss = deepcopy(self.ss)
+            
         if updateDepths:
             mgDict1 = deepcopy(mgDict)
             cEq = tol + 1 
             ct = 0
             while(cEq>tol):
-                changeDepths,changePoints = getMG(mgDict1, buoy_mg)
+                changeDepths,changePoints = getMG(mgDict1, buoy_mg, oldLine=ss)
                 D = []
                 for d in range(0,len(changeDepths)):
-                    diff = mgDict[changeDepths[d][0]][changeDepths[d][1]] - self.ss_mod.pointList[changePoints[d]].r[2]
+                    diff = mgDict[changeDepths[d][0]][changeDepths[d][1]] - self.ss.pointList[changePoints[d]].r[2]
                     D.append(diff)
                 cEq = np.mean(D)
                 # adjust depth to change based on difference between actual and desired change depth
@@ -968,14 +974,17 @@ def getMG(mgDict, buoy_mg):
                             elif (ct >= 4 and ct < 9) or abs(cEq)>=12:
                                 # could be ping-ponging between two different things, try adding half
                                 mgDict1[j][k] = mgDict1[j][k] + 0.5*cEq
-                print('average difference between expected and actual change depth is: ',cEq)
+                if display == True:
+                    print('average difference between expected and actual change depth is: ',cEq)
                 if ct > 10:
                     print('Could not meet tolerance in 10 attempts. Exiting loop')
                     break
                 ct += 1
         else:
-            changeDepths,changePoints = getMG(mgDict, buoy_mg)
-            return(changeDepths,changePoints)
+            changeDepths,changePoints = getMG(mgDict, buoy_mg, oldLine=ss)
+            
+        self.applied_states['marine_growth'] = mgDict
+        return(changeDepths,changePoints)
 
 
 

famodel/design/LineDesign.py

@@ -519,6 +519,9 @@ def updateDesign(self, X, display=0, display2=0, normalized=True):
         '''
         start_time = time.time()
 
+        # reset modifiers to mooring design (corrosion/creep/marine_growth)
+        self.reset()
+
         # Design vector error checks
         if len(X)==0:                   # if any empty design vector is passed (useful for checking constraints quickly)
             return