Changeset 1209 for trunk/examples/app-fermi

Timestamp:

Nov 5, 2008, 12:38:42 PM (16 years ago)

Author:

dkearney

Message:

switching to compiled matlab examples

Location:

trunk/examples/app-fermi/matlab

Files:

• Makefile.example (moved) (moved from trunk/examples/app-fermi/matlab/compiled/Makefile) (2 diffs)
• Makefile.in (modified) (2 diffs)
• fermi.m (modified) (4 diffs)
• fermi_main.m (moved) (moved from trunk/examples/app-fermi/matlab/compiled/fermi_main.m)
• run_app.patch (moved) (moved from trunk/examples/app-fermi/matlab/compiled/run_app.patch)
• tool.xml (modified) (1 diff)

trunk/examples/app-fermi/matlab/Makefile.example

@@ -9 +9 @@
         sed s/YOURAPPNAME/$^/ < run_app.patch | patch run_$^.sh
         chmod +x run_$^.sh
-#       mv $^ $^.ctf run_$^.sh ../bin
-#       mv readme.txt ../bin/$^.readme
-#       LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/apps/rappture/lib `pwd`/../bin/run_$^.sh /apps/matlab/mcr `pwd`/driver.xml `pwd`/../data
-        simsim --tool tool.xml --driver-only driver.${APPNAME}
-        LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/apps/rappture/lib `pwd`/run_$^.sh /apps/matlab/mcr `pwd`/driver.${APPNAME}
-        rm -f run*.xml driver.${APPNAME}
+        mv $^ $^.ctf run_$^.sh ../bin
+        mv readme.txt ../bin/$^.readme
+        simsim --tool tool.xml --values default --nosim --driver driver.$^
+        LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/apps/rappture/lib `pwd`/../bin/run_$^.sh /apps/matlab/mcr `pwd`/driver.$^
+        rm -f run*.xml driver.$^
         @echo "Install Successful"
 
@@ -25 +24 @@
                 run_${APPNAME}.sh \
                 mccExcludedFiles.log \
+                ${APPNAME}.readme \
                 readme.txt \
                 ${APPNAME}_mcr
 
 distclean: clean
-#       rm -rf ../bin/*
+        rm -rf ../bin/*

trunk/examples/app-fermi/matlab/Makefile.in

@@ -1 +1 @@
 
 bindir          = @bindir@
-datadir         = @datadir@
-datarootdir     = @datarootdir@
+datadir         = @datadir@
+datarootdir     = @datarootdir@
 exec_prefix     = @exec_prefix@
 includedir      = @includedir@
@@ -8 +8 @@
 mandir          = @mandir@
 prefix          = @prefix@
-srcdir          = @srcdir@
+srcdir          = @srcdir@
 
-destdir         = $(prefix)/examples/app-fermi/matlab
+destdir         = $(prefix)/examples/app-fermi/matlab
 
-INSTALL         = @INSTALL@
-MKDIR_P         = @MKDIR_P@
+INSTALL         = @INSTALL@
+MKDIR_P         = @MKDIR_P@
+MCC             = @MCC@
 
-FILES           = \
+MCC_FLAGS       = -m -R -nojvm
+INCLUDES        = -I ../../../lang/matlab
+MCC_SWITCHES    = $(MCC_FLAGS) $(INCLUDES)
+VPATH           = $(srcdir)
+
+APPNAME = fermi
+
+FILES   = \
                 $(srcdir)/tool.xml \
-                $(srcdir)/fermi.m
+                $(srcdir)/Makefile.example \
+                ${APPNAME}.ctf
 
-all:    
+${APPNAME}: fermi_main.m fermi.m
+        $(MCC) $(MCC_SWITCHES) -o $@ $^
 
-install: 
+all: ${APPNAME}
+
+install: ${APPNAME}
+        sed s/YOURAPPNAME/$^/ < $(srcdir)/run_app.patch | patch run_$^.sh
         $(MKDIR_P) $(destdir)
         for i in $(FILES) ; do \
           $(INSTALL) -m 444 $$i $(destdir) ; \
         done
+        $(INSTALL) -m 444 readme.txt $(destdir)/$^.readme
+        $(INSTALL) -m 555 run_$^.sh $^ $(destdir)
+        $(bindir)/simsim --tool $(srcdir)/tool.xml --values default --nosim --driver driver.$^
+        LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$(libdir) $(destdir)/run_$^.sh /apps/matlab/mcr driver.$^
+        rm -f run*.xml driver.$^
+        @echo "Install Successful"
 
 clean:
+        rm -rf ${APPNAME} \
+                ${APPNAME}_main.c \
+                ${APPNAME}.ctf \
+                ${APPNAME}.prj \
+                ${APPNAME}_mcc_component_data.c \
+                run_${APPNAME}.sh \
+                mccExcludedFiles.log \
+                readme.txt \
+                ${APPNAME}_mcr
 
 distclean: clean
         $(RM) Makefile
-

trunk/examples/app-fermi/matlab/fermi.m

@@ -1 +1 @@
 % ----------------------------------------------------------------------
-%  EXAMPLE: Fermi-Dirac function in Octave.
+%  EXAMPLE: Fermi-Dirac function in Matlab.
 %
 %  This script represents a newly written application with rappture 
@@ -8 +8 @@
 %  AUTHOR:  Michael McLennan, Purdue University
 %  AUTHOR:  Derrick Kearney, Purdue University
-%  Copyright (c) 2004-2007  Purdue Research Foundation
+%  Copyright (c) 2004-2008  Purdue Research Foundation
 %
 %  See the file "license.terms" for information on usage and
@@ -14 +14 @@
 % ======================================================================
 
-% get out input file from the command line
-% invoke this script with the following command:
-% matlab -nodisplay -r infile=\'driver1234.xml\',fermi
-% the above command sets variable infile to the name 'driver1234.xml'
+function retVal=fermi;
 
-% infile = 'driver31619.xml'
-
-% open our xml input file.
-lib = rpLib(infile);
+% We open the xml file in the main function and make lib global
+global lib;
 
 % retrieve user specified data out of the input file
@@ -56 +51 @@
 rpLibResult(lib);
 
-quit;
+retVal = 0;

trunk/examples/app-fermi/matlab/tool.xml

@@ -3 +3 @@
     <tool>
         <about>Press Simulate to view results.</about>
-        <command>matlab -nodisplay -r infile='@driver',path('@tool',path),fermi</command>
+        <command>@tool/run_fermi.sh /apps/matlab/mcr @driver</command>
     </tool>
     <input>