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

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

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 1247 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Jan 27 00:11:34 2007 UTC (16 years, 4 months ago) by johnpye
File length: 36016 byte(s)
Diff to previous 1226
Added 'hires.a4c' test model.
Split slv_system_structure out of slv.c and into system_impl.h.
Changed void* diffvars pointer in slv_system_structure to a typed pointer.
Moved SolverDiffVarCollectionStruct into system_impl.h.
Renamed slv_system_structure to just system_structure (in anticipation of a 'system' module separate from the actual solvers).

Revision 1226 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jan 25 00:06:42 2007 UTC (16 years, 4 months ago) by johnpye
File length: 41037 byte(s)
Diff to previous 1222
Split slv_param.[ch] from slv.c and slv_common.h.
Removed some lint

Revision 1222 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jan 24 13:46:44 2007 UTC (16 years, 4 months ago) by johnpye
File length: 47622 byte(s)
Diff to previous 1221
Fixed the crash, determined that there is a problem with creation via slv_param_char. Heap space is not being used.

Revision 1221 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jan 24 13:33:06 2007 UTC (16 years, 4 months ago) by johnpye
File length: 47617 byte(s)
Diff to previous 1211
Implemented the DAE partitioning routine but am nowing tracking down a fiendish memory crash.

Revision 1211 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jan 23 05:09:50 2007 UTC (16 years, 4 months ago) by johnpye
File length: 47609 byte(s)
Diff to previous 1209
Fixed dependencies on dimen.h and fractions.h.

Revision 1209 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jan 23 04:11:50 2007 UTC (16 years, 4 months ago) by johnpye
File length: 47667 byte(s)
Diff to previous 1201
Cleaning up some redundant compiler dependencies

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

Revision 1199 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jan 22 11:22:15 2007 UTC (16 years, 4 months ago) by johnpye
File length: 47690 byte(s)
Diff to previous 1196
Added method integrator_debug to integrator API (outputs internal data structures from integrator).
Added test cases for the diffvars code (python test.py).
Suppressed a lot of 'slv_get_*_*_list is NULL' messages when destroying system.
Specialised the system_build error message a little.

Revision 1196 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jan 22 05:41:59 2007 UTC (16 years, 4 months ago) by johnpye
File length: 47539 byte(s)
Diff to previous 1188
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 1188 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Jan 21 09:55:00 2007 UTC (16 years, 4 months ago) by johnpye
File length: 47439 byte(s)
Diff to previous 1183
Removed redundant get_linsol* functions where all they do is return NULL.
Moved get_diffvars to slv_client.

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

Revision 1140 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jan 15 04:08:08 2007 UTC (16 years, 4 months ago) by johnpye
File length: 47957 byte(s)
Diff to previous 1133
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 1133 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Jan 14 11:51:48 2007 UTC (16 years, 4 months ago) by johnpye
File length: 47941 byte(s)
Diff to previous 1132
Removed the 'REX' and 'IEX' array aliases (added the solver parameter comments directly in the slv_param_* calls).
Renamed Simulation::[gs]etSolverParameters to Simulation::[gs]etParameters.
Added [gs]etParameter (singular) methods to SWIG wrapper.
Fixed missing NULL in IDA.
Fixed bug with BDF/AM wrong way round in LSODE.
Removed some debug output from slv.c

Revision 1132 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Jan 14 10:40:58 2007 UTC (16 years, 4 months ago) by johnpye
File length: 47923 byte(s)
Diff to previous 1097
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 1097 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jan 10 05:41:38 2007 UTC (16 years, 4 months ago) by johnpye
File length: 47853 byte(s)
Diff to previous 1070
Fixed up some error reporting stuff in LSODE.
Fixed up command-line invocation of 'ascdev' and also 'ASC_GDB=1 ascdev'.

Revision 1070 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jan 8 14:36:31 2007 UTC (16 years, 4 months ago) by johnpye
File length: 47824 byte(s)
Diff to previous 1064
The extent of my efforts with an improved analyse routine for IDA. All commented out but can be activated using scons IDA_NEW_ANALYSE=1.

Revision 1064 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Jan 7 09:15:56 2007 UTC (16 years, 4 months ago) by johnpye
File length: 47461 byte(s)
Diff to previous 1063
Replaced all Asc_Panic calls with ASC_PANIC, which includes __FUNCTION__, __FILE__, __LINE__ reporting.

Revision 1063 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Jan 7 07:54:06 2007 UTC (16 years, 4 months ago) by johnpye
File length: 47484 byte(s)
Diff to previous 1034
Changed ASC_DLLSPEC(TYPE) to ASC_DLLSPEC TYPE, because it was causing havoc with doxygen and ctags.

Revision 1034 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jan 4 05:37:55 2007 UTC (16 years, 5 months ago) by johnpye
File length: 47486 byte(s)
Diff to previous 1027
Switch 'void slv_*' function to output a 0-on-success error flag.
Added some debug output to ensure that such output gets through.
Fixed TestBlackBox.testfail1 to work, using above changes.
Simulation::solve now throws an exception on failure (will need to modify PyGTK GUI accordingly)

Revision 1027 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jan 3 12:46:37 2007 UTC (16 years, 5 months ago) by johnpye
File length: 47447 byte(s)
Diff to previous 1026
Fixing bug with importhandler_setsharedpointer (you need to RemoveTableData if you want to overwrite a value)
Minor correction to (not fully implemented) importhandler_destroylibrary for case where library is NULL.

Revision 1026 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jan 3 12:03:08 2007 UTC (16 years, 5 months ago) by johnpye
File length: 47446 byte(s)
Diff to previous 946
Working on tracking down a segfault occuring when TestIDADENSE and TestExtFn test suites are run together.
Added comments about new solverparameter macros.

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

Revision 945 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Nov 25 12:41:03 2006 UTC (16 years, 6 months ago) by johnpye
File length: 47183 byte(s)
Diff to previous 942
Fixed a bug in slv_param_char.
More work on IDA ongoing.

Revision 942 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Nov 25 05:26:47 2006 UTC (16 years, 6 months ago) by johnpye
File length: 47072 byte(s)
Diff to previous 908
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 908 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Oct 26 10:18:53 2006 UTC (16 years, 7 months ago) by johnpye
File length: 43666 byte(s)
Diff to previous 709
first attempt at merging with Ben's changes on the trunk

Revision 709 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jun 28 16:28:57 2006 UTC (16 years, 11 months ago) by johnpye
File length: 43545 byte(s)
Diff to previous 708
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 708 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jun 27 07:34:31 2006 UTC (16 years, 11 months ago) by johnpye
File length: 43609 byte(s)
Diff to previous 573
Replaced some references to ascmalloc with ASC_NEW_ARRAY

Revision 573 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue May 9 01:05:40 2006 UTC (17 years ago) by johnpye
File length: 43657 byte(s)
Diff to previous 507
No error thrown when slv_set_logincidence is passed a NULL.

Revision 507 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Apr 19 02:44:25 2006 UTC (17 years, 1 month ago) by johnpye
File length: 43166 byte(s)
Diff to previous 506
Fixing for ubuntu GCC 4

Revision 506 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Apr 18 14:30:39 2006 UTC (17 years, 1 month ago) by johnpye
File length: 43093 byte(s)
Diff to previous 430
The Visual C++ 2005 version now builds without linker errors.
But I ran the installer and it crashed during the first C++ call, so still problems.

Revision 430 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Apr 4 07:18:41 2006 UTC (17 years, 2 months ago) by ben.allan
File length: 43093 byte(s)
Diff to previous 411
got rid of errant executable bits.

Revision 411 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Apr 2 07:05:54 2006 UTC (17 years, 2 months ago) by ben.allan
File length: 43093 byte(s)
Diff to previous 408
Restored autotools to working, parsers to typ_ and zz_,
Fixed many missing initializations, many casting insanities
that have been creeping in, many missing forward declarations
in preparation for fixing external relations.


Revision 408 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Apr 1 22:51:06 2006 UTC (17 years, 2 months ago) by ben.allan
File length: 43063 byte(s)
Diff to previous 399
Fixed a mouse paste error in the slv system for the vars buf.
Whoever migrated the bufs into the system struct really needs to
turn on -Wall and pay attention to the compiler complaints.

Revision 399 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Mar 31 08:52:57 2006 UTC (17 years, 2 months ago) by johnpye
File length: 43063 byte(s)
Diff to previous 303
Normalised all #include statements so that files in the current directory
are included as "localfile.h" and files in other directories are included as
<directory/file.h>
This is in accordance with the spec at
http://gcc.gnu.org/onlinedocs/gcc-4.1.0/cpp/Include-Syntax.html#Include-Syntax

Revision 303 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Feb 21 02:38:13 2006 UTC (17 years, 3 months ago) by johnpye
File length: 43251 byte(s)
Diff to previous 225
Documentation, indentation and debugging-message changes.

Revision 225 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jan 27 14:55:43 2006 UTC (17 years, 4 months ago) by johnpye
File length: 43280 byte(s)
Diff to previous 214
Added const-ness to 2nd parameter of slv_set_char_parameter.
Implemented setting of int, real and string parameters via PyGTK interface.

Revision 214 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jan 25 00:25:56 2006 UTC (17 years, 4 months ago) by johnpye
File length: 43274 byte(s)
Diff to previous 202
Fixing typo

Revision 202 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jan 23 03:56:57 2006 UTC (17 years, 4 months ago) by johnpye
File length: 43275 byte(s)
Diff to previous 201
Fixed a problem with NULL passed to slv_set_logincidence

Revision 201 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Jan 21 03:48:27 2006 UTC (17 years, 4 months ago) by johnpye
File length: 43437 byte(s)
Diff to previous 200
Cleaning up a little

Revision 200 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Jan 21 03:45:15 2006 UTC (17 years, 4 months ago) by johnpye
File length: 44495 byte(s)
Diff to previous 199
More crazy macros in slv.c :)

Revision 199 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Jan 21 02:23:55 2006 UTC (17 years, 4 months ago) by johnpye
File length: 45469 byte(s)
Diff to previous 198
Finished adding macros in slv.c.

Revision 198 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jan 19 08:14:26 2006 UTC (17 years, 4 months ago) by johnpye
File length: 55665 byte(s)
Diff to previous 197
More simplification...

Revision 197 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jan 19 07:59:19 2006 UTC (17 years, 4 months ago) by johnpye
File length: 60038 byte(s)
Diff to previous 190
Major simplification: wrap up many 'slv_' methods using preprocessor macros.

Revision 190 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jan 16 08:53:30 2006 UTC (17 years, 4 months ago) by johnpye
File length: 64974 byte(s)
Diff to previous 154
- Simplifying many 'error_reporter' calls with new macros:
    ERROR_REPORTER_NOLINE and ERROR_REPORTER_HERE
- Adding some cygwin cases in the PyGTK build.

Revision 154 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Dec 22 15:18:02 2005 UTC (17 years, 5 months ago) by johnpye
File length: 65088 byte(s)
Diff to previous 153
Removing debug output, adding self_test to iapws95.

Revision 153 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Dec 22 13:53:42 2005 UTC (17 years, 5 months ago) by johnpye
File length: 66072 byte(s)
Diff to previous 151
Fixing bug #178.

Revision 151 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Dec 22 10:58:33 2005 UTC (17 years, 5 months ago) by johnpye
File length: 65913 byte(s)
Diff to previous 150
Working on a test case for bug #178

Revision 150 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Dec 22 09:24:56 2005 UTC (17 years, 5 months ago) by johnpye
File length: 65630 byte(s)
Diff to previous 149
Committed changes to C++ solver class to accommodate new slv_lookup_client.
Still seeing bug #178 though.

Revision 149 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Dec 22 08:51:04 2005 UTC (17 years, 5 months ago) by johnpye
File length: 65573 byte(s)
Diff to previous 148
Woops :)

Revision 148 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Dec 22 08:49:39 2005 UTC (17 years, 5 months ago) by johnpye
File length: 65754 byte(s)
Diff to previous 147
Changed from 'TEST expr' syntax to 'ASSERT expr' syntax.
Corrected ConfigAscend ability to compile with CMSlv solver.

Revision 147 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Dec 22 06:24:16 2005 UTC (17 years, 5 months ago) by ben.allan
File length: 65475 byte(s)
Diff to previous 130
added slv_lookup_client which should help resolve misunderstanding #178.

Revision 130 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Dec 20 23:37:10 2005 UTC (17 years, 5 months ago) by johnpye
File length: 65205 byte(s)
Diff to previous 126
Working on eliminating some compiler warnings about unitialised vars
and the like.

Revision 126 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Dec 20 13:27:11 2005 UTC (17 years, 5 months ago) by johnpye
File length: 64820 byte(s)
Diff to previous 124
Reformating comments in the SLV files

Revision 124 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Dec 20 08:32:25 2005 UTC (17 years, 5 months ago) by johnpye
File length: 65133 byte(s)
Diff to previous 108
Adding 'TEST' statement to ASCEND METHOD syntax.
Standardising messages in slv3.
Trying to debug bug #175.

Revision 108 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Dec 13 05:53:20 2005 UTC (17 years, 5 months ago) by johnpye
File length: 63105 byte(s)
Diff to previous 97
Moved some solver error messages to FPRINTF(ASCERR) convention.
Trying to get IAPWS-95 to work two-phase.

Revision 97 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Dec 9 03:49:19 2005 UTC (17 years, 5 months ago) by jds
File length: 63101 byte(s)
Diff to previous 85
Minor fixes to:
 - continue killing compiler warnings on gcc & msvc 
 - start working on function/data pointer mismatches
 - documentation tweaks

Fixed ascMalloc.c memory logging problems.  This has not been tested on linux/unix.  If it fails to compile, please revert to the previous version and let me know.

Revision 85 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Dec 6 18:04:27 2005 UTC (17 years, 5 months ago) by johnpye
File length: 63103 byte(s)
Diff to previous 76
A working (very slow) version of IAPWS95 which works around bug #154.
Added some debugging messages to solver (temporary).
Removed SIGINT trap.

Revision 76 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Dec 5 17:31:00 2005 UTC (17 years, 6 months ago) by johnpye
File length: 63026 byte(s)
Diff to previous 62
More error_reporter calls.
Removed some C++-unfriendly var names.
Removed some debug messages.
Turned off compiler timing and relation debugging.

Revision 62 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Nov 30 05:53:20 2005 UTC (17 years, 6 months ago) by johnpye
File length: 62986 byte(s)
Diff to previous 16
My first commit:
Added 'error_reporter' for standardised error reporting
Working on getting external functions running again
Also: issue 130, issue 68, issue 131, issue 89, issue 127, issue 138, issue 94.

Revision 16 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Nov 25 22:52:42 2004 UTC (18 years, 6 months ago) by ben.allan
File length: 62742 byte(s)
Diff to previous 11
replaced nonportable strdup with ascend equivalent.

Revision 11 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Nov 13 16:45:56 2004 UTC (18 years, 6 months ago) by aw0a
File length: 62739 byte(s)
Copied from: trunk/ascend4/solver/slv.c revision 10
Diff to previous 1
moving things to base/generic

Revision 1 - (view) (download) (as text) (annotate) - [select for diffs]
Added Fri Oct 29 20:54:12 2004 UTC (18 years, 7 months ago) by aw0a
Original Path: trunk/ascend4/solver/slv.c
File length: 62739 byte(s)
Setting up web subdirectory in repository

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