Overview
Comment:New method of sympar generation implemented - uses mtt_make_sympar
Check/update of numpar.txt is forced.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | origin/master | trunk
Files: files | file ages | folders
SHA3-256: b34acf51b70eee2bb82b33d851041db364915ae25b56c718e6b12bf33af7a39a
User & Date: gawthrop@users.sourceforge.net on 2000-10-12 18:38:47
Other Links: branch diff | manifest | tags
Context
2000-10-12
19:24:55
Corrected output message check-in: 9a68fc3954 user: gawthrop@users.sourceforge.net tags: origin/master, trunk
18:38:47
New method of sympar generation implemented - uses mtt_make_sympar
Check/update of numpar.txt is forced. check-in: b34acf51b7 user: gawthrop@users.sourceforge.net tags: origin/master, trunk
17:57:34
Fixed header typos check-in: 9f8f1c1bc5 user: gawthrop@users.sourceforge.net tags: origin/master, trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified mttroot/mtt/bin/mtt from [0040f711d1] to [a5e8c125bc].

︙︙
11
12
13
14
15
16
17



18
19
20
21
22
23
24

# Copyright (C) 2000 by Peter J. Gawthrop

###############################################################
## Version control history
###############################################################
## $Header$
## $Log$



## Revision 1.273  2000/10/10 21:00:27  peterg
## More changes for new code gneration
##
## Revision 1.272  2000/10/06 16:20:00  peterg
## added ode_write rule
##
## Revision 1.271  2000/10/03 12:14:25  peterg








>
>
>








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.274  2000/10/12 15:11:54  peterg
## Added the update function for numpar only
##
## Revision 1.273  2000/10/10 21:00:27  peterg
## More changes for new code gneration
##
## Revision 1.272  2000/10/06 16:20:00  peterg
## added ode_write rule
##
## Revision 1.271  2000/10/03 12:14:25  peterg
︙︙
1775
1776
1777
1778
1779
1780
1781




1782
1783
1784
1785
1786
1787
1788
1789
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

#SUMMARY cr	constitutive relationship for each subsystem (tex)
#SUMMARY cr	constitutive relationship for each subsystem (view)
$1_cr.tex: $1_cr.r
	txt2tex $1 cr r

#SUMMARY sympar	symbolic parameters (txt)
#SUMMARY sympar*	symbolic parameters (view)




# Lbl to sympar conversion
ifeq ($switches,0)
$1_sympar.txt: $1_sub.sh $1_abg.m 
	abg2sympar_m2txt $1
 
	if [ "$level" = "0" ]; then \
	  mv $1_sympar.txt MTT_sympar.txt; \
	else \
	  cat $1_sympar.txt >> MTT_sympar.txt; \
	fi
 
	sh $1_sub.sh "rm -f " '_sympar.txt' # Delete sympar files
	sh $1_sub.sh "mtt $mtt_switches -q -u -l $level+1 " ' sympar txt' # and recreate them
 
	if [ "$level" = "0" ]; then \
	  sort_sympar <MTT_sympar.txt> $1_sympar.txt; \
	fi
endif
ifeq ($switches,1)
$1_sympar.txt: $1_sub.sh $1_abg.m
	abg2sympar_m2txt $1
 
	if [ "$level" = "0" ]; then \
	  mv $1_sympar.txt MTT_sympar.txt; \
	else \
	  cat $1_sympar.txt >> MTT_sympar.txt; \
	fi
 
	sh $1_sub.sh "rm -f " '_sympar.txt' # Delete sympar files
	sh $1_sub.sh "mtt $mtt_switches -q -u -l $level+1 " ' sympar txt' # and recreate them
 
	if [ "$level" = "0" ]; then \
	  sort_sympar <MTT_sympar.txt  > $1_sympar.txt1; \
	  struc2switch_txt $1; \
	  echo "Appending switch declarations"; \
	  cat $1_sympar.txt1 $1_switch.txt> $1_sympar.txt; \
	fi

endif


# ## Old version -- just looks on top level
# ## $1_sympar.r: $1_lbl.txt $1_params.r
# ## 	lbl2sympar_txt2r $1
# ## 	echo "IN \"$1_params.r\";" >> $1_sympar.r
# ## 	echo 'END;' >> $1_sympar.r








>
>
>
>

|
|
|

|
|
|
|
|

|
|

|
|
|
|
|
|
|

|
|
|
|
|

|
|

|
|
|
|
|
|

|








1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
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
1830
1831
1832
1833
1834

#SUMMARY cr	constitutive relationship for each subsystem (tex)
#SUMMARY cr	constitutive relationship for each subsystem (view)
$1_cr.tex: $1_cr.r
	txt2tex $1 cr r

#SUMMARY sympar	symbolic parameters (txt)
#SUMMARY sympar*	symbolic parameters (view)
$1_sympar.txt: $1_type.sh $1_abg.m $1_aliased.txt
	mtt_make_sympar $1


# Lbl to sympar conversion
# ifeq ($switches,0)
# $1_sympar.txt: $1_sub.sh $1_abg.m 
# 	abg2sympar_m2txt $1
 
# 	if [ "$level" = "0" ]; then \
# 	  mv $1_sympar.txt MTT_sympar.txt; \
# 	else \
# 	  cat $1_sympar.txt >> MTT_sympar.txt; \
# 	fi
 
# 	sh $1_sub.sh "rm -f " '_sympar.txt' # Delete sympar files
# 	sh $1_sub.sh "mtt $mtt_switches -q -u -l $level+1 " ' sympar txt' # and recreate them
 
# 	if [ "$level" = "0" ]; then \
# 	  sort_sympar <MTT_sympar.txt> $1_sympar.txt; \
# 	fi
# endif
# ifeq ($switches,1)
# $1_sympar.txt: $1_sub.sh $1_abg.m
# 	abg2sympar_m2txt $1
 
# 	if [ "$level" = "0" ]; then \
# 	  mv $1_sympar.txt MTT_sympar.txt; \
# 	else \
# 	  cat $1_sympar.txt >> MTT_sympar.txt; \
# 	fi
 
# 	sh $1_sub.sh "rm -f " '_sympar.txt' # Delete sympar files
# 	sh $1_sub.sh "mtt $mtt_switches -q -u -l $level+1 " ' sympar txt' # and recreate them
 
# 	if [ "$level" = "0" ]; then \
# 	  sort_sympar <MTT_sympar.txt  > $1_sympar.txt1; \
# 	  struc2switch_txt $1; \
# 	  echo "Appending switch declarations"; \
# 	  cat $1_sympar.txt1 $1_switch.txt> $1_sympar.txt; \
# 	fi

# endif


# ## Old version -- just looks on top level
# ## $1_sympar.r: $1_lbl.txt $1_params.r
# ## 	lbl2sympar_txt2r $1
# ## 	echo "IN \"$1_params.r\";" >> $1_sympar.r
# ## 	echo 'END;' >> $1_sympar.r
︙︙
1932
1933
1934
1935
1936
1937
1938


1939
1940
1941
1942
1943
1944

1945
1946
1947
1948
1949
1950
1951


#SUMMARY simpar	simulation information (m)
$1_simpar.m: $1_simpar.txt
	mtt_txt2m $1 simpar


#SUMMARY numpar	numerical parameter declaration -- default (txt) 


ifeq ($target,$1_numpar.txt)
$1_numpar.txt: $1_sympar.txt
	mtt_update $1 numpar update
else
	mtt_update $1 numpar
endif

#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) 
$1_numpar.c:  $1_numpar.txt $1_sympar.c








>
>

<




>








1939
1940
1941
1942
1943
1944
1945
1946
1947
1948

1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960


#SUMMARY simpar	simulation information (m)
$1_simpar.m: $1_simpar.txt
	mtt_txt2m $1 simpar


#SUMMARY numpar	numerical parameter declaration -- default (txt) 
$1_numpar.txt : FORCE
	mtt -q $1 sympar txt
ifeq ($target,$1_numpar.txt)

	mtt_update $1 numpar update
else
	mtt_update $1 numpar
endif
FORCE:
#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) 
$1_numpar.c:  $1_numpar.txt $1_sympar.c
︙︙
2121
2122
2123
2124
2125
2126
2127


2128
2129
2130
2131
2132
2133
2134

#Elementary system equations + definitions
$Subsystem_ese.r: $1_cbg.m
	   cbg2ese_m2r $partition $info_switch $Subsystem; #ese_tidy $1
$1_def.r: $1_ese.r
	touch $1_def.r
$1_struc.txt: $1_ese.r
	touch $1_struc.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;









>
>








2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145

#Elementary system equations + definitions
$Subsystem_ese.r: $1_cbg.m
	   cbg2ese_m2r $partition $info_switch $Subsystem; #ese_tidy $1
$1_def.r: $1_ese.r
	touch $1_def.r
$1_struc.txt: $1_ese.r
	touch $1_struc.txt
$1_aliased.txt: $1_ese.r
	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;
︙︙

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