Changeset 2175
- Timestamp:
- Mar 30, 2011, 1:45:19 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/examples/Makefile.in
r1944 r2175 1 1 2 2 bindir = @bindir@ 3 datadir 4 datarootdir 3 datadir = @datadir@ 4 datarootdir = @datarootdir@ 5 5 exec_prefix = @exec_prefix@ 6 6 includedir = @includedir@ … … 8 8 mandir = @mandir@ 9 9 prefix = @prefix@ 10 destdir 10 destdir = $(prefix)/examples/3D 11 11 12 SHELL 13 INSTALL 14 MKDIR_P 12 SHELL = @SHELL@ 13 INSTALL = @INSTALL@ 14 MKDIR_P = @MKDIR_P@ 15 15 16 destdir 16 destdir = $(prefix)/examples 17 17 18 18 FILES = \ … … 27 27 graph \ 28 28 objects \ 29 zoo 29 zoo 30 30 31 31 32 .PHONY: $(SUBDIRS)32 .PHONY: $(SUBDIRS) 33 33 34 34 all: build … … 42 42 $(MKDIR_P) -m 0755 $(destdir) 43 43 for i in $(FILES) ; do \ 44 $(INSTALL) -m 555 $$i $(destdir) ; \44 $(INSTALL) -m 0555 $$i $(destdir) ; \ 45 45 done 46 46 for i in $(SUBDIRS) ; do \ -
trunk/examples/app-fermi/octave/Makefile.in
r1581 r2175 15 15 MKDIR_P = @MKDIR_P@ 16 16 17 all: all_2 all_317 SUBDIRS = 2 3 18 18 19 all_2: 20 $(MAKE) -C 2 all 19 all: 20 for i in $(SUBDIRS) ; do \ 21 $(MAKE) -C $$i all || exit 1 ;\ 22 done 21 23 22 all_3: 23 $(MAKE) -C 3 all 24 25 26 install: install_2 install_3 27 28 install_2: 29 $(MAKE) -C 2 install 30 31 install_3: 32 $(MAKE) -C 3 install 24 install: 25 for i in $(SUBDIRS) ; do \ 26 $(MAKE) -C $$i install || exit 1 ;\ 27 done 33 28 34 29 clean: 30 for i in $(SUBDIRS) ; do \ 31 $(MAKE) -C $$i clean ;\ 32 done 35 33 36 34 distclean: clean -
trunk/examples/flow/Makefile.in
r1944 r2175 34 34 $(MKDIR_P) -m 0755 $(destdir) 35 35 for i in $(FILES) ; do \ 36 $(INSTALL) -m 444 $$i $(destdir) ; \36 $(INSTALL) -m 0444 $$i $(destdir) ; \ 37 37 done 38 38 for i in $(examples) ; do \ -
trunk/gui/Makefile.in
r2117 r2175 28 28 .PHONY: src scripts apps 29 29 30 all:src scripts apps30 SUBDIRS = src scripts apps 31 31 32 scripts: 33 $(MAKE) -C scripts all 34 src: 35 $(MAKE) -C src all 36 apps: 37 $(MAKE) -C apps all 32 all: 33 for i in $(SUBDIRS) ; do \ 34 $(MAKE) -C $$i all || exit 1 ;\ 35 done 38 36 39 install: install_src install_scripts install_apps37 install: 40 38 $(MKDIR_P) -m 0755 $(destdir) 41 @for i in $(FILES); do \39 for i in $(FILES); do \ 42 40 echo "Installing $$i" ; \ 43 $(INSTALL) -m 444 $$i $(destdir) ; \41 $(INSTALL) -m 0444 $$i $(destdir) ; \ 44 42 done 45 $(INSTALL) -m 444 pkgIndex.tcl $(destdir) 46 47 install_scripts: scripts 48 $(MAKE) -C scripts install 49 install_src: src 50 $(MAKE) -C src install 51 install_apps: apps 52 $(MAKE) -C apps install 43 for i in $(SUBDIRS) ; do \ 44 $(MAKE) -C $$i install || exit 1 ;\ 45 done 53 46 54 47 test: … … 56 49 57 50 clean: 58 $(MAKE) -C scripts clean 59 $(MAKE) -C apps clean 51 for i in $(SUBDIRS) ; do \ 52 $(MAKE) -C $$i clean ;\ 53 done 60 54 61 55 distclean: 62 $(MAKE) -C scripts distclean 63 $(MAKE) -C apps distclean 56 for i in $(SUBDIRS) ; do \ 57 $(MAKE) -C $$i distclean ;\ 58 done 64 59 $(RM) Makefile pkgIndex.tcl 65 60 $(RM) config.cache config.log config.status -
trunk/gui/scripts/Makefile.in
r2127 r2175 150 150 @for i in $(FILES); do \ 151 151 echo "Installing $$i" ; \ 152 $(INSTALL) -m 444 $$i $(destdir) ; \152 $(INSTALL) -m 0444 $$i $(destdir) ; \ 153 153 done 154 $(INSTALL) -m 444 tclIndex $(destdir)154 $(INSTALL) -m 0444 tclIndex $(destdir) 155 155 156 156 install_images: … … 158 158 @for i in $(srcdir)/images/*.gif $(srcdir)/images/*.png $(srcdir)/images/*.xbm; do \ 159 159 echo "Installing $$i" ; \ 160 $(INSTALL) -m 444 $$i $(destdir)/images ; \160 $(INSTALL) -m 0444 $$i $(destdir)/images ; \ 161 161 done 162 162 -
trunk/gui/scripts/analyzer.tcl
r1940 r2175 1155 1155 # 1156 1156 # Used internally to determine whether pdb or lammps data represents a 1157 # trajectory rather than a single model1157 # trajectory rather than a single frame 1158 1158 # ---------------------------------------------------------------------- 1159 1159 itcl::body Rappture::Analyzer::_isPdbTrajectory {data} { … … 1179 1179 # 1180 1180 # Used internally to determine whether pdb or lammps data represents a 1181 # trajectory rather than a single model1181 # trajectory rather than a single frame 1182 1182 # ---------------------------------------------------------------------- 1183 1183 itcl::body Rappture::Analyzer::_isLammpsTrajectory { data } { … … 1219 1219 $xmlobj put ${sequence}.about.label $seqLabel 1220 1220 $xmlobj put ${sequence}.about.description $descr 1221 $xmlobj put ${sequence}.index.label " Model"1222 1223 set modelNum 11221 $xmlobj put ${sequence}.index.label "Frame" 1222 1223 set frameNum 0 1224 1224 set numLines [llength $data] 1225 1225 for { set i 0 } { $i < $numLines } { incr i } { … … 1240 1240 append contents $line\n 1241 1241 } 1242 set model ${sequence}.element($modelNum)1243 $xmlobj put ${ model}.index $modelNum1242 set frame ${sequence}.element($frameNum) 1243 $xmlobj put ${frame}.index $frameNum 1244 1244 1245 set molecule ${ model}.structure.components.molecule1245 set molecule ${frame}.structure.components.molecule 1246 1246 $xmlobj put ${molecule}.pdb $contents 1247 1247 $xmlobj put ${molecule}.formula $formula 1248 incr modelNum1248 incr frameNum 1249 1249 } 1250 1250 } … … 1271 1271 $xmlobj put ${sequence}.about.label $seqLabel 1272 1272 $xmlobj put ${sequence}.about.description $descr 1273 $xmlobj put ${sequence}.index.label " Model"1274 1275 set modelNum 11276 set modelContents ""1273 $xmlobj put ${sequence}.index.label "Frame" 1274 1275 set frameNum 0 1276 set frameContents "" 1277 1277 set inModel 0 1278 1278 foreach line $data { … … 1282 1282 } 1283 1283 if {[regexp {^[\t ]*ITEM:[ \t]+ATOMS} $line] } { 1284 if { $inModel && $ modelContents != "" } {1285 set model ${sequence}.element($modelNum)1286 $xmlobj put ${ model}.index $modelNum1284 if { $inModel && $frameContents != "" } { 1285 set frame ${sequence}.element($frameNum) 1286 $xmlobj put ${frame}.index $frameNum 1287 1287 1288 set molecule ${ model}.structure.components.molecule1289 $xmlobj put ${molecule}.lammps $ modelContents1288 set molecule ${frame}.structure.components.molecule 1289 $xmlobj put ${molecule}.lammps $frameContents 1290 1290 $xmlobj put ${molecule}.lammpstypemap $typemap 1291 1291 1292 incr modelNum1293 set modelContents ""1292 incr frameNum 1293 set frameContents "" 1294 1294 } 1295 1295 set inModel 1 … … 1299 1299 set inModel 1 1300 1300 } 1301 append modelContents $line\n1302 } 1303 } 1304 if { $ modelContents != "" } {1305 set model ${sequence}.element($modelNum)1306 $xmlobj put ${ model}.index $modelNum1301 append frameContents $line\n 1302 } 1303 } 1304 if { $frameContents != "" } { 1305 set frame ${sequence}.element($frameNum) 1306 $xmlobj put ${frame}.index $frameNum 1307 1307 1308 set molecule ${ model}.structure.components.molecule1309 $xmlobj put ${molecule}.lammps $ modelContents1308 set molecule ${frame}.structure.components.molecule 1309 $xmlobj put ${molecule}.lammps $frameContents 1310 1310 $xmlobj put ${molecule}.lammpstypemap $typemap 1311 1311 } -
trunk/gui/scripts/controls.tcl
r2159 r2175 184 184 } 185 185 } 186 187 # 188 # If this element has an <enable> expression, then register 189 # its controlling widget here. 190 # 191 set notify [string trim [$_owner xml get $path.about.notify]] 186 192 187 193 # -
trunk/lang/tcl/scripts/library.tcl
r2134 r2175 509 509 return "" 510 510 } 511 # Expat (via tDOM) will always produce utf-8 output, regardless of the 512 # encoding of the tool.xml. We need to convert utf-8 to unicode for 513 # Tcl/Tk. This shouldn't affect ASCII tool.xml files. 514 set string [encoding convertfrom utf-8 [$node text]] 511 515 if {$params(-decode) == "yes"} { 512 return [Rappture::encoding::decode -- [string trim [$node text]]] 513 } else { 514 return [string trim [$node text]] 515 } 516 set string [Rappture::encoding::decode -- $string] 517 } 518 return [string trim $string] 516 519 } 517 520 -
trunk/lang/tcl/src/RpRusage.c
r2079 r2175 195 195 double tval; 196 196 RpRusageStats curstats; 197 char buffer[TCL_DOUBLE_SPACE];197 Tcl_Obj *listObjPtr, *objPtr; 198 198 199 199 if (RpRusageCapture(interp, &curstats) != TCL_OK) { … … 213 213 markPtr = (RpRusageStats*)Tcl_GetHashValue(entryPtr); 214 214 215 listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL); 215 216 /* 216 217 * Compute: START TIME 217 218 */ 218 Tcl_AppendElement(interp, "start"); 219 objPtr = Tcl_NewStringObj("start", 5); 220 Tcl_ListObjAppendElement(interp, listObjPtr, objPtr); 219 221 tval = RpRusageTimeDiff(&markPtr->times, &RpRusage_Start.times); 220 Tcl_PrintDouble(interp, tval, buffer);221 Tcl_ AppendElement(interp, buffer);222 objPtr = Tcl_NewDoubleObj(tval); 223 Tcl_ListObjAppendElement(interp, listObjPtr, objPtr); 222 224 223 225 /* 224 226 * Compute: WALL TIME 225 227 */ 226 Tcl_AppendElement(interp, "walltime"); 228 objPtr = Tcl_NewStringObj("walltime", 8); 229 Tcl_ListObjAppendElement(interp, listObjPtr, objPtr); 227 230 tval = RpRusageTimeDiff(&curstats.times, &markPtr->times); 228 Tcl_PrintDouble(interp, tval, buffer); 229 Tcl_AppendElement(interp, buffer); 231 objPtr = Tcl_NewDoubleObj(tval); 232 Tcl_ListObjAppendElement(interp, listObjPtr, objPtr); 233 230 234 231 235 /* 232 236 * Compute: CPU TIME = user time + system time 233 237 */ 234 Tcl_AppendElement(interp, "cputime"); 238 objPtr = Tcl_NewStringObj("cputime", 7); 239 Tcl_ListObjAppendElement(interp, listObjPtr, objPtr); 235 240 tval = RpRusageTimeDiff(&curstats.resources.ru_utime, 236 241 &markPtr->resources.ru_utime) 237 242 + RpRusageTimeDiff(&curstats.resources.ru_stime, 238 243 &markPtr->resources.ru_stime); 239 Tcl_PrintDouble(interp, tval, buffer);240 Tcl_ AppendElement(interp, buffer);241 244 objPtr = Tcl_NewDoubleObj(tval); 245 Tcl_ListObjAppendElement(interp, listObjPtr, objPtr); 246 Tcl_SetObjResult(interp, listObjPtr); 242 247 return TCL_OK; 243 248 }
Note: See TracChangeset
for help on using the changeset viewer.