/[ascend]/trunk/ascend/integrator/integrator.c
ViewVC logotype

Log of /trunk/ascend/integrator/integrator.c

Parent Directory Parent Directory | Revision Log Revision Log


Links to HEAD: (view) (download) (as text) (annotate)
Sticky Revision:

Revision 2322 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Dec 15 06:12:36 2010 UTC (12 years, 11 months ago) by jpye
File length: 43199 byte(s)
Diff to previous 2036
Refactoring ascMalloc.h, mem.h to belong in 'general' with goal of having no references in 'general' to functions in 'utilities'.

Revision 2036 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon May 18 15:03:16 2009 UTC (14 years, 6 months ago) by ballan
File length: 43201 byte(s)
Diff to previous 2018
issues resolved:
295
390
301
cmslv.c: unused var cleanup.
lsode/SConscript: fortran flags bugs-- may not work with 0.9x scons.
works with 1.2+. when adding -w, or any special flags, be sure to add
them and not replace the original flag.
system/var.c: 64bit clarity.
system/discrete.c: 64bit clarity.
system/analyze*: g_reuse declared in wrong place. 64bit clarity
system/diffvars: missing prototype function, 64bit clarity.
compiler/numlist.*: changed from int to glint.
compiler/simlist.c: missing includes needed for 64bit clarity.
compiler/instance_io.c: missing includes needed for 64bit clarity.
compiler/initialize.[ch]: const clarifications.
compiler/packages.c: const clarifications.
compiler/module.c: const clarifications.
compiler/statio.c: unused var cleanup.
compiler/procframe; const clarification. memory deallocation bugs.
compiler/notequery.c: repaired multiple casting and 64bit issues.
compiler/importhandler.c: const and free issues fixed.
compiler/type_desc.c: ridiculous if constructs clarified.
compiler/createinst.c: casting stupidity repaired.
linear/ranki2.c: missing includes needed for 64bitness.
solver/solver.c: const issues clarified.
utilities/ascConfig.h: added GLint typedefs for dealing with gllist
64bit portability.
utilities/ascPanic.c: removed extraneous const.
general/ospath.c: safer,quieter handling for string pointer difference.
integrator/integrator.c: const issues clarified.
packages/sensitivity.c: missing includes needed fo 64bit sanity.
tcltk/interface/Integrators.c: 64 bitness.
tcltk/interface/SimsProc.c: const errors.
tcltk/interface/Driver.c: fixed env var handling wrt ascend-config (295)
models/test/z*a4c: fixed meters -> m conversion; someone never ran the
test suite after teasing the default units to ambiguous abbreviations.
SConstruct: added sizeof checks; output might be better put in a ascend
system-wide header.



Revision 2018 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Apr 29 03:38:10 2009 UTC (14 years, 7 months ago) by jpye
File length: 43140 byte(s)
Diff to previous 2011
Fixed compile for new header file locations <ascend/compiler/xxx.h> etc.

Revision 2011 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Apr 28 08:58:48 2009 UTC (14 years, 7 months ago) by jpye
File length: 43091 byte(s)
Copied from: trunk/base/generic/integrator/integrator.c revision 2010
Diff to previous 1734
Moving libascend components from #/base/generic into #/ascend

Revision 1734 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Feb 6 01:22:28 2008 UTC (15 years, 10 months ago) by jpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 43091 byte(s)
Diff to previous 1519
Fixing up DOPRI5 as standard integrator.
Fixed bug 357 preventing repeated registration of integrators (in integrator.c).
Cleaned up SConstruct file use of WITH_SOLVERS a little bit.

Revision 1519 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jun 28 15:04:00 2007 UTC (16 years, 5 months ago) by jpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 43091 byte(s)
Diff to previous 1509
Adding support for ASCENDSOLVERS env var, for defining location of the ASCEND solvers.
By default this will be /usr/share/ascend/solvers.

Revision 1509 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jun 27 13:08:47 2007 UTC (16 years, 5 months ago) by jpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 43097 byte(s)
Diff to previous 1496
Fixed external loading of integrators, at least on my system. Needs testing
with/without fortran, sundials, etc.
Changed little thing kn d1mach.c to make default behaviour correct on Linux.

Revision 1496 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jun 11 08:05:50 2007 UTC (16 years, 6 months ago) by jpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 42639 byte(s)
Diff to previous 1491
Moved logical block partitioning from system/slv_stdcalls.c to solver/logblock.c.
Perhaps it even belongs in lrslv.c.

Revision 1491 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Jun 10 13:49:39 2007 UTC (16 years, 6 months ago) by jpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 42648 byte(s)
Diff to previous 1487
Moved all solvers to dynamically loaded modules currently in folder models/johnpye.
Location of these files will ultimately change.

Revision 1487 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Jun 10 05:09:34 2007 UTC (16 years, 6 months ago) by jpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 42534 byte(s)
Diff to previous 1479
Changes to the way in which sovlers are registered, to facilitate
dynamically-loaded solvers. Also split much of the 'solver' stuff
from slv.c (in the system directory) out into new file solver/solver.c
and added matching solver/solver.h. Solver IDs are now fixed-- they
don't change, and are stored in a list instead of in an array.

Revision 1479 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jun 5 14:06:15 2007 UTC (16 years, 6 months ago) by jpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 42525 byte(s)
Diff to previous 1473
Some work on sub-step interpolation for DOPRI5; ongoing.

Revision 1473 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jun 4 13:10:01 2007 UTC (16 years, 6 months ago) by jpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 42513 byte(s)
Diff to previous 1459
Fix problem with incidence matrix and detection of matplotlib

Revision 1459 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu May 31 13:28:33 2007 UTC (16 years, 6 months ago) by jpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 42492 byte(s)
Diff to previous 1452
DOPRI5 is running... but is it correct? Still needs lots of testing

Revision 1452 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon May 28 14:01:51 2007 UTC (16 years, 6 months ago) by jpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 42490 byte(s)
Diff to previous 1387
Integrators can now be dynamically loaded. DOPRI5 has progressed but still doesn't work.

Revision 1387 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Apr 7 14:43:31 2007 UTC (16 years, 8 months ago) by jpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 40997 byte(s)
Diff to previous 1339
Added plot support in Integrator output tabs.
Some other minor debugging for pylab integration and idaanalyse output.

Revision 1339 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Mar 10 13:57:01 2007 UTC (16 years, 9 months ago) by jpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 40928 byte(s)
Diff to previous 1337
Removed ASC_IDA_NEW_ANALYSE condition from the codebase.
Cleaned up some debug output.

Revision 1337 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Mar 10 12:33:15 2007 UTC (16 years, 9 months ago) by jpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 50677 byte(s)
Diff to previous 1316
Added support for detection of boundary crossing in the IDA integrator.
Cleared up some code comments and formatting.

Revision 1316 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Mar 5 07:22:21 2007 UTC (16 years, 9 months ago) by johnpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 50590 byte(s)
Diff to previous 1306
Another one of these big refactorings. Split out 'system' directory from 'solver' directory. This will need more work
but it's a start at getting the non-solver-specific code out separately.

Revision 1306 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Mar 3 11:50:47 2007 UTC (16 years, 9 months ago) by johnpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 50590 byte(s)
Diff to previous 1303
Added and performed basic tests of integrator_ida_write_matrix. Generalised the write_matrix
routine so that *any* requested output can be retrieved from the integrator (for the case
of IDA this is y and y', but it could equally be more complicated stuff.)

Revision 1303 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Mar 1 06:04:21 2007 UTC (16 years, 9 months ago) by johnpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 50568 byte(s)
Diff to previous 1271
silenced some debug output

Revision 1271 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Feb 4 02:00:01 2007 UTC (16 years, 10 months ago) by johnpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 50372 byte(s)
Diff to previous 1240
Added bounds checking to IDA.
Suppressed some debug output.
TestSteam.testpeturbida is broken now.

Revision 1240 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jan 26 11:12:20 2007 UTC (16 years, 10 months ago) by johnpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 50509 byte(s)
Diff to previous 1221
@!@#$#$%! working at last

Revision 1221 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jan 24 13:33:06 2007 UTC (16 years, 10 months ago) by johnpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 50494 byte(s)
Diff to previous 1214
Implemented the DAE partitioning routine but am nowing tracking down a fiendish memory crash.

Revision 1214 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jan 23 11:30:25 2007 UTC (16 years, 10 months ago) by johnpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 50138 byte(s)
Diff to previous 1205
Added tests for dealing with dF/dy and dF/dy' incidence in IDA.

Revision 1205 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jan 23 03:03:01 2007 UTC (16 years, 10 months ago) by johnpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 50038 byte(s)
Diff to previous 1201
Split block partitioning stuff from slv_stdcalls.[ch] into block.[ch].

Revision 1201 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jan 22 13:26:06 2007 UTC (16 years, 10 months ago) by johnpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 50012 byte(s)
Diff to previous 1196
Added some more test cases for DAE problem analysis.
Little bit of tidying up in the slv*.c files.

Revision 1196 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jan 22 05:41:59 2007 UTC (16 years, 10 months ago) by johnpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 50013 byte(s)
Diff to previous 1183
slv_get_status changed to return non-zero on failure.
Tests are passing with the new IDA 'analyse' routine but still plenty of gaps.

Revision 1183 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Jan 20 09:15:51 2007 UTC (16 years, 10 months ago) by johnpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 49609 byte(s)
Diff to previous 1181
Huge reorganisation -- all mtx and lin files moved to base/generic/linear.
Required many #include statements to be changed.

Revision 1181 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Jan 20 03:50:21 2007 UTC (16 years, 10 months ago) by johnpye
Original Path: trunk/base/generic/integrator/integrator.c
File length: 49603 byte(s)
Copied from: trunk/base/generic/solver/integrator.c revision 1180
Diff to previous 1161
Shifted everything integration-related out into a separate directory.

Revision 1161 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jan 17 01:35:13 2007 UTC (16 years, 10 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
File length: 49580 byte(s)
Diff to previous 1148
Fixed value of 'dz' in dsgsat.a4c.
Added test case for saturated steam in terms of (u,v)
Other minor debug output changes.

Revision 1148 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jan 15 23:40:40 2007 UTC (16 years, 10 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
File length: 49586 byte(s)
Diff to previous 1140
Fixed ANALYSE_DEBUG in integrator.c
Added printout of indep var in IntegratorReporterConsole class (C++)

Revision 1140 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jan 15 04:08:08 2007 UTC (16 years, 10 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
File length: 49574 byte(s)
Diff to previous 1137
Added support for setting Integrator parameters through PyGTK GUI.
Lots of whitespace changes in slv3.c (sorry).
Fixed problem with freeing sys->parms in slv.c


Revision 1137 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Jan 14 13:21:45 2007 UTC (16 years, 10 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
File length: 49509 byte(s)
Diff to previous 1132
Attempting to fix sunos test.py problem.
Preparting dsgsat2. for IDA.

Revision 1132 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Jan 14 10:40:58 2007 UTC (16 years, 10 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
File length: 49358 byte(s)
Diff to previous 1129
Converted slv3 (QRSlv) to new slv_param_bool (etc) parameter code.
Adding a testcase for dsgsat with LSODE as well as IDA.
Fixed some remaining external function calls (needing userdata ptr).
Adding LSODE parameters 'METH' and 'MITER' for setting AM and BDF methods.
Rerranged v_expr in iapwssat.a4c.
Removed lower bound on mdot in satsteamstream.a4c.

Revision 1129 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Jan 13 11:40:59 2007 UTC (16 years, 10 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
File length: 49478 byte(s)
Diff to previous 1097
Added integrator_write_matrix routine to allow integrator matrices to be written out.
Modified integrator in PyGTK to output this matrix to a file in /tmp in the case where Integrator::solve fails.
Fixed a bug in densematrix_write_mmio.
The current implementation of integrator_write_matrix might not be quite right yet... needs some more thought.

Revision 1097 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jan 10 05:41:38 2007 UTC (16 years, 11 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
File length: 49042 byte(s)
Diff to previous 1087
Fixed up some error reporting stuff in LSODE.
Fixed up command-line invocation of 'ascdev' and also 'ASC_GDB=1 ascdev'.

Revision 1087 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jan 9 15:23:48 2007 UTC (16 years, 11 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
File length: 48646 byte(s)
Diff to previous 1086
Fixed independent variable detection (again).

Revision 1086 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jan 9 14:33:29 2007 UTC (16 years, 11 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
File length: 48175 byte(s)
Diff to previous 1069
Fixed up problem with IDA version in SConscript.
Identified a bug with findIndependentVar in PyGTK GUI, ongoing.

Revision 1069 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jan 8 11:25:33 2007 UTC (16 years, 11 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
File length: 48170 byte(s)
Diff to previous 1068
Added scons switch IDA_NEW_ANALYSE for the new code that implements a better DAE analysis procedure.
Minor tidying in list.[ch]
Removed some DIEDIEDIE stuff from analyze.c.
Added 'odeid' to the 'varip' structure in same.
Collapsed a bunch of repetitive stuff with those fancy #defines I like so much.
Flipped some return codes from functions integrator.c to return 0 on success.
Added #include for sensitivity.h in lsode.c.
Catch exceptions from sim.build() in do_integrate() in PyGTK GUI.
Attempted to fix tcl/tk for errors from integrator_analyse as well (not tested).

Revision 1068 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jan 8 04:45:47 2007 UTC (16 years, 11 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
File length: 47926 byte(s)
Diff to previous 1063
Fixed some ASC_PANIC calls in atomvalue.c
Removed some <!-- --> comments from list.h
Added flagging of 'deriv' vars in analyse.c (no new lists are added though)
Created separate doxygen module 'Analyse' (only affect C comments)
Fixed return codes in slv9a.c, as well as some FPRINTFs.
Cleaned up some documentation in slv_client.h.
Removed var_diff, var_set_diff flag stuff.
Added docstring for Integrator_getEngines in python wrapper.


Revision 1063 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Jan 7 07:54:06 2007 UTC (16 years, 11 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
File length: 48033 byte(s)
Diff to previous 1049
Changed ASC_DLLSPEC(TYPE) to ASC_DLLSPEC TYPE, because it was causing havoc with doxygen and ctags.

Revision 1049 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jan 5 13:45:13 2007 UTC (16 years, 11 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
File length: 48034 byte(s)
Diff to previous 1010
Changed integrator_solve to return 0 on success
Changed integrator_checkstatus to return 0 on success
Some flow-through changes as a result of these.
Fixed problem with reporting of errors in do_method (gtkbrowser.py)
Expanded error msg in integrator.cpp
Fixed catching of Integrator C++ exceptions in integratorreporter.py.
Removed M.checkStructuralSingularity() in TestSteam.testdsgsat -- causes crash (why?)

Revision 1010 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jan 2 12:53:58 2007 UTC (16 years, 11 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
File length: 47880 byte(s)
Diff to previous 994
Fixed ASC_ASSERT_RANGE (hopefully)
Fixing C99isms in integrator.[ch]

Revision 994 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Dec 22 14:28:40 2006 UTC (16 years, 11 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
File length: 47884 byte(s)
Diff to previous 993
Added VAR_DIFF and VAR_DERIV flags to var_variable type.
Added flagging of variables as such during integrator_analyse_dae.
Cleaned out some old guff from the mtx* headers.

Revision 993 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Dec 22 11:03:51 2006 UTC (16 years, 11 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
File length: 47387 byte(s)
Diff to previous 991
Added Matrix Market export routines (from math.nist.gov).
Added necessary build commands for above.
Work on Jacobi preconditioner for IDA (ongoing)
Set integrator_analye to make a call to slv_block_partition. Not sure if that's a good idea or not.
Tidied up comments in linsol.h
Moved unnecessary #defines from model_reorder.h into model_reorder.c.
Cleaned up codedocs in mtx*.h
Added WITH_MMIO config.h flag.


Revision 991 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Dec 21 10:44:32 2006 UTC (16 years, 11 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (16 years, 11 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (16 years, 11 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (16 years, 11 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (16 years, 11 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years, 1 month ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years, 1 month ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years, 1 month ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years, 1 month ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years, 1 month ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years, 1 month ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years, 2 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years, 2 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years, 4 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years, 4 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years, 5 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years, 5 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years, 5 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years, 5 months ago) by ben.allan
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years, 5 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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 (17 years, 5 months ago) by johnpye
Original Path: trunk/base/generic/solver/integrator.c
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