Changeset 19025

Timestamp:

01/20/15 14:22:11 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: allow stabilization to be dynamic

Location:

issm/trunk-jpl/src/c

Files:

• analyses/LevelsetAnalysis.cpp (modified) (4 diffs)
• cores/transient_core.cpp (modified) (1 diff)

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

@@ -75 +75 @@
 /*}}}*/
 void LevelsetAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
+        parameters->AddObject(iomodel->CopyConstantObject(LevelsetStabilizationEnum));
         return;
 }
@@ -87 +88 @@
 
         /*parameters: */
+        int  stabilization;
         bool save_results;
-        int  stabilization = 1;
         femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
-        //femmodel->parameters->FindParam(&stabilization,LevelsetStabilizationEnum);
+        femmodel->parameters->FindParam(&stabilization,LevelsetStabilizationEnum);
 
         /*activate formulation: */
@@ -123 +124 @@
 
         /*Intermediaries */
-        int  stabilization=2;
-        int  dim, domaintype, calvinglaw;
+        int  stabilization,dim, domaintype, calvinglaw;
         bool iscalving;
         int i, row, col;
@@ -138 +138 @@
         basalelement->FindParam(&domaintype,DomainTypeEnum);
         basalelement->FindParam(&calvinglaw,CalvingLawEnum);
+        basalelement->FindParam(&stabilization,LevelsetStabilizationEnum);
         switch(domaintype){
                 case Domain2DverticalEnum:   dim = 1; break;

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

@@ -112 +112 @@
                                 if(VerboseSolution()) _printf0_("   computing calving rate\n");
                                 femmodel->StrainRateparallelx();
+                                femmodel->DeviatoricStressx();
                                 femmodel->CalvingRatePix();
                         }