Overview
Comment:Initial merge of ode2odes.exe into main mtt.
standalone_rep.make deleted: rules moved to mtt, variables to mttrc.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | origin/merging-ode2odes-exe | trunk
Files: files | file ages | folders
SHA3-256: 60068009b299bd6725474289c6bf79120938ea2f2c25024656b4330a4a377177
User & Date: geraint@users.sourceforge.net on 2001-02-22 06:41:40
Other Links: branch diff | manifest | tags
Context
2001-02-23
03:53:55
Minor revisions. (ode2odes.exe works on GNU/Linux and ~GNU/Irix) check-in: 84ff77e2a0 user: geraint@users.sourceforge.net tags: origin/merging-ode2odes-exe, trunk
2001-02-22
06:41:40
Initial merge of ode2odes.exe into main mtt.
standalone_rep.make deleted: rules moved to mtt, variables to mttrc. check-in: 60068009b2 user: geraint@users.sourceforge.net tags: origin/merging-ode2odes-exe, trunk
2001-02-19
06:33:20
Created branch merging-ode2odes-exe check-in: ce97158db9 user: gawthrop@users.sourceforge.net tags: origin/merging-ode2odes-exe, trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified mttroot/mtt/bin/mtt from [7a138278c5] to [77362b82e6].

︙
11
12
13
14
15
16
17



18
19
20
21
22
23
24

11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27








+
+
+








# Copyright (C) 2000 by Peter J. Gawthrop

###############################################################
## Version control history
###############################################################
## $Header$
## $Log$
## Revision 1.293  2001/02/06 04:39:08  geraint
## Added _standalone.exe representation.
##
## Revision 1.292  2001/02/05 17:27:40  gawthrop
## Make sure _def.r exists before creating _state.txt
##
## Revision 1.291  2000/12/27 14:50:40  peterg
## This is the first CVS version (4.9).
## Commented out code now deleted
##
︙
1790
1791
1792
1793
1794
1795
1796







1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813


1814
1815
1816
1817
1818
1819
1820
1821
1822












1823
1824
1825
1826
1827
1828
1829

1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820



1821
1822


1823
1824
1825




1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844








+
+
+
+
+
+
+














-
-
-
+
+
-
-



-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+








fi


if [ -n "$sensitivity" ]; then
  sys=`echo $1 | cut -c 2-`
  sys_abg=$sys"_abg"
fi

## Check octave version
if [ `octave --version | awk -F\. '{print $2}'` ]; then
    define_octave_dev="-DOCTAVE_DEV"
else
    define_octave_dev=""
fi

################################
# This is the main mtt programme
################################


##echo Target is $target, Subsystem is $Subsystem, options are $mtt_switches
$MAKE -S $verbose  -f  -  $target << EOF

# Cancel implicit rules I don't want
%.dvi: %.tex

# MTT implicit rules
## .oct files
ifneq ($2,ode2odes)
%.oct:  %.cc $1_def.h $1_sympar.h $1_cr.h
	echo Creating $1_$2.oct; $MKOCTFILE  $< 
$1_%.oct:  $1_%.cc $1_def.h $1_sympar.h $1_cr.h
	echo Creating $1_\$*.oct; $MKOCTFILE  $1_\$*.cc
endif


## .cc files
.PRECIOUS: %.cc # Don't let mtt delete them
ifneq ($2,ode2odes)
%.cc:  %.m
	mtt_m2cc.sh  $1 $2 cat 
endif
$1_%.cc:  $1_%.m
	mtt_m2cc.sh  $1 \$* cat 

## .o files
.PRECIOUS: $1_%.o
$1_%.o: $1_%.cc $1_def.h $1_sympar.h $1_cr.h
	echo Compiling $1_\$*.cc
	${MTT_CXX} ${MTT_CXXFLAGS} ${MTT_CXXINCS} -c $< -DSTANDALONE

mtt_%.o:: ${MTT_LIB}/cc/mtt_%.cc
	echo Compiling mtt_\$*.cc
	${MTT_CXX} ${MTT_CXXFLAGS} ${MTT_CXXINCS} -c $< -DSTANDALONE $define_octave_dev

# Generates code to write reduce code
$1_ode_write.r: $1_def.m
	def2write_r  $1 $2

ifeq ("$sensitivity","sensitivity")
ifeq ("$level","0")
︙
2051
2052
2053
2054
2055
2056
2057














2058
2059
2060
2061
2062
2063
2064

2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093








+
+
+
+
+
+
+
+
+
+
+
+
+
+








	mtt_update $1 logic update
else
	mtt_update $1 logic
endif

# Dummy target
FORCE:

ode2odes_common.m    : $1_input.m   $1_logic.m   $1_numpar.m   $1_simpar.m   $1_state.m   ; @echo > /dev/null
ode2odes_common.cc   : $1_input.cc  $1_logic.cc  $1_numpar.cc  $1_simpar.cc  $1_state.cc  ; @echo > /dev/null
ode2odes_common.o    : $1_input.o   $1_logic.o   $1_numpar.o   $1_simpar.o   $1_state.o   ; @echo > /dev/null
ode2odes_common.oct  : $1_input.oct $1_logic.oct $1_numpar.oct $1_simpar.oct $1_state.oct ; @echo > /dev/null
ode2odes_euler.m     : $1_ode.m     $1_odeo.m                                             ; @echo > /dev/null
ode2odes_euler.cc    : $1_ode.cc    $1_odeo.cc                                            ; @echo > /dev/null
ode2odes_euler.o     : $1_ode.o     $1_odeo.o                                             ; @echo > /dev/null
ode2odes_euler.oct   : $1_ode.oct   $1_odeo.oct                                           ; @echo > /dev/null
ode2odes_implicit.m  : $1_cseo.m    $1_csex.m   $1_smxa.m   $1_smxax.m                    ; @echo > /dev/null
ode2odes_implicit.cc : $1_cseo.cc   $1_csex.cc  $1_smxa.cc  $1_smxax.cc                   ; @echo > /dev/null
ode2odes_implicit.o  : $1_cseo.o    $1_csex.o   $1_smxa.o   $1_smxax.o                    ; @echo > /dev/null
ode2odes_implicit.oct: $1_cseo.oct  $1_csex.oct $1_smxa.oct $1_smxax.oct                  ; @echo > /dev/null


#SUMMARY numpar	numerical parameter declaration (m) 
$1_numpar.m:  $1_numpar.txt $1_sympars.txt
	mtt_txt2m $1 numpar

#SUMMARY numpar	numerical parameter declaration (c) 
#SUMMARY numpar	numerical parameter declaration (view)
︙
2196
2197
2198
2199
2200
2201
2202
2203

2204
2205
2206
2207
2208
2209
2210

2225
2226
2227
2228
2229
2230
2231

2232
2233
2234
2235
2236
2237
2238
2239








-
+








	touch $1_aliased.txt
$1_struc.tex: $1_struc.txt
	struc_txt2tex $1
$1_struc.m: $1_struc.txt 
	struc_txt2m $1
$1_def.m: $1_def.r
	def_r2m $1; matlab_tidy $1_def.m;
$1_def.h: $1_def.m
$1_def.h: $1_def.m $1_sympar.txt
	def_m2h.sh $1

#SUMMARY rdae	raw differential-algebraic equations (r)
#SUMMARY dae	differential-algebraic equations (r)
#SUMMARY dae*	differential-algebraic equations (m)
#SUMMARY dae	differential-algebraic equations (tex)
#SUMMARY dae*	differential-algebraic equations (view)
︙
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363

2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383

2384
2385
2386
2387
2388
2389

























2390
2391
2392
2393
2394
2395
2396

2373
2374
2375
2376
2377
2378
2379












2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390










2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430








-
-
-
-
-
-
-
-
-
-
-
-

+









-
-
-
-
-
-
-
-
-
-

+






+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+








# The main simulation programme
ifeq ($integration_method,implicit)
$1_ode2odes.m : $1_def.r $1_sympars.txt \
                $1_smxa.m $1_smxax.m\
                $1_simpar.m $1_numpar.m $1_state.m $1_input.m \
                $1_csex.m $1_cseo.m  $1_logic.m
ifeq ($using_oct,yes)
	mtt $mtt_switches -q -u $1 smxa oct
	mtt $mtt_switches -q -u $1 smxax oct
	mtt $mtt_switches -q -u $1 simpar oct
	mtt $mtt_switches -q -u $1 numpar oct
	mtt $mtt_switches -q -u $1 state oct
	mtt $mtt_switches -q -u $1 input oct
	mtt $mtt_switches -q -u $1 csex oct
	mtt $mtt_switches -q -u $1 cseo oct
	mtt $mtt_switches -q -u $1 logic oct
	make_ode2odes $1 cc $integration_method
	echo Creating $1_ode2odes.oct
	mkoctfile $1_ode2odes.cc
	touch $1_ode2odes.m # Create a dummy which wont' be used
	mtt $mtt_switches -q -u $1 ode2odes oct
else
	make_ode2odes $1 m $integration_method
endif
endif
ifeq ($integration_method,euler)
$1_ode2odes.m : $1_def.r $1_sympars.txt\
		$1_simpar.m $1_numpar.m $1_state.m $1_input.m \
		$1_ode.m $1_odeo.m  $1_logic.m
ifeq ($using_oct,yes)
	mtt $mtt_switches -q -u $1 simpar oct
	mtt $mtt_switches -q -u $1 numpar oct
	mtt $mtt_switches -q -u $1 state oct
	mtt $mtt_switches -q -u $1 input oct
	mtt $mtt_switches -q -u $1 ode oct
	mtt $mtt_switches -q -u $1 odeo oct
	mtt $mtt_switches -q -u $1 logic oct
	make_ode2odes $1 cc $integration_method
	echo Creating $1_ode2odes.oct
	mkoctfile $1_ode2odes.cc
	touch $1_ode2odes.m # Create a dummy which wont' be used
	mtt $mtt_switches -q -u $1 ode2odes oct
else
	make_ode2odes $1 m $integration_method
endif

endif

$1_ode2odes.exe: $1_def.h $1_sympar.h\
		 $1_ode2odes.o ode2odes_common.o ode2odes_${integration_method}.o\
		 libmttcxx.a
	echo Creating $1_ode2odes.exe
	${MTT_CXX} ${MTT_LDFLAGS} $1_*.o ${MTT_CXXLIBS} -o $1_ode2odes.exe

libmttcxx.a: mtt_euler.o mtt_implicit.o
	echo Creating libmttcxx.a
	ar rc libmttcxx.a $^
	ranlib libmttcxx.a

$1_ode2odes.o: $1_ode2odes.cc ode2odes_common.o ode2odes_${integration_method}.o
	echo Creating $1_ode2odes.o
	${MTT_CXX} ${MTT_CXXFLAGS} ${MTT_CXXINCS} -c $1_ode2odes.cc -DSTANDALONE

$1_ode2odes.oct: $1_ode2odes.cc ode2odes_common.oct ode2odes_${integration_method}.oct
	touch $1_ode2odes.m
	echo Creating $1_ode2odes.oct
	$MKOCTFILE $1_ode2odes.cc

$1_ode2odes.cc: $1_def.r $1_sympars.txt\
		ode2odes_common.m ode2odes_common.cc\
		ode2odes_${integration_method}.m ode2odes_${integration_method}.cc
	touch $1_ode2odes.m
	make_ode2odes $1 cc $integration_method

#Conversion of m to p to c
#SUMMARY ode	ordinary differential equations (c)
#SUMMARY ode	ordinary differential equations (p)
#SUMMARY state	state declaration (c) 
#SUMMARY state	state declaration (p) 
$1_simpar.p : $1_def.r $1_simpar.m
︙

Modified mttroot/mtt/bin/mttrc from [7b899869da] to [1359c3287d].

︙
11
12
13
14
15
16
17



18
19
20
21
22
23
24

11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27








+
+
+










###############################################################
## Version control history
###############################################################
## $Id$
## $Log$
## Revision 1.17  2000/12/27 16:46:13  peterg
## Stripped the mtt- from paths
##
## Revision 1.16  2000/12/27 15:16:44  peterg
## If then else format
##
## Revision 1.15  2000/12/27 14:57:43  peterg
## Now takes the base path as an argument
##
## Revision 1.14  2000/12/27 13:11:43  peterg
︙
130
131
132
133
134
135
136























137

133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163








+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


  export LATEX2HTML="latex2html -contents_in_navigation -index_in_navigation -address http://mtt.sourceforge.net"
  
  # Ascend stuff
  export ASCENDLIBRARY=$MTTPATH/ascend/lib
  
  # Oct file generation - use version with no optimisation.
  export MKOCTFILE=$MTT_LIB/octave/mkoctfile

    # ode2odes.exe stuff
    # local system
    PREFIX="/usr/local"
    PLAT="i686-pc-linux-gnu"
    GCCVERS="2.95.2"
    SRCOCTAVE="/cvs/octave"
    # include paths
    IOCTAVE="-I${PREFIX}/include/octave"
    # library paths
    LOCTAVE="-L${PREFIX}/lib/octave -loctave -lcruft -loctinterp"
    LKPATHSEA="-L${SRCOCTAVE}/kpathsea -lkpathsea"
    LREADLINE=" -L${SRCOCTAVE}/readline -lreadline"
    LSYSTEM="-ldl -lm -lncurses"
    LF2C="-L${PREFIX}/lib/gcc-lib/${PLAT}/${GCCVERS} -lg2c"
    LMTTCXX="-L. -lmttcxx"
    # compiler options
    export MTT_CXX="g++"
    export MTT_CXXFLAGS="-g -O3"
    export MTT_LD="ld"
    export MTT_CXXLIBS="${LOCTAVE} ${LKPATHSEA} ${LREADLINE} ${LF2C} ${LSYSTEM} ${LMTTCXX}"
    export MTT_CXXINCS="-I. ${IOCTAVE}"

fi

Deleted mttroot/mtt/lib/rep/standalone_rep.make version [6e1ac4004e]. 

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59





























































-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

# -*-makefile-*-

.POSIX:

MTTFLAGS	= -q -u -oct $(OPTS)

# Adapt according to local set-up and mkoctfile
CXX		= g++
CXXFLAGS	= $(DEBUG) $(OPTIM) $(DEFINES) $(ARCHFLAGS) -fno-rtti -fno-exceptions -fno-implicit-templates

DEBUG		= -g
OPTIM		= -O3

PREFIX		= /usr/local

INCLUDES	= -I$(PREFIX)/include/octave

OCTAVE_SRC_PATH	= /cvs/octave

LIBOCTAVE	= -L$(PREFIX)/lib/octave			-loctave -lcruft -loctinterp
LIBKPATHSEA	= -L$(OCTAVE_SRC_PATH)/kpathsea			-lkpathsea
LIBREADLINE	= -L$(OCTAVE_SRC_PATH)/readline			-lreadline
#LIBBLAS		= -L/usr/local/src/ATLAS/lib/Linux_PIII		-lcblas -lf77blas -llapack -latlas -ltstatlas
#LIBBLAS		= 						-lblas -llapack
LIBF2C		= 						-lg2c
LIBRARIES	= 						-ldl -lm -lncurses

ARCHFLAGS	= $(i386FLAGS)
i386FLAGS	=  -mieee-fp 

# Define -DOCTAVE_DEV for octave 2.1.x
ifeq (0, $(shell octave --version | awk -F\. '{print $2}'))
DEFINES   = -DSTANDALONE
else
DEFINES   = -DSTANDALONE -DOCTAVE_DEV
endif

all: $(SYS)_standalone.$(LANG)

$(SYS)_standalone.exe: $(SYS)_ode2odes.cc $(SYS)_def.h $(SYS)_sympar.h
	cp $(MTT_LIB)/cc/*.cc .
	echo Creating $(SYS)_standalone.exe
	$(CXX) *.cc -o $@ $(CXXFLAGS) $(INCLUDES) $(LIBOCTAVE) $(LIBKPATHSEA) $(LIBREADLINE) $(LIBBLAS) $(LIBF2C) $(LIBRARIES)

.PHONY: $(SYS)_standalone.clean

$(SYS)_ode2odes.cc:
	mtt $(MTTFLAGS) $(SYS) ode2odes m

$(SYS)_def.h:
	mtt $(MTTFLAGS) $(SYS) def h

$(SYS)_sympar.h:
	mtt $(MTTFLAGS) $(SYS) sympar h 


$(SYS)_standalone.clean:
	cd .. ; mtt Clean
	rm -f ../$(SYS)_standalone.exe

MTT: Model Transformation Tools
[ GitHub | SourceHut | Sourceforge | Fossil RSS ]