Ignore:
Timestamp:
07/24/12 10:36:19 (13 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk-jpl and trunk for revision 12703

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r12330 r12706  
    1212
    1313/*current module: */
    14 /*RiftIsPresent(Loads* loads,int configuration_type){{{1*/
     14/*RiftIsPresent(Loads* loads,int configuration_type){{{*/
    1515int RiftIsPresent(Loads* loads,int configuration_type){
    1616
    … …  
    4141}
    4242/*}}}*/
    43 /*RiftConstraintsState(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int configuration_type){{{1*/
     43/*RiftConstraintsState(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int configuration_type){{{*/
    4444void RiftConstraintsState(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int configuration_type){
    4545
    … …  
    5656        }
    5757        else if(num_unstable_constraints<=min_mechanical_constraints){
    58                 _printf_(VerboseModule(),"   freezing constraints\n");
     58                if(VerboseModule()) _pprintLine_("   freezing constraints");
    5959                RiftFreezeConstraints(loads,configuration_type);
    6060        }
    … …  
    6565}
    6666/*}}}*/
    67 /*RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int configuration_type){{{1*/
     67/*RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int configuration_type){{{*/
    6868void RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int configuration_type){
    6969
    … …  
    106106}
    107107/*}}}*/
    108 /*RiftIsFrozen(Loads* loads,int configuration_type){{{1*/
     108/*RiftIsFrozen(Loads* loads,int configuration_type){{{*/
    109109int RiftIsFrozen(Loads* loads,int configuration_type){
    110110
    … …  
    144144}
    145145/*}}}*/
    146 /*RiftFreezeConstraints(Loads* loads,int configuration_type){{{1*/
     146/*RiftFreezeConstraints(Loads* loads,int configuration_type){{{*/
    147147void RiftFreezeConstraints(Loads* loads,int configuration_type){
    148148
    … …  
    172172
    173173/*diverse trials and errors: */
    174 /*RiftIsMaterialStable(Loads* loads){{{1*/
     174/*RiftIsMaterialStable(Loads* loads){{{*/
    175175int RiftIsMaterialStable(Loads* loads){
    176176
    … …  
    204204}
    205205/*}}}*/
    206 /*RiftIsPreStable(Loads* loads){{{1*/
     206/*RiftIsPreStable(Loads* loads){{{*/
    207207int RiftIsPreStable(Loads* loads){
    208208
    … …  
    243243}
    244244/*}}}*/
    245 /*RiftSetPreStable(Loads* loads){{{1*/
     245/*RiftSetPreStable(Loads* loads){{{*/
    246246void RiftSetPreStable(Loads* loads){
    247247
    … …  
    264264}
    265265/*}}}*/
    266 /*RiftPreConstrain(int* pnum_unstable_constraints,Loads* loads){{{1*/
     266/*RiftPreConstrain(int* pnum_unstable_constraints,Loads* loads){{{*/
    267267void RiftPreConstrain(int* pnum_unstable_constraints,Loads* loads){
    268268
    … …  
    300300}
    301301/*}}}*/
    302 /*RiftMaxPenetrationInInputs(Loads* loads){{{1*/
     302/*RiftMaxPenetrationInInputs(Loads* loads){{{*/
    303303void RiftMaxPenetrationInInputs(Loads* loads){
    304304
    … …  
    309309
    310310        /*rift penetration: */
    311         double max_penetration=0;
    312         double mpi_max_penetration;
    313         double penetration;
     311        IssmDouble max_penetration=0;
     312        IssmDouble mpi_max_penetration;
     313        IssmDouble penetration;
    314314
    315315        /*Ok, we are going to find the node pairs which are not penetrating, even though they
    … …  
    342342}
    343343/*}}}*/
    344 /*RiftPotentialUnstableConstraints(Loads* loads){{{1*/
     344/*RiftPotentialUnstableConstraints(Loads* loads){{{*/
    345345int RiftPotentialUnstableConstraints(Loads* loads){
    346346
Note: See TracChangeset for help on using the changeset viewer.