Changeset 8408


Ignore:
Timestamp:
05/24/11 09:59:06 (14 years ago)
Author:
seroussi
Message:

change PenaltyConstrain to ConstraintActivate in Pengrid

Location:
issm/trunk/src/c
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/modules/ConstraintsStatex/ThermalConstraintsState.cpp

    r8404 r8408  
    3030
    3131                                Pengrid* pengrid=(Pengrid*)object;
    32                                 pengrid->PenaltyConstrain(&unstable);
     32                                pengrid->ConstraintActivate(&unstable);
    3333                                num_unstable_constraints+=unstable;
    3434                        }

  • issm/trunk/src/c/objects/Loads/Pengrid.cpp

    r8303 r8408  
    431431
    432432/*Pengrid management:*/
    433 /*FUNCTION Pengrid::PenaltyConstrain {{{1*/
    434 void  Pengrid::PenaltyConstrain(int* punstable){
     433/*FUNCTION Pengrid::ConstraintActivate {{{1*/
     434void  Pengrid::ConstraintActivate(int* punstable){
    435435
    436436        int analysis_type;
    … …  
    444444        }
    445445        else if (analysis_type==ThermalAnalysisEnum){
    446                 PenaltyConstrainThermal(punstable);
     446                ConstraintActivateThermal(punstable);
    447447        }
    448448        else if (analysis_type==MeltingAnalysisEnum){
    … …  
    456456}
    457457/*}}}1*/
    458 /*FUNCTION Pengrid::PenaltyConstrainThermal {{{1*/
    459 void  Pengrid::PenaltyConstrainThermal(int* punstable){
     458/*FUNCTION Pengrid::ConstraintActivateThermal {{{1*/
     459void  Pengrid::ConstraintActivateThermal(int* punstable){
    460460
    461461        //   The penalty is stable if it doesn't change during to successive iterations.   

  • issm/trunk/src/c/objects/Loads/Pengrid.h

    r6412 r8408  
    8484                ElementVector* PenaltyCreatePVectorThermal(double kmax);
    8585                ElementVector* PenaltyCreatePVectorMelting(double kmax);
    86                 void  PenaltyConstrain(int* punstable);
    87                 void  PenaltyConstrainThermal(int* punstable);
     86                void  ConstraintActivate(int* punstable);
     87                void  ConstraintActivateThermal(int* punstable);
    8888                void  UpdateInputs(double* solution);
    8989                /*}}}*/
Note: See TracChangeset for help on using the changeset viewer.