Changeset 17392

Timestamp:

03/08/14 10:40:26 (11 years ago)

Author:

cborstad

Message:

CHG: updates for damage evolution in python

Location:

issm/trunk-jpl/src/m

Files:

• classes/damage.m (modified) (1 diff)
• classes/damage.py (modified) (4 diffs)
• consistency/ismodelselfconsistent.py (modified) (1 diff)
• solve/process_solve_options.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/damage.m

@@ -147 +147 @@
                                 fielddisplay(obj,'c3','damage parameter 3');
                                 fielddisplay(obj,'c4','damage parameter 4');
-                                fielddisplay(obj,'healing','damage healing parameter 1');
+                                fielddisplay(obj,'healing','damage healing parameter');
                                 fielddisplay(obj,'stress_threshold','damage stress threshold [Pa]');
                                 fielddisplay(obj,'equiv_stress','0: von Mises');

issm/trunk-jpl/src/m/classes/damage.py

@@ -64 +64 @@
                         s+="%s\n" % fielddisplay(self,"c4","damage parameter 4 ")
                         s+="%s\n" % fielddisplay(self,"stress_threshold","damage stress threshold [Pa]")
+                        s+="%s\n" % fielddisplay(self,"healing","damage healing parameter")
                         s+="%s\n" % fielddisplay(self,"equiv_stresss","0: von Mises")
                         s+="%s\n" % fielddisplay(self,'requested_outputs','additional outputs requested')
@@ -139 +140 @@
                         md = checkfield(md,'fieldname','damage.c4','>=',0)
                         md = checkfield(md,'fieldname','damage.stress_threshold','>=',0)
+                        md = checkfield(md,'fieldname','damage.healing','>=',0)
                         md = checkfield(md,'fieldname','damage.equiv_stress','numel',[1],'values',[0])
                         md = checkfield(md,'fieldname','damage.requested_outputs','stringrow',1)
@@ -166 +168 @@
                         WriteData(fid,'object',self,'fieldname','c4','format','Double')
                         WriteData(fid,'object',self,'fieldname','stress_threshold','format','Double')
+                        WriteData(fid,'object',self,'fieldname','healing','format','Double')
                         WriteData(fid,'object',self,'fieldname','equiv_stress','format','Integer')
                         
@@ -174 +177 @@
                                 outputscopy=outputs[0:max(0,indices[0]-1)]+self.defaultoutputs(md)+outputs[indices[0]+1:]
                                 outputs    =outputscopy
-                        WriteData(fid,'data',outputs,'enum',StressbalanceRequestedOutputsEnum(),'format','StringArray')
+                        WriteData(fid,'data',outputs,'enum',DamageEvolutionRequestedOutputsEnum(),'format','StringArray')
         # }}}

issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py

@@ -46 +46 @@
                 analyses=[L2ProjectionBaseAnalysisEnum(),HydrologyShreveAnalysisEnum(),HydrologyDCInefficientAnalysisEnum(),HydrologyDCEfficientAnalysisEnum()]
 
+        elif DamageEvolutionSolutionEnum():
+                analyses=[DamageEvolutionAnalysisEnum()]
+
         else:
                 raise TypeError("solution type: '%s' not supported yet!" % EnumToString(solutiontype)[0])

issm/trunk-jpl/src/m/solve/process_solve_options.py

@@ -22 +22 @@
                         BalancethicknessSolutionEnum(),BalancevelocitySolutionEnum(),\
                         BedSlopeSolutionEnum(),SurfaceSlopeSolutionEnum(),\
-                        HydrologySolutionEnum(),FlaimSolutionEnum(),GiaSolutionEnum()):
+                        HydrologySolutionEnum(),FlaimSolutionEnum(),GiaSolutionEnum(),DamageEvolutionSolutionEnum()):
                 raise ValueError("process_solve_options error message: solution_type '%s' not supported yet!" % EnumToString(solution_type)[0])
         outoptions['solution_type']=solution_type