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

Log of /trunk/base/generic/solver/integrator.c

Parent Directory Parent Directory | Revision Log Revision Log


Sticky Revision:
(Current path doesn't exist after revision 1180)

Revision 991 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Dec 21 10:44:32 2006 UTC (13 years, 9 months ago) by johnpye
File length: 47164 byte(s)
Diff to previous 985
Added IDA 'MAXNCF' option.
Added TestIDA.testlotkaDENSE.

Revision 985 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Dec 21 04:06:02 2006 UTC (13 years, 9 months ago) by johnpye
File length: 47183 byte(s)
Diff to previous 979
Trying to get idakryx example working.
Better reporting of failures from IDACalcIC.

Revision 979 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Dec 20 14:34:16 2006 UTC (13 years, 9 months ago) by johnpye
File length: 47300 byte(s)
Diff to previous 977
Added simplified ASC_PANIC call that uses var-args, added throughout relation_util.c.
Fixed var_filter_t stuff in djex and fvex.
More assertions in integrator.c
Added output of initial state from lsode.c (hoping that's a good idea?)
Fixed output code from relman_diff2.
Added asc_panic_nofunc for non var-arg CPPs.
Disabled -O3 flag in building C++ API
Added __getitem__ and __getattr__ methods in Simuluation for simplified python syntax (eg M.x instead M.sim.x)
Integrator::analyse throws exceptions on error now.


Revision 977 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Dec 20 00:39:52 2006 UTC (13 years, 9 months ago) by johnpye
File length: 45132 byte(s)
Diff to previous 969
Abstracted the internal integrator calls into a struct IntegratorInternals.
Fixed up compile-time list of integrators.
If IDA is not available, then 'INTEG_IDA' will not be defined.
Added ASC_ASSERT_RANGE for assertions x in [low,high).
Changed calling convention for integrator_get_engines().

Revision 969 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Dec 19 00:57:26 2006 UTC (13 years, 9 months ago) by johnpye
File length: 45194 byte(s)
Diff to previous 952
Added placeholder for a C version of Art's DAE solver (named 'AWW')
Added support for SPBCG and SPTFQMR Krylov solvers in IDA.
Attempted separation of ascpy.i and solver.i (ongoing)
Fixed an error message in typedef.c
Fixed typo in ivpStepN.tcl
Added correctly hidden Simulation() ctor.

Revision 952 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Nov 28 23:01:50 2006 UTC (13 years, 10 months ago) by johnpye
File length: 44544 byte(s)
Diff to previous 948
Pruned some debug messages from integrator.c, ida.c.
Improved exception messages from SolverParameter class.
Added array access functions to Instanc class (ongoing).
Attempting to run CUnit tests from the Python test suite (not successful, ongoing).
Cleaned up some headers, license notices, doxy docs, etc.
Fixed wrong #include <dmalloc.h> in ascpy.i (thanks Krishnan).

Revision 948 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Nov 26 01:36:49 2006 UTC (13 years, 10 months ago) by johnpye
File length: 44208 byte(s)
Diff to previous 947
Fixed bug with integrator_ida_djex, and switched to using *solvers* varlist in integrator 'visit' routine (needs checking with LSODE!)

Revision 947 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Nov 26 00:26:57 2006 UTC (13 years, 10 months ago) by johnpye
File length: 44206 byte(s)
Diff to previous 946
Fixed problem with integrator_analyse_dae, IDA work ongoing.

Revision 946 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Nov 25 15:28:56 2006 UTC (13 years, 10 months ago) by johnpye
File length: 42984 byte(s)
Diff to previous 944
Found bug in integrator_analyse_dae... ongoing

Revision 944 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Nov 25 10:46:13 2006 UTC (13 years, 10 months ago) by johnpye
File length: 42730 byte(s)
Diff to previous 942
Implemented ATOLVECT, ATOL, RTOL parameters for the IDA integrator.

Revision 942 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Nov 25 05:26:47 2006 UTC (13 years, 10 months ago) by johnpye
File length: 42102 byte(s)
Diff to previous 941
Incorporated 'SolverParameters' functionality into 'Integrator', both at C level and C++/Python.
This shouldn't break Tcl/Tk as default parameters will be set and used invisibly.

Revision 941 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Nov 24 10:46:32 2006 UTC (13 years, 10 months ago) by johnpye
File length: 40925 byte(s)
Diff to previous 930
Changed integrator_set_engine to return 0 on success.
Fixed Integrator::setEngine to throw range_error / IndexError on invalid selection.
Test suite contains testIDA that works now (more tests yet to come)

Revision 930 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Nov 22 13:09:09 2006 UTC (13 years, 10 months ago) by johnpye
File length: 40874 byte(s)
Diff to previous 928
solve.py raises ImportError if 'browser' object is not available (right approach?)
Freeing some variables in dsgsat2.a4c.
Returing Py_None from extpy routine in 'browser' object not defined (eg during non-GUI unit testing)
Error reporting from extpy import handler (ongoing)
Timeout in versioncheck (when server unavailable)
A little more tinkering with IDA.

Revision 928 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Nov 22 10:32:18 2006 UTC (13 years, 10 months ago) by johnpye
File length: 40845 byte(s)
Diff to previous 921
Commented out some stream redirection stuff for simplicity.
The CUnit test suite now works as expected (but without output suppression, for the moment).
Some more effort on IDA (ongoing).

Revision 921 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Nov 6 07:49:06 2006 UTC (13 years, 10 months ago) by johnpye
File length: 43319 byte(s)
Diff to previous 917
Fixing up some malloc/free problems with  integrator.c, removing some debug output from slv3.
Working on fixing IDA for systems with inactive variables (ongoing).

Revision 917 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Nov 2 21:34:59 2006 UTC (13 years, 11 months ago) by johnpye
File length: 42979 byte(s)
Diff to previous 912
Added some debug stuff to work on the on_load problem.

Revision 912 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Oct 27 07:18:21 2006 UTC (13 years, 11 months ago) by johnpye
File length: 42949 byte(s)
Diff to previous 908
Removed BBOXWHINE (replaced with some one-time-only warnings for the moment)
Added ExtMethodDestroyFn to allow 'user_data' associated with external methods to be destroyed.
Implemented the destroy fn through to 'extpy' module.
Added 'name' as an extra parameter in the user_data for extpy, to help with debug msgs.
Moved 'solvernotes' to a file of its own (was part of listnotes.py)
Added 'repaint' to GTK 'tools' menu (for debugging)
Added 'python.h' to top of library, type files (pygtk) to stop silly warnings.
Working on some diagnosing of problems as noted in Simulation::checkInstance.
Removed some old comments from namio.h and others.
Renamed 'blsys' to 'sys' in integrator.c.
Some work on fixing up the J*v function for IDA (not yet complete).
Added new 'destroyfn' parameter (as NULL) to all calls to 'CreateUserFunctionMethod'.

Revision 908 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Oct 26 10:18:53 2006 UTC (13 years, 11 months ago) by johnpye
File length: 41690 byte(s)
Diff to previous 903
first attempt at merging with Ben's changes on the trunk

Revision 903 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Oct 25 13:07:12 2006 UTC (13 years, 11 months ago) by johnpye
File length: 41655 byte(s)
Diff to previous 894
Some success with IDA: fixed up the indexing dilemma and was able to
integrate 'johnpye/thermalequilibrium.a4c' for a short time span (but
through to 3000 s as with LSODE). I would blame lack of jacobian routine
in the first instance.

Added 'more properties' button in Properties dialog for a variable, to allow
values of ode_id, ode_type etc to be queried (but not changed).


Revision 894 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Oct 23 01:07:58 2006 UTC (13 years, 11 months ago) by johnpye
File length: 41075 byte(s)
Diff to previous 888
Improved error message in integrator.c (added names of variables with clashing ode_id).
Removed debug output from observer.py.
Fixed icon paths in modelview (context menu)

Revision 888 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Oct 11 14:53:27 2006 UTC (13 years, 11 months ago) by johnpye
File length: 40850 byte(s)
Diff to previous 854
Added 'energy_per_volume' and 'power_per_volume' to atoms.a4l.
Converting dsg.a4c into a dynamic (IVP) model.
Removed some debug output from various places.
Renamed some functions in lsode.c (removed references to 'blsode' name)
Added comments in LSODE about what method is being used.
Improved LSODE error output a little bit (why bother tho eh)
Improved coupla error msgs in slv_stdcalls.c.

Revision 854 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Sep 20 13:36:40 2006 UTC (14 years ago) by johnpye
File length: 40830 byte(s)
Diff to previous 815
First tentative version in 'integration reporting':
Values of observed variables from the simulation are added to an Observer table after simulation completes.
This is not very efficiently coded at this stage but is a start.
Also some minor changes to text and comments in some base/generic files.

Revision 815 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Aug 11 04:51:27 2006 UTC (14 years, 1 month ago) by johnpye
File length: 40886 byte(s)
Diff to previous 777
Removed some debug output

Revision 777 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jul 18 04:40:08 2006 UTC (14 years, 2 months ago) by johnpye
File length: 40862 byte(s)
Diff to previous 741
Working on fixing a couple of VC++ warnings

Revision 741 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jul 6 08:54:42 2006 UTC (14 years, 2 months ago) by johnpye
File length: 40858 byte(s)
Diff to previous 725
Fixes for MSVC++

Revision 725 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jul 3 11:52:45 2006 UTC (14 years, 3 months ago) by johnpye
File length: 40888 byte(s)
Diff to previous 709
Fixed a *stupid* bug with relation.c in CreateBlackBoxRelation...

Revision 709 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jun 28 16:28:57 2006 UTC (14 years, 3 months ago) by johnpye
File length: 40870 byte(s)
Diff to previous 704
Monster commit!
Lots of recommenting and reorganising of external relations-related stuff.
Replaced a lot of ascmalloc and asccalloc calls with the new ASC_NEW* macros.
Fixed (?) the problem Art is having with icons in PyGTK.
Turned on -Wall in SConstruct and fixed up a stack of warnings.
Removed the redundant exit(2) from after Asc_Panic calls and added __attribute__((noreturn)).
Set doxygen to create callgraphs to level 2, updated doxyfile to version 1.4.7.
Fixed up building of extfntest.c.

Revision 704 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jun 26 23:00:56 2006 UTC (14 years, 3 months ago) by ben.allan
File length: 40740 byte(s)
Diff to previous 700
- fixed a minor bug in the use of dimensions in samplelist
and a #define misuse in ospath.
- defined eolstyle unix on the trunk, as I have encountered
at least 4 too many mixed-eol-style-in-one-file files in trying to 
rebuild today. obviously committer discipline is insufficient.


Revision 700 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jun 26 12:56:55 2006 UTC (14 years, 3 months ago) by johnpye
File length: 41259 byte(s)
Diff to previous 669
Removed 'instance.c' (it said we should).
A little bit more work on blackbox_evaluate_residual.

Revision 669 - (view) (download) (as text) (annotate) - [select for diffs]
Added Wed Jun 21 07:00:45 2006 UTC (14 years, 3 months ago) by johnpye
File length: 41357 byte(s)
Merged changes from DAE branch (revisions 702 to 819) back into trunk.
This adds the Integration API to the ASCEND solver (in base/generic).
Also provides pre-alpha support for 'IDA' from the SUNDIALS suite, a DAE solver.
Many other minor code clean-ups, including adoption of new 'ASC_NEW' and friends (to replace 'ascmalloc')
Added some very sketchy stuff providing 'DIFF(...)' syntax, although it is anticipated that this will be removed.

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

  Diffs between and
  Type of Diff should be a

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