Changeset 17642

Timestamp:

04/03/14 17:48:36 (11 years ago)

Author:

cborstad

Message:

CHG: added damage evolution analysis to transient run

Location:

issm/trunk-jpl/src

Files:

• c/analyses/DamageEvolutionAnalysis.cpp (modified) (1 diff)
• c/cores/AnalysisConfiguration.cpp (modified) (2 diffs)
• c/cores/transient_core.cpp (modified) (3 diffs)
• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (2 diffs)
• c/modules/ModelProcessorx/ModelProcessorx.cpp (modified) (2 diffs)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (1 diff)
• m/classes/transient.py (modified) (5 diffs)
• m/enum/EnumDefinitions.py (modified) (1 diff)
• m/enum/TransientIsdamageEnum.m (deleted)
• m/enum/TransientIsdamageevolutionEnum.m (added)
• m/interp/averaging.py (modified) (1 diff)

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

@@ -27 +27 @@
         iomodel->FetchData(&requestedoutputs,&numoutputs,DamageEvolutionRequestedOutputsEnum);
         parameters->AddObject(new IntParam(DamageEvolutionNumRequestedOutputsEnum,numoutputs));
+        _printf0_("numoutputs = " << numoutputs << ", requestedoutputs = " << requestedoutputs);
         if(numoutputs)parameters->AddObject(new StringArrayParam(DamageEvolutionRequestedOutputsEnum,requestedoutputs,numoutputs));
         iomodel->DeleteData(&requestedoutputs,numoutputs,DamageEvolutionRequestedOutputsEnum);

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

@@ -117 +117 @@
 
                 case TransientSolutionEnum:
-                        numanalyses=15;
+                        numanalyses=16;
                         analyses=xNew<int>(numanalyses);
                         analyses[ 0]=StressbalanceAnalysisEnum;
@@ -134 +134 @@
                         analyses[13]=ExtrapolationAnalysisEnum;
                         analyses[14]=LsfReinitializationAnalysisEnum;
+                        analyses[15]=DamageEvolutionAnalysisEnum;
                         break;
 

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

@@ -22 +22 @@
         int    i;
         IssmDouble starttime,finaltime,dt,yts;
-        bool   isstressbalance,ismasstransport,isFS,isthermal,isgroundingline,isgia,islevelset;
+        bool   isstressbalance,ismasstransport,isFS,isthermal,isgroundingline,isgia,islevelset,isdamageevolution;
         bool   save_results,dakota_analysis;
         bool   time_adapt=false;
@@ -51 +51 @@
         femmodel->parameters->FindParam(&isgroundingline,TransientIsgroundinglineEnum);
         femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum);
+        femmodel->parameters->FindParam(&isdamageevolution,TransientIsdamageevolutionEnum);
         femmodel->parameters->FindParam(&isFS,FlowequationIsFSEnum);
         if(isgroundingline) femmodel->parameters->FindParam(&groundingline_migration,GroundinglineMigrationEnum);
@@ -122 +123 @@
                         stressbalance_core(femmodel);
                 }
-                
+
+                if(isdamageevolution){
+                        if(VerboseSolution()) _printf0_("   computing damage\n");
+                        damage_core(femmodel);
+                }
+
                 if(islevelset){
                         if(VerboseSolution()) _printf0_("   computing movement of ice boundaries\n");

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -69 +69 @@
         parameters->AddObject(iomodel->CopyConstantObject(TransientIsgiaEnum));
         parameters->AddObject(iomodel->CopyConstantObject(TransientIslevelsetEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(TransientIsdamageevolutionEnum));
         parameters->AddObject(iomodel->CopyConstantObject(MaterialsRheologyLawEnum));
         parameters->AddObject(iomodel->CopyConstantObject(AutodiffIsautodiffEnum));
@@ -145 +146 @@
         iomodel->DeleteData(&requestedoutputs,numoutputs,SteadystateRequestedOutputsEnum);
 
+        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);
+
         /*Deal with mass flux segments: {{{*/
         iomodel->FetchData(&qmu_mass_flux_present,QmuMassFluxSegmentsPresentEnum);

issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp

@@ -16 +16 @@
 
         int   i,analysis_enum,verbose;
-        bool  isthermal,ismasstransport,isstressbalance,isgroundingline,isenthalpy,islevelset;
+        bool  isthermal,ismasstransport,isstressbalance,isgroundingline,isenthalpy,islevelset,isdamage;
 
         /*Initialize datasets*/
@@ -38 +38 @@
         iomodel->Constant(&isstressbalance,TransientIsstressbalanceEnum);
         iomodel->Constant(&isgroundingline,TransientIsgroundinglineEnum);
+        iomodel->Constant(&isdamage,TransientIsdamageevolutionEnum);
 
         SetVerbosityLevel(verbose);

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

@@ -279 +279 @@
         TransientIsthermalEnum,
         TransientIsgiaEnum,
-        TransientIsdamageEnum,
+        TransientIsdamageevolutionEnum,
         TransientNumRequestedOutputsEnum,
         TransientRequestedOutputsEnum,

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

@@ -285 +285 @@
                 case TransientIsthermalEnum : return "TransientIsthermal";
                 case TransientIsgiaEnum : return "TransientIsgia";
-                case TransientIsdamageEnum : return "TransientIsdamage";
+                case TransientIsdamageevolutionEnum : return "TransientIsdamageevolution";
                 case TransientNumRequestedOutputsEnum : return "TransientNumRequestedOutputs";
                 case TransientRequestedOutputsEnum : return "TransientRequestedOutputs";

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

@@ -291 +291 @@
               else if (strcmp(name,"TransientIsthermal")==0) return TransientIsthermalEnum;
               else if (strcmp(name,"TransientIsgia")==0) return TransientIsgiaEnum;
-              else if (strcmp(name,"TransientIsdamage")==0) return TransientIsdamageEnum;
+              else if (strcmp(name,"TransientIsdamageevolution")==0) return TransientIsdamageevolutionEnum;
               else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum;
               else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum;

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

@@ -18 +18 @@
                 self.isgroundingline   = False
                 self.isgia             = False
+                self.isdamageevolution = False
                 self.islevelset        = False
                 self.requested_outputs = []
@@ -32 +33 @@
                 string="%s\n%s"%(string,fielddisplay(self,'isgroundingline','indicates if a groundingline migration is used in the transient'))
                 string="%s\n%s"%(string,fielddisplay(self,'isgia','indicates if a postglacial rebound is used in the transient'))
+                string="%s\n%s"%(string,fielddisplay(self,'isdamageevolution','indicates whether damage evolution is used in the transient'))
                 string="%s\n%s"%(string,fielddisplay(self,'islevelset','LEVELSET METHOD DESCRIPTION'))
                 string="%s\n%s"%(string,fielddisplay(self,'requested_outputs','list of additional outputs requested'))
@@ -52 +54 @@
                 self.isgroundingline = False
                 self.isgia           = False
-                self.islevelset           = False
+                self.isdamageevolution = False
+                self.islevelset      = False
 
                 #default output
@@ -69 +72 @@
                 md = checkfield(md,'fieldname','transient.isgroundingline','numel',[1],'values',[0,1])
                 md = checkfield(md,'fieldname','transient.isgia','numel',[1],'values',[0,1])
+                md = checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0,1])
                 md = checkfield(md,'fieldname','transient.islevelset','numel',[1],'values',[0,1])
                 md = checkfield(md,'fieldname','transient.requested_outputs','stringrow',1)
@@ -80 +84 @@
                 WriteData(fid,'object',self,'fieldname','isgroundingline','format','Boolean')
                 WriteData(fid,'object',self,'fieldname','isgia','format','Boolean')
+                WriteData(fid,'object',self,'fieldname','isdamageevolution','format','Boolean')
                 WriteData(fid,'object',self,'fieldname','islevelset','format','Boolean')
 

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

@@ -277 +277 @@
 def TransientIsthermalEnum(): return StringToEnum("TransientIsthermal")[0]
 def TransientIsgiaEnum(): return StringToEnum("TransientIsgia")[0]
-def TransientIsdamageEnum(): return StringToEnum("TransientIsdamage")[0]
+def TransientIsdamageevolutionEnum(): return StringToEnum("TransientIsdamageevolution")[0]
 def TransientNumRequestedOutputsEnum(): return StringToEnum("TransientNumRequestedOutputs")[0]
 def TransientRequestedOutputsEnum(): return StringToEnum("TransientRequestedOutputs")[0]

issm/trunk-jpl/src/m/interp/averaging.py

@@ -2 +2 @@
 from GetAreas import GetAreas
 from scipy.sparse import csc_matrix
+import MatlabFuncs as m
 
 def averaging(md,data,iterations,layer=0):