← Back to branch summary

~jdpipe/ascend/trunk-old

~jdpipe/ascend/trunk-old

Viewing all changes in revision 901.

Committer: johnpye
Date: 2006-10-26 10:18:53 UTC
Revision ID: svn-v4:f15cd148-d149-4907-926e-73cf92b3ee03:trunk:908

first attempt at merging with Ben's changes on the trunk

files added:
base/generic/compiler/packtest.c

base/generic/compiler/rel_blackbox.c

base/generic/compiler/rel_blackbox.h

base/generic/packages/bboxtest.c

base/generic/packages/bboxtest.h

models/testTrig.a4c

models/testTrig.a4s

models/z-exttest.a4c

files removed:
models/westerberg/H2PlantVals01.AWW.a4v.bz2

files modified:
base/generic/compiler/Makefile.in

base/generic/compiler/SConscript

base/generic/compiler/anoncopy.c

base/generic/compiler/anonmerg.c

base/generic/compiler/anontype.c

base/generic/compiler/arrayinst.c

base/generic/compiler/ascCompiler.c

base/generic/compiler/atomvalue.h

base/generic/compiler/bintoken.c

base/generic/compiler/check.c

base/generic/compiler/compiler.h

base/generic/compiler/copyinst.c

base/generic/compiler/createinst.c

base/generic/compiler/createinst.h

base/generic/compiler/destroyinst.c

base/generic/compiler/dimen.c

base/generic/compiler/dimen.h

base/generic/compiler/exprs.c

base/generic/compiler/exprsym.c

base/generic/compiler/extcall.h

base/generic/compiler/extfunc.c

base/generic/compiler/extfunc.h

base/generic/compiler/find.c

base/generic/compiler/find.h

base/generic/compiler/func.h

base/generic/compiler/initialize.c

base/generic/compiler/initialize.h

base/generic/compiler/instance_io.c

base/generic/compiler/instantiate.c

base/generic/compiler/instquery.c

base/generic/compiler/interval.c

base/generic/compiler/linkinst.c

base/generic/compiler/logrel_util.c

base/generic/compiler/mathinst.c

base/generic/compiler/mergeinst.c

base/generic/compiler/module.c

base/generic/compiler/name.c

base/generic/compiler/name.h

base/generic/compiler/notate.c

base/generic/compiler/numlist.c

base/generic/compiler/numlist.h

base/generic/compiler/packages.c

base/generic/compiler/packages.h

base/generic/compiler/parentchild.c

base/generic/compiler/plot.c

base/generic/compiler/procframe.h

base/generic/compiler/qlfdid.c

base/generic/compiler/refineinst.c

base/generic/compiler/relation.c

base/generic/compiler/relation.h

base/generic/compiler/relation_io.c

base/generic/compiler/relation_type.h

base/generic/compiler/relation_util.c

base/generic/compiler/relation_util.h

base/generic/compiler/simlist.c

base/generic/compiler/statement.c

base/generic/compiler/statement.h

base/generic/compiler/statio.c

base/generic/compiler/stattypes.h

base/generic/compiler/typedef.c

base/generic/compiler/when_util.c

base/generic/general/env.c

base/generic/general/mathmacros.h

base/generic/general/ospath.c

base/generic/general/ospath.h

base/generic/general/tm_time.h

base/generic/packages/Makefile.in

base/generic/packages/kvalues.c

base/generic/packages/kvalues.h

base/generic/packages/sensitivity.c

base/generic/solver/analyze.c

base/generic/solver/bnd.c

base/generic/solver/bnd.h

base/generic/solver/bndman.c

base/generic/solver/cond_config.c

base/generic/solver/conditional.c

base/generic/solver/conditional.h

base/generic/solver/discrete.c

base/generic/solver/discrete.h

base/generic/solver/ida.h

base/generic/solver/integrator.c

base/generic/solver/linsol.c

base/generic/solver/linsolqr.c

base/generic/solver/linutils.c

base/generic/solver/logrel.c

base/generic/solver/logrel.h

base/generic/solver/logrelman.c

base/generic/solver/lsode.c

base/generic/solver/lsode.h

base/generic/solver/mtx_basic.c

base/generic/solver/rel.c

base/generic/solver/rel.h

base/generic/solver/relman.c

base/generic/solver/relman.h

base/generic/solver/slv.c

base/generic/solver/slv1.c

base/generic/solver/slv3.c

base/generic/solver/slv8.c

base/generic/solver/slv9.c

base/generic/solver/slv9a.c

base/generic/solver/slv_client.h

base/generic/solver/slv_common.c

base/generic/solver/system.c

base/generic/solver/var.c

base/generic/solver/var.h

base/generic/utilities/ascConfig.h

base/generic/utilities/ascEnvVar.c

base/generic/utilities/ascEnvVar.h

base/generic/utilities/ascMalloc.c

base/generic/utilities/ascPrint.c

base/generic/utilities/error.c

models/Makefile.in

models/johnpye/datareader/datareader.c

models/johnpye/extfn/extfntest.c

pygtk/SConscript

pygtk/create.nsi

tcltk/TK/LibraryProc.tcl

tcltk/generic/interface/BrowserProc.c

tcltk/generic/interface/BrowserRel_io.c

tcltk/generic/interface/DebugProc.c

tcltk/generic/interface/Driver.c

tcltk/generic/interface/EnvVarProc.c

tcltk/generic/interface/Integrators.c

tcltk/generic/interface/LibraryProc.c

tcltk/generic/interface/ProbeProc.c

tcltk/generic/interface/Qlfdid.c

tcltk/generic/interface/SolverProc.c

tcltk/generic/interface/UnitsProc.c

tcltk/generic/interface/old_utils.c

Show diffs side-by-side

added added

removed removed

base/generic/compiler/Makefile.in

base/generic/compiler/SConscript

base/generic/compiler/anoncopy.c

base/generic/compiler/anonmerg.c

base/generic/compiler/anontype.c

base/generic/compiler/arrayinst.c

base/generic/compiler/ascCompiler.c

base/generic/compiler/atomvalue.h

base/generic/compiler/bintoken.c

base/generic/compiler/check.c

base/generic/compiler/compiler.h

base/generic/compiler/copyinst.c

base/generic/compiler/createinst.c

base/generic/compiler/createinst.h

base/generic/compiler/destroyinst.c

base/generic/compiler/dimen.c

base/generic/compiler/dimen.h

base/generic/compiler/exprs.c

base/generic/compiler/exprsym.c

base/generic/compiler/extcall.h

base/generic/compiler/extfunc.c

base/generic/compiler/extfunc.h

base/generic/compiler/find.c

base/generic/compiler/find.h

base/generic/compiler/func.h

base/generic/compiler/initialize.c

base/generic/compiler/initialize.h

base/generic/compiler/instance_io.c

base/generic/compiler/instantiate.c

base/generic/compiler/instquery.c

base/generic/compiler/interval.c

base/generic/compiler/linkinst.c

base/generic/compiler/logrel_util.c

base/generic/compiler/mathinst.c

base/generic/compiler/mergeinst.c

base/generic/compiler/module.c

base/generic/compiler/name.c

base/generic/compiler/name.h

base/generic/compiler/notate.c

base/generic/compiler/numlist.c

base/generic/compiler/numlist.h

base/generic/compiler/packages.c

base/generic/compiler/packages.h

base/generic/compiler/packtest.c

base/generic/compiler/parentchild.c

base/generic/compiler/plot.c

base/generic/compiler/procframe.h

base/generic/compiler/qlfdid.c

base/generic/compiler/refineinst.c

base/generic/compiler/rel_blackbox.c

base/generic/compiler/rel_blackbox.h

base/generic/compiler/relation.c

base/generic/compiler/relation.h

base/generic/compiler/relation_io.c

base/generic/compiler/relation_type.h

base/generic/compiler/relation_util.c

base/generic/compiler/relation_util.h

base/generic/compiler/simlist.c

base/generic/compiler/statement.c

base/generic/compiler/statement.h

base/generic/compiler/statio.c

base/generic/compiler/stattypes.h

base/generic/compiler/typedef.c

base/generic/compiler/when_util.c

base/generic/general/env.c

base/generic/general/mathmacros.h

base/generic/general/ospath.c

base/generic/general/ospath.h

base/generic/general/tm_time.h

base/generic/packages/Makefile.in

base/generic/packages/bboxtest.c

base/generic/packages/bboxtest.h

base/generic/packages/kvalues.c

base/generic/packages/kvalues.h

base/generic/packages/sensitivity.c

base/generic/solver/analyze.c

base/generic/solver/bnd.c

base/generic/solver/bnd.h

base/generic/solver/bndman.c

base/generic/solver/cond_config.c

base/generic/solver/conditional.c

base/generic/solver/conditional.h

base/generic/solver/discrete.c

base/generic/solver/discrete.h

base/generic/solver/ida.h

base/generic/solver/integrator.c

base/generic/solver/linsol.c

base/generic/solver/linsolqr.c

base/generic/solver/linutils.c

base/generic/solver/logrel.c

base/generic/solver/logrel.h

base/generic/solver/logrelman.c

base/generic/solver/lsode.c

base/generic/solver/lsode.h

base/generic/solver/mtx_basic.c

base/generic/solver/rel.c

base/generic/solver/rel.h

base/generic/solver/relman.c

base/generic/solver/relman.h

base/generic/solver/slv.c

base/generic/solver/slv1.c

base/generic/solver/slv3.c

base/generic/solver/slv8.c

base/generic/solver/slv9.c

base/generic/solver/slv9a.c

base/generic/solver/slv_client.h

base/generic/solver/slv_common.c

base/generic/solver/system.c

base/generic/solver/var.c

base/generic/solver/var.h

base/generic/utilities/ascConfig.h

base/generic/utilities/ascEnvVar.c

base/generic/utilities/ascEnvVar.h

base/generic/utilities/ascMalloc.c

base/generic/utilities/ascPrint.c

base/generic/utilities/error.c

models/Makefile.in

models/johnpye/datareader/datareader.c

models/johnpye/extfn/extfntest.c

models/testTrig.a4c

models/testTrig.a4s

models/westerberg/H2PlantVals01.AWW.a4v.bz2

models/z-exttest.a4c

pygtk/SConscript

pygtk/create.nsi

tcltk/TK/LibraryProc.tcl

tcltk/generic/interface/BrowserProc.c

tcltk/generic/interface/BrowserRel_io.c

tcltk/generic/interface/DebugProc.c

tcltk/generic/interface/Driver.c

tcltk/generic/interface/EnvVarProc.c

tcltk/generic/interface/Integrators.c

tcltk/generic/interface/LibraryProc.c

tcltk/generic/interface/ProbeProc.c

tcltk/generic/interface/Qlfdid.c

tcltk/generic/interface/SolverProc.c

tcltk/generic/interface/UnitsProc.c

tcltk/generic/interface/old_utils.c

Older »