10
0
mirror of https://gitlab.com/scemama/irpf90.git synced 2024-07-26 20:57:35 +02:00

Better error handling when ',' is missing.

This commit is contained in:
Anthony Scemama 2018-11-20 14:45:20 +01:00
parent 1b97fa4599
commit 8361bf1304
6 changed files with 20 additions and 14 deletions

View File

@ -32,7 +32,7 @@ case "$0" in
echo "To activate auto-completion in bash:" echo "To activate auto-completion in bash:"
echo "source " $0 echo "source " $0
else else
exec python $(dirname $0)/../src/irpman.py $1 exec python2 $(dirname $0)/../src/irpman.py $1
fi fi
;; ;;

View File

@ -1,4 +1,4 @@
IRPF90 = python ../src/irpf90.py -I input -a -d IRPF90 = python2 ../src/irpf90.py -I input
FC = ifort FC = ifort
FCFLAGS= -O2 FCFLAGS= -O2
NINJA = NINJA =

View File

@ -73,11 +73,6 @@ def main():
for x in parents: for x in parents:
print "- %s"%(x,) print "- %s"%(x,)
if command_line.do_codelet:
import profile
profile.build_rdtsc()
import codelet
codelet.run()
if not command_line.do_run: if not command_line.do_run:
return return
@ -90,6 +85,12 @@ def main():
import makefile import makefile
makefile.create() makefile.create()
if command_line.do_codelet:
import profile
profile.build_rdtsc()
import codelet
codelet.run()
from modules import modules, write_module from modules import modules, write_module
for m in modules.keys(): for m in modules.keys():
write_module(modules[m]) write_module(modules[m])

View File

@ -52,12 +52,12 @@ def build_rdtsc():
file = open(filename,'w') file = open(filename,'w')
file.write(rdtsc) file.write(rdtsc)
file.close() file.close()
# def t(): def t():
# p = subprocess.Popen(["gcc","-O2",filename,"-c","-o","irp_rdtsc.o"]) p = subprocess.Popen(["gcc","-O2",filename,"-c","-o","irp_rdtsc.o"])
# p.communicate() p.communicate()
# os.remove(filename) os.remove(filename)
#
# threading.Thread(target=t).start() threading.Thread(target=t).start()
def build_module(): def build_module():
from variables import variables from variables import variables

View File

@ -105,6 +105,11 @@ class Variable(object):
for line in text: for line in text:
if type(line) == Begin_provider: if type(line) == Begin_provider:
self._name = line.filename[1] self._name = line.filename[1]
if "(" in self._name:
error.fail(line,"""'(' not allowed in variable name.
A ',' is probably missing between the name of the variable and the
dimension.
""")
break break
return self._name return self._name
name = property(name) name = property(name)

View File

@ -1 +1 @@
version = "1.7.1" version = "1.7.2"