Changeset 2122

Show
Ignore:
Timestamp:
06/24/08 03:19:22 (2 months ago)
Author:
gary
Message:

merge r2121 only check nTotalIonizStop if initialized to positive value

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/c08_branch/source/iter_end_chk.cpp

    r2117 r2122  
    161161        } 
    162162 
    163         else if( conv.nTotalIoniz> StopCalc.nTotalIonizStop ) 
     163        else if( (StopCalc.nTotalIonizStop>0) && conv.nTotalIoniz> StopCalc.nTotalIonizStop ) 
    164164        { 
    165165                /* stop if exceed number of calls to conv base set with  
    166                  * stop ntotalionize command */ 
     166                 * stop nTotalIonizStop command */ 
    167167                lgDone = true; 
    168168                strncpy( StopCalc.chReasonStop, "nTotalIonizStop reached.", sizeof(StopCalc.chReasonStop) );