/[ascend]/trunk/base/generic/solver/SConscript
ViewVC logotype

Log of /trunk/base/generic/solver/SConscript

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 1751 - (view) (download) (annotate) - [select for diffs]
Modified Mon Feb 11 05:27:18 2008 UTC (12 years, 1 month ago) by jpye
File length: 1497 byte(s)
Diff to previous 1747
Fixed bug #370 (CONOPT_LINKED behaviour on Windows, problems with 'PREDECOR')

Revision 1747 - (view) (download) (annotate) - [select for diffs]
Modified Sun Feb 10 03:42:42 2008 UTC (12 years, 1 month ago) by jpye
File length: 1508 byte(s)
Diff to previous 1684
Fixed bug #361.
Moved a number of vars out of SUBST_DICT to prevent config.h changes from spawning a rebuild of libascend.
Eliminated use of ASC_WITH_CONOPT from C code (still need ASC_LINKED_CONOPT for the moment).


Revision 1684 - (view) (download) (annotate) - [select for diffs]
Modified Thu Dec 20 22:30:30 2007 UTC (12 years, 3 months ago) by jpye
File length: 948 byte(s)
Diff to previous 1679
Added test cases to instantiate models using the compiler, and test for resulting child instances etc.
Changed most 'AddSymbolL' to 'AddSymbol' (to reduce use of magic #s).
Cleaned up a few #include lists.
Renamed 'Asc_DeAllocSim' to 'sim_destroy'.
Removed some CVS 'lint'.
Removed 'SimsProc' commenting from 'simlist.c'.
Added some missing #includes in .h files (FWIW).
Removed the 'STATIC_xxx' headers from base/generic/solver/SConscript.

Revision 1679 - (view) (download) (annotate) - [select for diffs]
Modified Wed Dec 19 06:20:49 2007 UTC (12 years, 3 months ago) by jpye
File length: 1077 byte(s)
Diff to previous 1540
Moved 'incidence.c' and 'incidence.h' to base/generic/system.
Change system_write_graph to use GraphViz directly, and create PNG output.
Created 'TestSystem' suite in test.py and added test for PNG graph create (no checking performed though so far).
Updated Simulation::write to use the new system_write_graph syntax (no filters any more).
Fixed WITH_GRAPHVIZ flags for graph.c.

Revision 1540 - (view) (download) (annotate) - [select for diffs]
Modified Sun Jul 15 03:59:23 2007 UTC (12 years, 8 months ago) by jpye
File length: 1090 byte(s)
Diff to previous 1496
Reorganising CONOPT binding so that building support for CONOPT is possible without it being installed.

Revision 1496 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jun 11 08:05:50 2007 UTC (12 years, 9 months ago) by jpye
File length: 1087 byte(s)
Diff to previous 1495
Moved logical block partitioning from system/slv_stdcalls.c to solver/logblock.c.
Perhaps it even belongs in lrslv.c.

Revision 1495 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jun 11 07:32:03 2007 UTC (12 years, 9 months ago) by jpye
File length: 1075 byte(s)
Diff to previous 1491
Fixed missing symbol exports for building on Windows.
External solvers are working fine in the PyGTK interface.
A bug appears to be present in the Tcl/Tk interface.

Revision 1491 - (view) (download) (annotate) - [select for diffs]
Modified Sun Jun 10 13:49:39 2007 UTC (12 years, 9 months ago) by jpye
File length: 1020 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) (annotate) - [select for diffs]
Modified Sun Jun 10 05:09:34 2007 UTC (12 years, 9 months ago) by jpye
File length: 980 byte(s)
Diff to previous 1436
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 1436 - (view) (download) (annotate) - [select for diffs]
Modified Mon May 21 09:39:28 2007 UTC (12 years, 10 months ago) by jpye
File length: 971 byte(s)
Diff to previous 1320
Fixed build for SCons 0.96.92. Needs testing.

Revision 1320 - (view) (download) (annotate) - [select for diffs]
Modified Tue Mar 6 12:15:21 2007 UTC (13 years ago) by jpye
File length: 979 byte(s)
Diff to previous 1316
Eliminated linsol, slv0 and slv1: moved the original files to 'disused' and editing out
all reference to them in solvers and related code (including some Tcl/Tk wrapper code)

Revision 1316 - (view) (download) (annotate) - [select for diffs]
Modified Mon Mar 5 07:22:21 2007 UTC (13 years ago) by johnpye
File length: 993 byte(s)
Diff to previous 1226
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 1226 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jan 25 00:06:42 2007 UTC (13 years, 2 months ago) by johnpye
File length: 1200 byte(s)
Diff to previous 1205
Split slv_param.[ch] from slv.c and slv_common.h.
Removed some lint

Revision 1205 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jan 23 03:03:01 2007 UTC (13 years, 2 months ago) by johnpye
File length: 1187 byte(s)
Diff to previous 1194
Split block partitioning stuff from slv_stdcalls.[ch] into block.[ch].

Revision 1194 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jan 22 01:30:56 2007 UTC (13 years, 2 months ago) by johnpye
File length: 1178 byte(s)
Diff to previous 1183
Split diffvars stuff out of analyse.c.
Fixed IDA to work when vars are fixed/freed after the integration system is build.
There will still be problems where fixing/freeing a *derivative* causes relations to drop out.

Revision 1183 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jan 20 09:15:51 2007 UTC (13 years, 2 months ago) by johnpye
File length: 1165 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) (annotate) - [select for diffs]
Modified Sat Jan 20 03:50:21 2007 UTC (13 years, 2 months ago) by johnpye
File length: 1370 byte(s)
Diff to previous 1128
Shifted everything integration-related out into a separate directory.

Revision 1128 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jan 13 08:33:43 2007 UTC (13 years, 2 months ago) by johnpye
File length: 2394 byte(s)
Diff to previous 1086
Migrated dense matrix functions out of lsode.c and into a new file.
Added Matrix Market format dense matrix output function in densemtx.c.

Revision 1086 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jan 9 14:33:29 2007 UTC (13 years, 2 months ago) by johnpye
File length: 2383 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) (annotate) - [select for diffs]
Modified Mon Jan 8 11:25:33 2007 UTC (13 years, 2 months ago) by johnpye
File length: 2379 byte(s)
Diff to previous 1060
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 1060 - (view) (download) (annotate) - [select for diffs]
Modified Sun Jan 7 07:10:16 2007 UTC (13 years, 2 months ago) by johnpye
File length: 2272 byte(s)
Diff to previous 1012
Moved vector functions out of slv_common.c into mtx_vector.c
Created corresponding mtx_vector.h
Renamed vector_data to vec_vector and corresponding functions from slv_ to vec_* (with other minor named changed).
Made necessary changes to SConstruct, Makefile.in.
Done with regexxer, should have caught everything hopefully.

Revision 1012 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jan 3 03:13:20 2007 UTC (13 years, 2 months ago) by johnpye
File length: 2258 byte(s)
Diff to previous 994
Added idalinear.[ch], which will expose the linsolqr solver as a linear solver for IDA.
Modified ida.c to support this new linear solver under the name 'ASCEND'.

Revision 994 - (view) (download) (annotate) - [select for diffs]
Modified Fri Dec 22 14:28:40 2006 UTC (13 years, 3 months ago) by johnpye
File length: 2210 byte(s)
Diff to previous 969
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 969 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 19 00:57:26 2006 UTC (13 years, 3 months ago) by johnpye
File length: 2139 byte(s)
Diff to previous 913
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 913 - (view) (download) (annotate) - [select for diffs]
Modified Sat Oct 28 03:55:19 2006 UTC (13 years, 5 months ago) by johnpye
File length: 2133 byte(s)
Diff to previous 832
Added test for SUNDIALS version (2.2.1 and 2.3.0-pre are preferred)
Fixed silly warning message about ignored return values from CONSOLE_DEBUG on GCC.

Revision 832 - (view) (download) (annotate) - [select for diffs]
Modified Wed Aug 23 07:06:47 2006 UTC (13 years, 7 months ago) by johnpye
File length: 2009 byte(s)
Diff to previous 811
Renamed testTrig to testfunc.a4c.
Removed some buildtime messages.
Added self-test to testfunc model.
Some windows-specific changes to SConstruct (need testing?)

Revision 811 - (view) (download) (annotate) - [select for diffs]
Modified Thu Aug 10 17:08:16 2006 UTC (13 years, 7 months ago) by johnpye
File length: 2001 byte(s)
Diff to previous 800
Added vim 'syntax=python' comments to many SConscript files.
Lots more work on the datareader extfn.
The testtmy.a4c file requires the file obtained here ('gzip -d' before use)
http://rredc.nrel.gov/solar/old_data/nsrdb/tmy2/unix/23161.tm2.Z

Revision 800 - (view) (download) (annotate) - [select for diffs]
Modified Tue Aug 1 12:22:09 2006 UTC (13 years, 8 months ago) by johnpye
File length: 1973 byte(s)
Diff to previous 790
Fixed for CONOPT under Windows.

Revision 790 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jul 27 07:33:45 2006 UTC (13 years, 8 months ago) by johnpye
File length: 2004 byte(s)
Diff to previous 783
Added support for dlopening of CONOPT. This means that we can distribute ASCEND without
needing to maintain two versions.

Revision 783 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jul 26 09:16:19 2006 UTC (13 years, 8 months ago) by johnpye
File length: 1963 byte(s)
Diff to previous 743
First work towards reinstating the CONOPT solver. So far, I've got it building
and linking without errors, but haven't tested the resulting runtime.

Revision 743 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jul 6 14:22:26 2006 UTC (13 years, 8 months ago) by johnpye
File length: 1645 byte(s)
Diff to previous 721
Few small changes to fix for Linux after the recent MSVC++ oriented changes.

Revision 721 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jul 3 06:22:42 2006 UTC (13 years, 8 months ago) by johnpye
File length: 1633 byte(s)
Diff to previous 669
Added '--models' option to ascend-config.
Fixed a bug with packages.c wrt generating absolute paths to library files.
Added SCons directives to install header files in INSTALL_INCLUDE subdirs.
Changed rel.c so that init function is only run if provided in the package.
Added 'ospath_getabs' to convert relative paths into absolute paths by adding prefix of fully-resolved '.'

Revision 669 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 21 07:00:45 2006 UTC (13 years, 9 months ago) by johnpye
File length: 1384 byte(s)
Diff to previous 507
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 507 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 19 02:44:25 2006 UTC (13 years, 11 months ago) by johnpye
File length: 635 byte(s)
Diff to previous 463
Fixing for ubuntu GCC 4

Revision 463 - (view) (download) (annotate) - [select for diffs]
Modified Sun Apr 16 10:18:16 2006 UTC (13 years, 11 months ago) by johnpye
File length: 606 byte(s)
Diff to previous 392
Converting to the new shared-object configuration (on email discussion with Ben)
First stage: PyGTK interface on windows. More to come.

Revision 392 - (view) (download) (annotate) - [select for diffs]
Modified Thu Mar 30 12:36:15 2006 UTC (14 years ago) by johnpye
File length: 562 byte(s)
Diff to previous 385
Some fixes to the SCons build:
- adding flags to enable QRSLV and CMSLV by default.
- adding commands to build SWIG library correctly for Python interface.

Revision 385 - (view) (download) (annotate) - [select for diffs]
Added Thu Mar 30 04:14:29 2006 UTC (14 years ago) by johnpye
File length: 462 byte(s)
First attempt at SCons build. This will build the static libraries
for me on Linux with GCC 4.0.2. Will work now on getting it to 
build the Tcl/Tk GUI.

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