Merge remote-tracking branch 'origin/master'

这个提交包含在:
Craig Warren
2015-11-13 15:10:32 +00:00
当前提交 456bb9b51f
共有 37 个文件被更改,包括 75 次插入75 次删除

查看文件

@@ -19,7 +19,7 @@
"""gprMax.gprMax: provides entry point main()."""
# Set the version number here
__version__ = '3.0.0b5'
__version__ = '3.0.0b7'
versionname = ' (Bowmore)'
import sys, os, datetime, itertools, argparse
@@ -277,7 +277,7 @@ def run_model(args, modelrun, numbermodelruns, inputfile, inputdirectory):
snapshot.prepare_file(modelrun, numbermodelruns, G)
# Prepare output file
inputfileparts = inputfile.split('.')
inputfileparts = os.path.splitext(inputfile)
if numbermodelruns == 1:
outputfile = inputfileparts[0] + '.out'
else: