/[ascend]/trunk/pygtk/simulation.cpp
ViewVC logotype

Diff of /trunk/pygtk/simulation.cpp

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

revision 153 by johnpye, Thu Dec 22 13:53:42 2005 UTC revision 154 by johnpye, Thu Dec 22 15:18:02 2005 UTC
# Line 94  void Line 94  void
94  Simulation::run(const Method &method){  Simulation::run(const Method &method){
95      cerr << "RUNNING PROCEDURE " << method.getName() << endl;      cerr << "RUNNING PROCEDURE " << method.getName() << endl;
96      Nam name = Nam(method.getSym());      Nam name = Nam(method.getSym());
97      cerr << "CREATED NAME '" << name.getName() << "'" << endl;      //cerr << "CREATED NAME '" << name.getName() << "'" << endl;
98      Proc_enum pe;      Proc_enum pe;
99      pe = Initialize(      pe = Initialize(
100          getModel().getInternalType() ,name.getInternalType(), "__not_named__"          getModel().getInternalType() ,name.getInternalType(), "__not_named__"
# Line 103  Simulation::run(const Method &method){ Line 103  Simulation::run(const Method &method){
103      );      );
104    
105      if(pe == Proc_all_ok){      if(pe == Proc_all_ok){
106          error_reporter(ASC_PROG_NOTE,NULL,0,"Method '%s' was run (check above for errors)",method.getName());          error_reporter(ASC_PROG_NOTE,NULL,0,"Method '%s' was run (check above for errors)\n",method.getName());
107          //cerr << "METHOD " << method.getName() << " COMPLETED OK" << endl;          //cerr << "METHOD " << method.getName() << " COMPLETED OK" << endl;
108      }else{      }else{
109          stringstream ss;          stringstream ss;
# Line 326  Simulation::setSolver(Solver &solver){ Line 326  Simulation::setSolver(Solver &solver){
326      // Update the solver object because sometimes an alternative solver can be returned, apparently.      // Update the solver object because sometimes an alternative solver can be returned, apparently.
327    
328      int selected = slv_select_solver(sys, solver.getIndex());      int selected = slv_select_solver(sys, solver.getIndex());
329      cerr << "Simulation::setSolver: slv_select_solver returned " << selected << endl;      //cerr << "Simulation::setSolver: slv_select_solver returned " << selected << endl;
330    
331      if(selected<0){      if(selected<0){
332          error_reporter(ASC_PROG_ERROR,NULL,0,"Failed to select solver");          error_reporter(ASC_PROG_ERROR,NULL,0,"Failed to select solver");
# Line 347  Simulation::setSolver(Solver &solver){ Line 347  Simulation::setSolver(Solver &solver){
347  const Solver  const Solver
348  Simulation::getSolver() const{  Simulation::getSolver() const{
349      int index = slv_get_selected_solver(sys);      int index = slv_get_selected_solver(sys);
350      cerr << "Simulation::getSolver: index = " << index << endl;      //cerr << "Simulation::getSolver: index = " << index << endl;
351      if(index<0)throw runtime_error("No solver selected");      if(index<0)throw runtime_error("No solver selected");
352    
353      return Solver(slv_solver_name(index));      return Solver(slv_solver_name(index));

Legend:
Removed from v.153  
changed lines
  Added in v.154

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