/[ascend]/trunk/base/generic/integrator/ida.c
ViewVC logotype

Diff of /trunk/base/generic/integrator/ida.c

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

revision 1186 by johnpye, Sat Jan 20 09:15:51 2007 UTC revision 1187 by johnpye, Sun Jan 21 06:03:58 2007 UTC
# Line 63  Line 63 
63  #include <utilities/ascPanic.h>  #include <utilities/ascPanic.h>
64  #include <compiler/instance_enum.h>  #include <compiler/instance_enum.h>
65    
66  #include <solver/slv_stdcalls.h>  #include <solver/slv_client.h>
67  #include <solver/relman.h>  #include <solver/relman.h>
68  #include <solver/analyze.h>  #ifdef ASC_IDA_NEW_ANALYSE
69    # include <solver/analyze.h>
70    # include <solver/slv_stdcalls.h>
71    #endif
72    
73  #include "idalinear.h"  #include "idalinear.h"
74    
# Line 424  typedef void (IntegratorVarVisitorFn)(In Line 427  typedef void (IntegratorVarVisitorFn)(In
427  void integrator_visit_system_vars(IntegratorSystem *sys,IntegratorVarVisitorFn *visitor);  void integrator_visit_system_vars(IntegratorSystem *sys,IntegratorVarVisitorFn *visitor);
428  IntegratorVarVisitorFn integrator_dae_classify_var;  IntegratorVarVisitorFn integrator_dae_classify_var;
429    
430    #ifdef ASC_IDA_NEW_ANALYSE
431  /**  /**
432      Perform additional problem analysis to prepare problem for integration with      Perform additional problem analysis to prepare problem for integration with
433      IDA.      IDA.
# Line 441  IntegratorVarVisitorFn integrator_dae_cl Line 445  IntegratorVarVisitorFn integrator_dae_cl
445      @see integrator_analyse      @see integrator_analyse
446  */  */
447  int integrator_ida_analyse(struct IntegratorSystemStruct *sys){  int integrator_ida_analyse(struct IntegratorSystemStruct *sys){
 #ifdef ASC_IDA_NEW_ANALYSE  
448      struct var_variable **solversvars;      struct var_variable **solversvars;
449      const struct var_variable **vlist;      const struct var_variable **vlist;
450      unsigned long nsolversvars, i, j, nderivs, nvlist, nfixed;      unsigned long nsolversvars, i, j, nderivs, nvlist, nfixed;
# Line 580  int integrator_ida_analyse(struct Integr Line 583  int integrator_ida_analyse(struct Integr
583      /*   - block decomposition based on above */      /*   - block decomposition based on above */
584      /*   - block decomposition results in reordering of y and y' */      /*   - block decomposition results in reordering of y and y' */
585      /*   - boundaries (optional) */      /*   - boundaries (optional) */
 #endif  
586      ERROR_REPORTER_HERE(ASC_PROG_ERR,"Implementation incomplete");      ERROR_REPORTER_HERE(ASC_PROG_ERR,"Implementation incomplete");
587      return 1;      return 1;
588  }  }
589    #endif
590    
591  /*-------------------------------------------------------------  /*-------------------------------------------------------------
592    MAIN IDA SOLVER ROUTINE, see IDA manual, sec 5.4, p. 27 ff.    MAIN IDA SOLVER ROUTINE, see IDA manual, sec 5.4, p. 27 ff.

Legend:
Removed from v.1186  
changed lines
  Added in v.1187

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