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

Timestamp:

03/21/14 21:07:11 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: cosmetics, removed penalties from damage transient, merged some functions from Tria and Penta to Element

File:

• issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp (modified) (4 diffs)

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

@@ -242 +242 @@
                 case HydrologyDCInefficientAnalysisEnum:
                         Ke=PenaltyCreateKMatrixHydrologyDCInefficient(kmax);
-                        break;
-                case DamageEvolutionAnalysisEnum:
-                        Ke=PenaltyCreateKMatrixDamageEvolution(kmax);
                         break;
                 default:
@@ -276 +273 @@
                 case HydrologyDCInefficientAnalysisEnum:
                         pe=PenaltyCreatePVectorHydrologyDCInefficient(kmax);
-                        break;
-                case DamageEvolutionAnalysisEnum:
-                        pe=PenaltyCreatePVectorDamageEvolution(kmax);
                         break;
                 default:
@@ -417 +411 @@
                 return;
         }
-        else if (analysis_type==DamageEvolutionAnalysisEnum){
-                ConstraintActivateDamageEvolution(punstable);
-                return;
-        }
-
         else{
                 _error_("analysis: " << EnumToStringx(analysis_type) << " not supported yet");
@@ -710 +699 @@
 }
 /*}}}*/
-/*FUNCTION Pengrid::ConstraintActivateDamageEvolution {{{*/
-void  Pengrid::ConstraintActivateDamageEvolution(int* punstable){
-
-        //   The penalty is stable if it doesn't change during to successive iterations.   
-        IssmDouble max_damage;
-        IssmDouble damage;
-        int        new_active;
-        int        unstable=0;
-        int        penalty_lock;
-
-        /*check that pengrid is not a clone (penalty to be added only once)*/
-        if (node->IsClone()){
-                unstable=0;
-                *punstable=unstable;
-                return;
-        }
-
-        //First recover damage  using the element: */
-        element->GetInputValue(&damage,node,DamageDEnum);
-
-        //Recover our data:
-        parameters->FindParam(&penalty_lock,DamagePenaltyLockEnum);
-        parameters->FindParam(&max_damage,DamageMaxDamageEnum);
-        
-        //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){
-                new_active=1;
-        }
-        else{
-                new_active=0;
-        }
-
-        //Figure out stability of this penalty
-        if (active==new_active){
-                unstable=0;
-        }
-        else{
-                unstable=1;
-                if(penalty_lock)zigzag_counter++;
-        }
-
-        /*If penalty keeps zigzagging more than penalty_lock times: */
-        if(penalty_lock){
-                if(zigzag_counter>penalty_lock){
-                        unstable=0;
-                        active=1;
-                }
-        }
-
-        //Set penalty flag
-        active=new_active;
-
-        //*Assign output pointers:*/
-        *punstable=unstable;
-}
-/*}}}*/
-/*FUNCTION Pengrid::PenaltyCreateKMatrixDamageEvolution {{{*/
-ElementMatrix* Pengrid::PenaltyCreateKMatrixDamageEvolution(IssmDouble kmax){
-
-        IssmDouble    penalty_factor;
-
-        /*Initialize Element matrix and return if necessary*/
-        if(!this->active) return NULL;
-        ElementMatrix* Ke=new ElementMatrix(&node,NUMVERTICES,this->parameters);
-
-        /*recover parameters: */
-        parameters->FindParam(&penalty_factor,DamagePenaltyFactorEnum);
-
-        Ke->values[0]=kmax*pow(10.,penalty_factor);
-
-        /*Clean up and return*/
-        return Ke;
-}
-/*}}}*/
-/*FUNCTION Pengrid::PenaltyCreatePVectorDamageEvolution {{{*/
-ElementVector* Pengrid::PenaltyCreatePVectorDamageEvolution(IssmDouble kmax){
-
-        IssmDouble penalty_factor;
-        IssmDouble max_damage;
-
-        /*Initialize Element matrix and return if necessary*/
-        if(!this->active) return NULL;
-        ElementVector* pe=new ElementVector(&node,1,this->parameters);
-
-        //Recover our data:
-        parameters->FindParam(&penalty_factor,DamagePenaltyFactorEnum);
-        parameters->FindParam(&max_damage,DamageMaxDamageEnum);
-
-        //right hand side penalizes to max_damage
-        pe->values[0]=kmax*pow(10.,penalty_factor)*max_damage;
-
-        /*Clean up and return*/
-        return pe;
-}
-/*}}}*/
 /*FUNCTION Pengrid::CreatePVectorHydrologyDCInefficient {{{*/
 ElementVector* Pengrid::CreatePVectorHydrologyDCInefficient(void){