QmcChem OK

Version:1.1.13

src/parsed_text.py

@@ -125,7 +125,7 @@ def get_parsed_text():
         check_touch(line,vars,main_vars)
         txt = " ".join(vars)
         result +=  [ ([],Simple_line(line.i,"!",line.filename)),
-                     ([],Simple_line(line.i,"! >>> TOUCH %s"%(txt,),line.filename)) ]
+                     (vars,Simple_line(line.i,"! >>> TOUCH %s"%(txt,),line.filename)) ]
         def fun(x):
           if x not in variables:
             error.fail(line,"Variable %s unknown"%(x,))
@@ -328,7 +328,7 @@ parsed_text = result
 ######################################################################
 if __name__ == '__main__':
  for i in range(len(parsed_text)):
-  if parsed_text[i][0] == 'mpi.irp.f':
+  if parsed_text[i][0] == 'vmc_step.irp.f':
    print '!-------- %s -----------'%(parsed_text[i][0])
    for line in parsed_text[i][1]:
      print line[1]

src/variable.py

@@ -241,7 +241,7 @@ class Variable(object):
           "  open(unit=irp_iunit,file='irpf90_%s_'//trim(irp_num),form='FORMATTED',status='OLD',action='READ')"%(n),
           "  read(irp_iunit,*) %s%s"%(n,build_dim(variables[n].dim)),
           "  close(irp_iunit)" ]
-        rsult += [ \
+        result += [ \
         "  call touch_%s"%(name),
         "  %s_is_built = .True."%(name) ]
         if command_line.do_debug:
@@ -409,6 +409,7 @@ class Variable(object):
     if '_builder' not in self.__dict__:
       if not self.is_main:
         self._builder = []
+      else:
         import parsed_text
         from variables import build_use, call_provides
         for filename,buffer in parsed_text.parsed_text:

src/variables.py

@@ -34,9 +34,11 @@ def build_use(vars):
   return result
 
 ######################################################################
-def call_provides(vars):
+def call_provides(vars,opt=False):
   vars = make_single( map(lambda x: variables[x].same_as, vars) )
-  vars = map(lambda x: variables[x].name,vars)
+  if opt:
+    all_children = flatten( map(lambda x: variables[x].children, vars ))
+    vars = filter(lambda x: x not in all_children,vars)
   def fun(x):
     return [ \
     "  if (.not.%s_is_built) then"%(x),

src/version.py

@@ -1 +1 @@
-version = "1.1.12"
+version = "1.1.13"