setCorrosion, setCreep are now changing the subsystem. Bug fixes in LineDesign:

- Breaking the link between subcomponents and dd in CreateSubsystem
- Fixing Update function in LineDesign so we update both dd and subsystem.
- we set up corrosion and creep as absolute values by pulling from the nominal dd and applying changes to those.
- other fixes

Author: Yuksel-Rudy

famodel/design/LineDesign.py

@@ -605,9 +605,11 @@ def updateDesign(self, X, display=0, display2=0, normalized=True):
                                   name=i, lineProps=self.lineProps)
                     # use the update method to preserve refs to the original dict - this 'points'/connects to the subsystem object too!
                     self.dd['subcomponents'][2*i+1]['type'].update(lineType)
-            
+                    # update the ss as well
+                    self.ss.lineList[i].type.update(lineType)
+                    
             # apply corrosion to the mooring's MBL dictionary (which gets references in the getTenSF constraint in subsystem)
-            self.addCorrosion(corrosion_mm=self.corrosion_mm)
+            self.setCorrosion(corrosion_mm=self.corrosion_mm)
 
             # update the intermediate points if they have any weight or buoyancy
             for i in range(self.nLines-1):

famodel/mooring/README.md

@@ -110,8 +110,11 @@ Re-creates sections part of design dictionary to account for marine growth on th
 
 
 
-### addCorrosion
-Calculates MBL of chain line with corrosion included
+### setCorrosion
+Calculates MBL of chain line with corrosion included for those lines that have a corrosion_rate feature in their MoorProps dictionary.
+
+### setCreep
+Elongates the length of a line that has a creep_rate feature in its MoorProps dictionary.
 
 ### getEnvelope
 Computes the motion envelope of the Mooring based on the watch 

famodel/mooring/mooring.py

@@ -208,14 +208,6 @@ def __init__(self, dd=None, subsystem=None, anchor=None,
         }
 
         self.raftResults = {}
-    
-    def init_mod(self):
-        '''
-        Initialize the modified subsystem (ss_mod) as a deep copy of the pristine subsystem (ss).
-        '''
-        if self.ss_mod is None and self.ss is not None:
-            self.ss_mod = deepcopy(self.ss)
-            self.dd_mod = deepcopy(self.dd)
 
     def update(self, dd=None):
         '''Update the Mooring object based on the current state of the design
@@ -620,7 +612,7 @@ def createSubsystem(self, case=0, pristine=True, dd=None, ms=None):
             # run through each line section and collect the length and type
             for sec in secs:
                 lengths.append(sec['L'])
-                types.append(sec['type']) # list of type names
+                types.append(deepcopy(sec['type'])) # list of type names
 
 
             # make the lines and set the points 
@@ -892,11 +884,11 @@ def updateState(self, stateDict):
 
         # 2. Apply creep if specified
         if stateDict.get('creep', False):
-            self.addCreep(years)
+            self.setCreep(years)
 
         # 3. Apply corrosion if specified
         if stateDict.get('corrosion', False):
-            self.addCorrosion(years)        
+            self.setCorrosion(years)        
 
         # 4. Apply marine growth if specified
         if 'marineGrowth' in stateDict:
@@ -936,10 +928,7 @@ def addMarineGrowth(self, mgDict):
         if not self.ss:
             self.createSubsystem()     
 
-        if not self.ss_mod:
-            oldLine = self.ss
-        else:
-            oldLine = self.ss_mod
+        oldLine = self.ss
 
         # set up variables
         LTypes = [] # list of line types for new lines (types listed are from reference object)
@@ -1183,10 +1172,7 @@ def addMarineGrowth(self, mgDict):
         # self.connectorList = connList
 
         # fill out rest of new design dictionary
-        if self.ss_mod:
-            nd1 = deepcopy(self.dd_mod)
-        else:
-            nd1 = deepcopy(self.dd)
+        nd1 = deepcopy(self.dd)
 
         nd1['subcomponents'] = [None]*(len(nd)*2+1)
         for i in range(len(nd)):
@@ -1203,10 +1189,10 @@ def addMarineGrowth(self, mgDict):
         return(changeDepths,changePoints)
 
 
-    def addCorrosion(self, years=25, corrosion_rate=None, corrosion_mm=None):
+    def setCorrosion(self, years=25, corrosion_rate=None, corrosion_mm=None):
         '''
-        Reduces MBL of lines that have the 'corrosion_rate' feature in their MoorProps description (e.g. chain).
-        These changes take effect in the ss_mod subsystem.
+        Reduces MBL of lines that have the 'corrosion_rate' feature in 
+        their MoorProps description (e.g. chain).
         
         Parameters
         ----------
@@ -1221,13 +1207,13 @@ def addCorrosion(self, years=25, corrosion_rate=None, corrosion_mm=None):
         If neither corrosion_rate nor corrosion_mm are given, the corrosion rate from the lineProps dictionary will be used multiplied by the given years.
         '''
 
-        # initialize ss_mod if necessary
-        self.init_mod()
-
-        if self.ss_mod:
-            for i, line in enumerate(self.ss_mod.lineList):
+        if self.ss:
+            for i, line in enumerate(self.ss.lineList):
                 # check if the line type has a corrosion property in its MoorProps instead of checking for material name.
-                mat = line.type['material']
+                sec = self.getSubcomponent(self.i_sec[i])
+                mat = sec['type']['material']  
+                d_nom = sec['type']['d_nom']
+                mbl   = sec['type']['MBL']
                 if mat not in self.lineProps:
                     raise ValueError(f'Line material {mat} not found in lineProps dictionary.')
                 else:
@@ -1238,16 +1224,14 @@ def addCorrosion(self, years=25, corrosion_rate=None, corrosion_mm=None):
                             corrosion_mm = corrosion_rate * years  # total corrosion over design life in mm
 
                         corrosion_m = corrosion_mm / 1000  # convert to m
-                        factor = ((line.type['d_nom'] - corrosion_m) / line.type['d_nom'])**2
-                        line.type['MBL'] *= factor  # update MBL with corrosion factored in
-                        
-                        # Update dd_mod:
-                        self.dd_mod['subcomponents'][self.i_sec[i][0]]['type']['MBL'] *= factor  # assuming self.i_sec has not changed between pristine and modified designs.                        
+                        factor = ((d_nom - corrosion_m) / d_nom)**2
+                        new_mbl = mbl * factor
+                        line.type['MBL'] = new_mbl  # update MBL with corrosion factored in
+                                               
 
-    def addCreep(self, years=25, creep_rate=None, creep=None):
+    def setCreep(self, years=25, creep_rate=None, creep=None):
         '''
         Elongates the lines that have the `creep_rate` feature in their MoorProps description (e.g. polyester).
-        These changes take effect in the ss_mod subsystem.
 
         Parameters
         ----------
@@ -1261,18 +1245,18 @@ def addCreep(self, years=25, creep_rate=None, creep=None):
         
         If neither creep_rate nor creep are given, the creep rate from the lineProps dictionary will be used multiplied by the given years.
         '''
-        # initialize ss_mod if necessary
-        self.init_mod()
 
         # Make sure creep_rate or creep is given
         if creep_rate and creep:
             creep_rate = None
             raise Warning('Both creep_rate and creep were given. Creep_rate will be ignored and creep will be used directly.')
 
-        if self.ss_mod:
-            for i, line in enumerate(self.ss_mod.lineList):
+        if self.ss:
+            for i, line in enumerate(self.ss.lineList):
+                sec = self.getSubcomponent(self.i_sec[i])
+                mat = sec['type']['material']  
+                lgt = sec['L']              
                 # check if the line type has a creep property in its MoorProps instead of checking for material name.
-                mat = line.type['material']
                 if mat not in self.lineProps:
                     raise ValueError(f'Line material {mat} not found in lineProps dictionary.')
                 else:
@@ -1283,13 +1267,10 @@ def addCreep(self, years=25, creep_rate=None, creep=None):
                         if not creep:
                             creep = creep_rate * years  # total creep percent over design life
 
-                        L_creep = line.L * (1 + 0.01*creep)
+                        L_creep = lgt * (1 + 0.01*creep)
                         #self.setSectionLength(L_creep, i)
                         line.setL(L_creep)
 
-                        # Update dd_mod:
-                        self.dd_mod['subcomponents'][self.i_sec[i][0]]['L'] = L_creep  # assuming self.i_sec has not changed between pristine and modified designs.
-
                         '''
                         # Change the diameter size to account for creep thinning
                         d_nom_creep = line.type['d_nom'] / np.sqrt(1 + creep_percent)
@@ -1326,8 +1307,6 @@ def adjustPropertySets(self, suffix):
                     newType = getLineProps(sec['type']['d_nom']*1e3, mat_suffix, self.lineProps)  # convert to mm for getLineProps
                     # Update the lineType properties in the Line in the MoorPy subsystem
                     line.type.update(newType) 
-                    # Update the design dictionary
-                    sec['type'].update(newType)
         else:
             raise ValueError('Mooring subsystem must be created before adjusting property sets.')
 

famodel/project.py

@@ -3405,11 +3405,6 @@ def getRAFT(self,RAFTDict,pristine=1):
         else:
             raise Exception('Platform(s) must be specified in YAML file')
 
-    def updateState(self):
-        for moor in self.mooringList.values():
-            moor.addCorrosion()
-            moor.addCreep()
-            self.getMarineGrowth(lines={})  
     def getMarineGrowth(self,mgDict_list=None,buoy_mg=None, lines='all',tol=2,display=False):
         '''Calls the addMarineGrowth mooring object method for the chosen mooring objects
            and applies the specified marine growth thicknesses at the specified depth ranges
@@ -3543,7 +3538,7 @@ def getCorrosion(self, lineProps=None, corr_th=10, lines='all'):
             idx = lines
 
         for ii,i in enumerate(idx):
-            self.mooringList[i].addCorrosion(corrosion_mm=corr_th)
+            self.mooringList[i].setCorrosion(corrosion_mm=corr_th)
 
     def addCreep(self, lineProps=None, creep_percent=None):
         '''