/[ascend]/trunk/base/generic/solver/relman.c
ViewVC logotype

Diff of /trunk/base/generic/solver/relman.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 730 by johnpye, Tue Jul 4 05:03:59 2006 UTC revision 731 by johnpye, Tue Jul 4 07:42:06 2006 UTC
# Line 533  int relman_diff_grad(struct rel_relation Line 533  int relman_diff_grad(struct rel_relation
533    assert(gradient !=NULL);    assert(gradient !=NULL);
534    *count = 0;    *count = 0;
535    if( safe ) {    if( safe ) {
536      CONSOLE_DEBUG("...");      /* CONSOLE_DEBUG("..."); */
537      status =(int32)RelationCalcResidGradSafe(rel_instance(rel),      status =(int32)RelationCalcResidGradSafe(rel_instance(rel),
538                           resid,gradient);                           resid,gradient);
539      safe_error_to_stderr( (enum safe_err *)&status );      safe_error_to_stderr( (enum safe_err *)&status );
# Line 595  int32 relman_diff_harwell(struct rel_rel Line 595  int32 relman_diff_harwell(struct rel_rel
595        if (gradient == NULL) {        if (gradient == NULL) {
596          return 1;          return 1;
597        }        }
598        CONSOLE_DEBUG("...");        /* CONSOLE_DEBUG("..."); */
599        status = RelationCalcResidGradSafe(rel_instance(rel),resid,gradient);        status = RelationCalcResidGradSafe(rel_instance(rel),resid,gradient);
600        safe_error_to_stderr(&status);        safe_error_to_stderr(&status);
601        if (status) {        if (status) {
# Line 617  int32 relman_diff_harwell(struct rel_rel Line 617  int32 relman_diff_harwell(struct rel_rel
617        if (gradient == NULL) {        if (gradient == NULL) {
618          return 1;          return 1;
619        }        }
620        CONSOLE_DEBUG("...");        /* CONSOLE_DEBUG("..."); */
621        status = RelationCalcResidGradSafe(rel_instance(rel),resid,gradient);        status = RelationCalcResidGradSafe(rel_instance(rel),resid,gradient);
622        safe_error_to_stderr(&status);        safe_error_to_stderr(&status);
623        if (status) {        if (status) {
# Line 693  int relman_diffs(struct rel_relation *re Line 693  int relman_diffs(struct rel_relation *re
693    
694    /** @TODO fix this (it should all be in the compiler, or something) */    /** @TODO fix this (it should all be in the compiler, or something) */
695    if(rel->nodeinfo){    if(rel->nodeinfo){
696      CONSOLE_DEBUG("EVALUTING BLACKBOX DERIVATIVES FOR ROW %d",coord.row);      /* CONSOLE_DEBUG("EVALUTING BLACKBOX DERIVATIVES FOR ROW %d",coord.row); */
697      *resid = extrel_resid_and_jacobian(rel, filter, coord.row, mtx);      *resid = extrel_resid_and_jacobian(rel, filter, coord.row, mtx);
698      return 0;      return 0;
699    }    }
700    
701    if(safe){    if(safe){
702      CONSOLE_DEBUG("...");      /* CONSOLE_DEBUG("..."); */
703      status =(int32)RelationCalcResidGradSafe(rel_instance(rel),resid,gradient);      status =(int32)RelationCalcResidGradSafe(rel_instance(rel),resid,gradient);
704      safe_error_to_stderr( (enum safe_err *)&status );      safe_error_to_stderr( (enum safe_err *)&status );
705      /* always map when using safe functions */      /* always map when using safe functions */

Legend:
Removed from v.730  
changed lines
  Added in v.731

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22