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

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

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 1039 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jan 4 23:21:20 2007 UTC (13 years, 3 months ago) by johnpye
File length: 138290 byte(s)
Diff to previous 1035
Fixed up some #includes in compiler .[ch] files.
Switched instantiate.c to using 'asc_assert' instead of 'assert'.
Added some missing GPL headers in C++ code.
Silenced some slv3.c debug output.
Switch void-return to int-return in slv9_presolve etc (slv9.c)
Attemping to fix solvernotes.py for the commandline environment (browser==None)
Removed redundant solve(SELF) in thermalequilibrium2.a4c.
Some error reporting from addone_calc (extfntest.c).
Expanded test size in extrelfor.a4c.
Big rearrangement of bboxtest.c for top-down style.
Fixed TestFreesteam.testintegrator, added end-value checks.


Revision 1035 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jan 4 07:35:22 2007 UTC (13 years, 3 months ago) by johnpye
File length: 138265 byte(s)
Diff to previous 1034
Softened error from bintoken.c
Improved error reporting in instantiate.c
Rearranged #includes in relation_util.[ch]
Changed to asc_assert in relman.c
Lots of fixed in slv3.c to get reporting of 'calc_ok' right.
Also some better error reporting from slv3.c.
Fixed usage info for error_reporter_tree_start().
Improved error/status reporting from bboxtest.c.
Set PyGTK GUI to correctly catch ::solve errors.
Improved reporting about when solver fails (diverged, inconsistent, exceeded time/iters)
Fixed TestBlackBox.testfail1 and TestBlackBox.testfail2.
Fixed type.cpp to throw errors when instantiation fails.

Revision 1034 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jan 4 05:37:55 2007 UTC (13 years, 3 months ago) by johnpye
File length: 137519 byte(s)
Diff to previous 921
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 921 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Nov 6 07:49:06 2006 UTC (13 years, 5 months ago) by johnpye
File length: 137143 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, 5 months ago) by johnpye
File length: 137101 byte(s)
Diff to previous 908
Added some debug stuff to work on the on_load problem.

Revision 908 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Oct 26 10:18:53 2006 UTC (13 years, 5 months ago) by johnpye
File length: 136816 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, 5 months ago) by johnpye
File length: 136784 byte(s)
Diff to previous 737
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 737 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jul 5 12:36:29 2006 UTC (13 years, 9 months ago) by johnpye
File length: 136787 byte(s)
Diff to previous 728
DSG model converges, using 3 external functions :-)
Added more info in 'diagnose' varinfo and relinfo popups, plus tabstops in display.
Allowed parameters to be used with instantiation_error in instantiate.c.
Fixed up some error messages in bintoken.c.
Renamed 'newcalc_done' to 'evaluation_required' in rel.c.
Other minor changes to error messages and commenting.


Revision 728 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jul 4 05:03:59 2006 UTC (13 years, 9 months ago) by johnpye
File length: 136775 byte(s)
Diff to previous 727
Removed some debug messages from external libraries stuff.
Fixed auto-sim stuff for files given with relative path on the commandline.

Revision 727 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jul 4 04:03:37 2006 UTC (13 years, 9 months ago) by johnpye
File length: 137158 byte(s)
Diff to previous 725
This change fixes the external relation evaluation! There are definite problems
with convergence but this may be due to tolerences being too fine in ASCEND compared
to freesteam.

Revision 725 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jul 3 11:52:45 2006 UTC (13 years, 9 months ago) by johnpye
File length: 135915 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 (13 years, 9 months ago) by johnpye
File length: 135752 byte(s)
Diff to previous 669
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 669 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jun 21 07:00:45 2006 UTC (13 years, 9 months ago) by johnpye
File length: 135547 byte(s)
Diff to previous 430
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.

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

Revision 399 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Mar 31 08:52:57 2006 UTC (14 years ago) by johnpye
File length: 137838 byte(s)
Diff to previous 334
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 334 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Feb 28 11:37:59 2006 UTC (14 years, 1 month ago) by johnpye
File length: 137950 byte(s)
Diff to previous 326
Ensure error messages find their way into PyGTK output

Revision 326 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Feb 24 02:03:45 2006 UTC (14 years, 1 month ago) by johnpye
File length: 137869 byte(s)
Diff to previous 272
Made QRSlv line search error output to ASCERR (not 'mif')

Revision 272 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Feb 5 06:43:19 2006 UTC (14 years, 2 months ago) by johnpye
File length: 137866 byte(s)
Diff to previous 222
Documentation changes.
Modified one slv3 error message.

Revision 222 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jan 27 04:23:20 2006 UTC (14 years, 2 months ago) by johnpye
File length: 137863 byte(s)
Diff to previous 190
Updating for Jerry's new error_reporter syntax, bug #179

Revision 190 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jan 16 08:53:30 2006 UTC (14 years, 2 months ago) by johnpye
File length: 137863 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 (14 years, 3 months ago) by johnpye
File length: 137869 byte(s)
Diff to previous 151
Removing debug output, adding self_test to iapws95.

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

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

Revision 124 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Dec 20 08:32:25 2005 UTC (14 years, 3 months ago) by johnpye
File length: 138535 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 (14 years, 3 months ago) by johnpye
File length: 138556 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 (14 years, 4 months ago) by jds
File length: 138461 byte(s)
Diff to previous 86
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 86 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Dec 7 04:38:54 2005 UTC (14 years, 4 months ago) by johnpye
File length: 138460 byte(s)
Diff to previous 85
Fixing bug #152 (jerry's solution)
Also some minor fixes to error reporting calls
Changed default values of IAPWS95 to some that converge.

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

Revision 62 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Nov 30 05:53:20 2005 UTC (14 years, 4 months ago) by johnpye
File length: 136818 byte(s)
Diff to previous 11
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 11 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Nov 13 16:45:56 2004 UTC (15 years, 4 months ago) by aw0a
File length: 136787 byte(s)
Copied from: trunk/ascend4/solver/slv3.c revision 10
Diff to previous 4
moving things to base/generic

Revision 4 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Nov 7 17:17:52 2004 UTC (15 years, 5 months ago) by aw0a
Original Path: trunk/ascend4/solver/slv3.c
File length: 136787 byte(s)
Diff to previous 3
MAX_MINOR added as solver parameter for QRSlv

Revision 3 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Nov 6 14:14:35 2004 UTC (15 years, 5 months ago) by aw0a
Original Path: trunk/ascend4/solver/slv3.c
File length: 136485 byte(s)
Diff to previous 2
remove debug printing from slv3.c

Revision 2 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Nov 5 21:21:36 2004 UTC (15 years, 5 months ago) by aw0a
Original Path: trunk/ascend4/solver/slv3.c
File length: 136484 byte(s)
Diff to previous 1
corrected runaway minor loop problem exposed by Helder

Revision 1 - (view) (download) (as text) (annotate) - [select for diffs]
Added Fri Oct 29 20:54:12 2004 UTC (15 years, 5 months ago) by aw0a
Original Path: trunk/ascend4/solver/slv3.c
File length: 136104 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