Changeset 16214

Timestamp:

09/20/13 12:17:51 (12 years ago)

Author:

cborstad

Message:

CHG: rather than use penalties, enforce limits on damage in InputUpdateFromSolutionDamageEvolution. As a result, the damage_core only needs to call solutionsequence_linear

Location:

issm/trunk-jpl/src/c

Files:

• analyses/damage_core.cpp (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (2 diffs)
• classes/Loads/Pengrid.cpp (modified) (1 diff)

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

@@ -30 +30 @@
 
         femmodel->SetCurrentConfiguration(DamageEvolutionAnalysisEnum);
-        solutionsequence_damage_nonlinear(femmodel);
+        solutionsequence_linear(femmodel);
 
         if(save_results){

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -7126 +7126 @@
         int         i;
         IssmDouble  values[numdof];
-        int        *doflist = NULL;
+        IssmDouble  max_damage;
+        int                     *doflist = NULL;
 
         /*Get dof list: */
         GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
+
+        /*Get user-supplied max_damage: */
+        this->parameters->FindParam(&max_damage,DamageMaxDamageEnum);
 
         /*Use the dof list to index into the solution vector: */
@@ -7136 +7140 @@
                 /*Check solution*/
                 if(xIsNan<IssmDouble>(values[i])) _error_("NaN found in solution vector");
+                /*Enforce D < max_damage and D > 0 */
+                if(values[i]>max_damage) values[i]=max_damage;
+                else if(values[i]<0) values[i]=0;
         }
 

issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp

@@ -738 +738 @@
         parameters->FindParam(&max_damage,DamageMaxDamageEnum);
         
-        //Figure out if damage is over max_damage, in which case, this penalty needs to be activated.
+        //Figure out if damage>max_damage, in which case, this penalty needs to be activated.
+        //Would need to do the same for damage<0 if penalties are used.  For now, ConstraintStatex 
+        //is not called in solutionsequence_damage_nonlinear, so no penalties are applied.
 
         if (damage>max_damage){