yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3991
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Tue 2014-05-27 13:24:16 +0200
message:
  Prevent first empty item in features.
modified:
  core/main/main.py.in
  core/main/yade-batch.in
  py/config.py.in


--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription

=== modified file 'core/main/main.py.in'
--- core/main/main.py.in	2014-05-27 11:24:16 +0000
+++ core/main/main.py.in	2014-05-27 11:24:16 +0000
@@ -20,6 +20,8 @@
 # duplicate some items from yade.config here, so that we can increase verbosity when the c++ part is booting
 features,version,debugbuild='${CONFIGURED_FEATS}'.split(' '),'${realVersion}',' ${debugbuild}'
 
+if (features[0]==''): features=features[1:]
+
 libPATH='${LIBRARY_OUTPUT_PATH}'
 if (libPATH[1:] == '{LIBRARY_OUTPUT_PATH}'): libPATH='lib'
 

=== modified file 'core/main/yade-batch.in'
--- core/main/yade-batch.in	2014-05-27 11:24:16 +0000
+++ core/main/yade-batch.in	2014-05-27 11:24:16 +0000
@@ -345,6 +345,7 @@
 numCores=getNumCores()
 maxOmpThreads=numCores if 'OpenMP' in yade.config.features else 1
 features,version='${CONFIGURED_FEATS}'.split(','),'${realVersion}'
+if (features[0]==''): features=features[1:]
 
 prog = os.path.basename(sys.argv[0])
 parser=argparse.ArgumentParser(usage='%s [options] [ TABLE [SIMULATION.py] | SIMULATION.py[/nCores] [...] ]'%prog,description='%s runs yade simulation multiple times with different parameters.\n\nSee https://yade-dem.org/sphinx/user.html#batch-queuing-and-execution-yade-batch for details.\n\nBatch can be specified either with parameter table TABLE (must not end in .py), which is either followed by exactly one SIMULATION.py (must end in .py), or contains !SCRIPT column specifying the simulation to be run. The second option is to specify multiple scripts, which can optionally have /nCores suffix to specify number of cores for that particular simulation (corresponds to !THREADS column in the parameter table), e.g. sim.py/3.'%prog)

=== modified file 'py/config.py.in'
--- py/config.py.in	2014-05-27 11:24:16 +0000
+++ py/config.py.in	2014-05-27 11:24:16 +0000
@@ -14,7 +14,10 @@
 libDir=os.path.abspath(prefix+'/'+libPATH+'/yade${SUFFIX}')
 confDir=os.environ['HOME']+'/.yade${SUFFIX}'
 libstdcxx='${libstdcxx}'
+
 features='${CONFIGURED_FEATS}'.split(' ')
+if (features[0]==''): features=features[1:]
+
 revision='${realVersion}'
 version='${version}'
 sourceRoot='${sourceRoot}'