Changeset 17369

Timestamp:

02/28/14 14:31:38 (11 years ago)

Author:

cborstad

Message:

CHG: enable requested outputs for damage evolution solution

Location:

issm/trunk-jpl/src

Files:

• c/analyses/DamageEvolutionAnalysis.cpp (modified) (2 diffs)
• c/cores/damage_core.cpp (modified) (3 diffs)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (5 diffs)
• m/classes/damage.m (modified) (6 diffs)
• m/classes/damage.py (modified) (8 diffs)
• m/enum/DamageEvolutionNumRequestedOutputsEnum.m (added)
• m/enum/DamageEvolutionRequestedOutputsEnum.m (added)
• m/enum/EnumDefinitions.py (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp

@@ -11 +11 @@
 void DamageEvolutionAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
 
+        /*Intermediaries*/
+        int         numoutputs;
+        char**      requestedoutputs = NULL;
+
         /*retrieve some parameters: */
         parameters->AddObject(iomodel->CopyConstantObject(DamageLawEnum));
         parameters->AddObject(iomodel->CopyConstantObject(DamageStabilizationEnum));
-
         parameters->AddObject(iomodel->CopyConstantObject(DamagePenaltyThresholdEnum));
         parameters->AddObject(iomodel->CopyConstantObject(DamagePenaltyLockEnum));
@@ -20 +23 @@
         parameters->AddObject(iomodel->CopyConstantObject(DamageMaxiterEnum));
         parameters->AddObject(iomodel->CopyConstantObject(DamageMaxDamageEnum));
+
+        /*Requested outputs*/
+        iomodel->FetchData(&requestedoutputs,&numoutputs,DamageEvolutionRequestedOutputsEnum);
+        parameters->AddObject(new IntParam(DamageEvolutionNumRequestedOutputsEnum,numoutputs));
+        if(numoutputs)parameters->AddObject(new StringArrayParam(DamageEvolutionRequestedOutputsEnum,requestedoutputs,numoutputs));
+        iomodel->DeleteData(&requestedoutputs,numoutputs,DamageEvolutionRequestedOutputsEnum);
 
         /*Retrieve law dependent parameters: */

issm/trunk-jpl/src/c/cores/damage_core.cpp

@@ -14 +14 @@
         /*intermediary*/
         bool   save_results;
-        bool   dakota_analysis  = false;
+        bool   dakota_analysis     = false;
         int    solution_type;
+        int    numoutputs          = 0; 
+        char   **requested_outputs = NULL;
 
         if(VerboseSolution()) _printf0_("   computing damage\n");
@@ -23 +25 @@
         femmodel->parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum);
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
+        femmodel->parameters->FindParam(&numoutputs,DamageEvolutionNumRequestedOutputsEnum);
+        if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,DamageEvolutionRequestedOutputsEnum);
 
         if(dakota_analysis && solution_type!=TransientSolutionEnum){
@@ -34 +38 @@
         if(save_results){
                 if(VerboseSolution()) _printf0_("   saving results\n");
-                int outputs = DamageDEnum;
-                femmodel->RequestedOutputsx(&femmodel->results,&outputs,1);
+                femmodel->RequestedOutputsx(&femmodel->results,requested_outputs,numoutputs);
+        }
+        
+        /*Free resources:*/     
+        if(numoutputs){
+                for(int i=0;i<numoutputs;i++){
+                        xDelete<char>(requested_outputs[i]);
+                } 
+                xDelete<char*>(requested_outputs);
         }
 }

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -180 +180 @@
         DamageMaxDamageEnum,
         DamageEquivStressEnum,
+        DamageEvolutionNumRequestedOutputsEnum,
+        DamageEvolutionRequestedOutputsEnum,
         MaterialsRhoIceEnum,
         MaterialsRhoWaterEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -188 +188 @@
                 case DamageMaxDamageEnum : return "DamageMaxDamage";
                 case DamageEquivStressEnum : return "DamageEquivStress";
+                case DamageEvolutionNumRequestedOutputsEnum : return "DamageEvolutionNumRequestedOutputs";
+                case DamageEvolutionRequestedOutputsEnum : return "DamageEvolutionRequestedOutputs";
                 case MaterialsRhoIceEnum : return "MaterialsRhoIce";
                 case MaterialsRhoWaterEnum : return "MaterialsRhoWater";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -191 +191 @@
               else if (strcmp(name,"DamageMaxDamage")==0) return DamageMaxDamageEnum;
               else if (strcmp(name,"DamageEquivStress")==0) return DamageEquivStressEnum;
+              else if (strcmp(name,"DamageEvolutionNumRequestedOutputs")==0) return DamageEvolutionNumRequestedOutputsEnum;
+              else if (strcmp(name,"DamageEvolutionRequestedOutputs")==0) return DamageEvolutionRequestedOutputsEnum;
               else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
               else if (strcmp(name,"MaterialsRhoWater")==0) return MaterialsRhoWaterEnum;
@@ -258 +260 @@
               else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
               else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
-              else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
-              else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"Surface")==0) return SurfaceEnum;
+              if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
+              else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
+              else if (strcmp(name,"Surface")==0) return SurfaceEnum;
               else if (strcmp(name,"ThermalIsenthalpy")==0) return ThermalIsenthalpyEnum;
               else if (strcmp(name,"ThermalIsdynamicbasalspc")==0) return ThermalIsdynamicbasalspcEnum;
@@ -381 +383 @@
               else if (strcmp(name,"Contours")==0) return ContoursEnum;
               else if (strcmp(name,"Parameters")==0) return ParametersEnum;
-              else if (strcmp(name,"Vertices")==0) return VerticesEnum;
-              else if (strcmp(name,"Results")==0) return ResultsEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"GenericParam")==0) return GenericParamEnum;
+              if (strcmp(name,"Vertices")==0) return VerticesEnum;
+              else if (strcmp(name,"Results")==0) return ResultsEnum;
+              else if (strcmp(name,"GenericParam")==0) return GenericParamEnum;
               else if (strcmp(name,"AdolcParam")==0) return AdolcParamEnum;
               else if (strcmp(name,"BoolInput")==0) return BoolInputEnum;
@@ -504 +506 @@
               else if (strcmp(name,"VzFS")==0) return VzFSEnum;
               else if (strcmp(name,"VxMesh")==0) return VxMeshEnum;
-              else if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
-              else if (strcmp(name,"VzMesh")==0) return VzMeshEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum;
+              if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
+              else if (strcmp(name,"VzMesh")==0) return VzMeshEnum;
+              else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum;
               else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum;
               else if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum;
@@ -627 +629 @@
               else if (strcmp(name,"Regular")==0) return RegularEnum;
               else if (strcmp(name,"Scaled")==0) return ScaledEnum;
-              else if (strcmp(name,"Separate")==0) return SeparateEnum;
-              else if (strcmp(name,"Sset")==0) return SsetEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"Verbose")==0) return VerboseEnum;
+              if (strcmp(name,"Separate")==0) return SeparateEnum;
+              else if (strcmp(name,"Sset")==0) return SsetEnum;
+              else if (strcmp(name,"Verbose")==0) return VerboseEnum;
               else if (strcmp(name,"TriangleInterp")==0) return TriangleInterpEnum;
               else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;

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

@@ -27 +27 @@
                 healing             = NaN;
                 equiv_stress              = NaN;
+                requested_outputs   = {};
         end
         methods
@@ -79 +80 @@
                         obj.equiv_stress=0;
 
+                         %output default:
+                         obj.requested_outputs={'default'};
+
                 end % }}}
                 function md = checkconsistency(obj,md,solution,analyses) % {{{
@@ -101 +105 @@
                                 md = checkfield(md,'fieldname','damage.stress_threshold','>=',0);
                                 md = checkfield(md,'fieldname','damage.equiv_stress','numel',[1],'values',[0]);
+                                md = checkfield(md,'fieldname','damage.requested_outputs','stringrow',1);
                         elseif strcmpi(obj.law,'undamaged'),
                                 if (solution==DamageEvolutionSolutionEnum),
@@ -107 +112 @@
                         else 
                                 error('invalid damage evolution law');
+                        end
+
+                end % }}}
+                function list=defaultoutputs(self,md) % {{{
+
+                        if strcmp(meshtype(md.mesh),'3D'),
+                                list = {'DamageD',};
+                        elseif strcmp(meshtype(md.mesh),'2Dhorizontal'),
+                                list = {'DamageD'};
+                        elseif strcmp(meshtype(md.mesh),'2Dvertical'),
+                                list = {'DamageD'};
+                        else
+                                error('mesh type not supported yet');
                         end
 
@@ -132 +150 @@
                                 fielddisplay(obj,'stress_threshold','damage stress threshold [Pa]');
                                 fielddisplay(obj,'equiv_stress','0: von Mises');
+                                fielddisplay(obj,'requested_outputs','additional outputs requested');
                         end
 
@@ -156 +175 @@
                                 WriteData(fid,'object',obj,'fieldname','healing','format','Double');
                                 WriteData(fid,'object',obj,'fieldname','equiv_stress','format','Integer');
+                                        
+                                %process requested outputs
+                                outputs = obj.requested_outputs;
+                                pos = find(ismember(outputs,'default'));
+                                if ~isempty(pos),
+                                        outputs(pos) = [];                         %remove 'default' from outputs
+                                        outputs      = [outputs defaultoutputs(obj,md)]; %add defaults
+                                end
+                                WriteData(fid,'data',outputs,'enum',DamageEvolutionRequestedOutputsEnum,'format','StringArray');
                         end
 

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

@@ -10 +10 @@
 
            Usage:
-              damage=damage();
+              damage=damage()
         """
 
@@ -36 +36 @@
                 self.healing                            = float('NaN')
                 self.equiv_stress       = float('NaN')
+                self.requested_outputs  = []
 
                 if not len(args):
@@ -64 +65 @@
                         s+="%s\n" % fielddisplay(self,"stress_threshold","damage stress threshold [Pa]")
                         s+="%s\n" % fielddisplay(self,"equiv_stresss","0: von Mises")
+                        s+="%s\n" % fielddisplay(self,'requested_outputs','additional outputs requested')
 
                 return s
@@ -99 +101 @@
                 self.equiv_stress=0
 
+                #output default:
+                self.requested_outputs=['default']
+
+                return self
         # }}}
+        def defaultoutputs(self,md): # {{{
+
+                if strcmp(md.mesh.meshtype(),'3D'):
+                        list = ['DamageD']
+                elif strcmp(md.mesh.meshtype(),'2Dhorizontal'):
+                        list = ['DamageD']
+                elif strcmp(md.mesh.meshtype(),'2Dvertical'):
+                        list = ['DamageD']
+                else:
+                        raise TypeError('mesh type not supported yet')
+                return list
+
+        #}}}
         def checkconsistency(self,md,solution,analyses):    # {{{
 
@@ -108 +127 @@
                         
                 md = checkfield(md,'fieldname','damage.stabilization','numel',[1],'values',[0,1,2])
-                md = checkfield(md,'fieldname','damage.maxiter','>=0',0);
-                md = checkfield(md,'fieldname','damage.penalty_factor','>=0',0);
-                md = checkfield(md,'fieldname','damage.penalty_lock','>=0',0);
-                md = checkfield(md,'fieldname','damage.penalty_threshold','>=0',0);
+                md = checkfield(md,'fieldname','damage.maxiter','>=0',0)
+                md = checkfield(md,'fieldname','damage.penalty_factor','>=0',0)
+                md = checkfield(md,'fieldname','damage.penalty_lock','>=0',0)
+                md = checkfield(md,'fieldname','damage.penalty_threshold','>=0',0)
 
                 if self.law == 'pralong':
@@ -121 +140 @@
                         md = checkfield(md,'fieldname','damage.stress_threshold','>=',0)
                         md = checkfield(md,'fieldname','damage.equiv_stress','numel',[1],'values',[0])
+                        md = checkfield(md,'fieldname','damage.requested_outputs','stringrow',1)
                 elif strcmpi(self.law,'undamaged'):
                         if (solution==DamageEvolutionSolutionEnum):
-                                raise RuntimeError('Invalid evolution law (md.damage.law) for a damage solution');
+                                raise RuntimeError('Invalid evolution law (md.damage.law) for a damage solution')
 
                 return md
@@ -131 +151 @@
                 WriteData(fid,'object',self,'fieldname','D','format','DoubleMat','mattype',1)
                 WriteData(fid,'object',self,'fieldname','law','format','String')
-                WriteData(fid,'object',self,'fieldname','spcdamage','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
-                WriteData(fid,'object',self,'fieldname','max_damage','format','Double');
+                WriteData(fid,'object',self,'fieldname','spcdamage','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
+                WriteData(fid,'object',self,'fieldname','max_damage','format','Double')
 
-                WriteData(fid,'object',self,'fieldname','stabilization','format','Integer');
-                WriteData(fid,'object',self,'fieldname','penalty_threshold','format','Integer');
-                WriteData(fid,'object',self,'fieldname','maxiter','format','Integer');
-                WriteData(fid,'object',self,'fieldname','penalty_lock','format','Integer');
-                WriteData(fid,'object',self,'fieldname','penalty_factor','format','Double');
+                WriteData(fid,'object',self,'fieldname','stabilization','format','Integer')
+                WriteData(fid,'object',self,'fieldname','penalty_threshold','format','Integer')
+                WriteData(fid,'object',self,'fieldname','maxiter','format','Integer')
+                WriteData(fid,'object',self,'fieldname','penalty_lock','format','Integer')
+                WriteData(fid,'object',self,'fieldname','penalty_factor','format','Double')
 
                 if self.law=='pralong':
@@ -147 +167 @@
                         WriteData(fid,'object',self,'fieldname','stress_threshold','format','Double')
                         WriteData(fid,'object',self,'fieldname','equiv_stress','format','Integer')
+                        
+                        #process requested outputs
+                        outputs = self.requested_outputs
+                        indices = [i for i, x in enumerate(outputs) if x == 'default']
+                        if len(indices) > 0:
+                                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')
         # }}}

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -180 +180 @@
 def DamageMaxDamageEnum(): return StringToEnum("DamageMaxDamage")[0]
 def DamageEquivStressEnum(): return StringToEnum("DamageEquivStress")[0]
+def DamageEvolutionNumRequestedOutputsEnum(): return StringToEnum("DamageEvolutionNumRequestedOutputs")[0]
+def DamageEvolutionRequestedOutputsEnum(): return StringToEnum("DamageEvolutionRequestedOutputs")[0]
 def MaterialsRhoIceEnum(): return StringToEnum("MaterialsRhoIce")[0]
 def MaterialsRhoWaterEnum(): return StringToEnum("MaterialsRhoWater")[0]