Changeset 5191

Timestamp:

Apr 4, 2015 9:38:19 AM (9 years ago)

Author:

mmh

Message:

append units to uq parameters sent to submit

Location:

branches/uq

Files:

• lang/tcl/scripts/library.tcl (modified) (5 diffs)
• puq/get_params.py (modified) (5 diffs)

branches/uq/lang/tcl/scripts/library.tcl

@@ -1060 +1060 @@
 #
 # For example, 2 parameters, one gaussian and one uniform might return:
-# [["height",["gaussian",100,10,{"min":0}]],["velocity",["uniform",80,90]]]
+# [["height","m",["gaussian",100,10,{"min":0}]],["velocity","m/s",["uniform",80,90]]]
 #
 # Returns "" if there are no UQ parameters.
@@ -1092 +1092 @@
             }
 
+            set units ""
             set unode [$_n selectNodes units/text()]
             if {"" != $unode} {
@@ -1099 +1100 @@
             }
 
-            set v \[\"[$_n getAttribute id]\",
+            set v \[\"[$_n getAttribute id]\",\"$units\",
             #set val \"[lindex $val 0]\",[lindex $val 1],[lindex $val 2]
             set fmt "\[\"%s\",%.16g,%.16g"
@@ -1110 +1111 @@
                 if {"" != $min_node} {
                     set minv [$min_node nodeValue]
-                    if {$unode != ""} {
+                    if {$units != ""} {
                         set minv [Rappture::Units::convert $minv -context $units -units off]
                     }
@@ -1119 +1120 @@
                 if {"" != $max_node} {
                     set maxv [$max_node nodeValue]
-                    if {$unode != ""} {
+                    if {$units != ""} {
                         set maxv [Rappture::Units::convert $maxv -context $units -units off]
                     }

branches/uq/puq/get_params.py

@@ -8 +8 @@
 """
 
+from __future__ import print_function
 import sys
 import os
@@ -18 +19 @@
 sys.stderr = open("uq_debug.err", 'w')
 
-print sys.argv
+print(sys.argv)
 pid, varlist, uq_type, args = sys.argv[1:]
 
@@ -26 +27 @@
 
 varlist = unpickle(varlist)
-print "varlist=", varlist
+print("varlist=", varlist)
 
 v = {}
+units = {}
 for p in varlist:
-    name, dist = p
+    name, _units, dist = p
     name = str(name)
+    units[name] = str(_units)
     if dist[0] == u'gaussian':
         try:
@@ -38 +41 @@
             kwargs = {}
         v[name] = NormalParameter(name, name, mean=dist[1], dev=dist[2], **kwargs)
-        print v[name]
+        print(v[name])
     elif dist[0] == u'uniform':
         v[name] = UniformParameter(name, name, min=dist[1], max=dist[2])
     else:
-        print "ERROR: Unknown distribution type: %s" % dist[0]
+        print("ERROR: Unknown distribution type: %s" % dist[0])
         sys.exit(1)
 if uq_type == "smolyak":
     uq = Smolyak(v.values(), args)
 else:
-    print "ERROR: Unknown UQ type: %s" % uq_type
+    print("ERROR: Unknown UQ type: %s" % uq_type)
     os.chdir('..')
     sys.exit(1)
 
 # save parameter values to CSV file
-vals = np.column_stack([p.values for p in uq.params])
-names = ['@@'+str(p.name) for p in uq.params]
-np.savetxt(cvsname, vals, delimiter=',', header=','.join(names), comments='')
+with open(cvsname, 'w') as f:
+    print(','.join(['@@'+str(p.name) for p in uq.params]), file=f)
+    for i in range(len(uq.params[0].values)):
+        print(','.join(['%.16g%s' % (p.values[i], units[p.name]) for p in uq.params]), file=f)
 
 # This just saves PUQ state into HDF5 file, so later we can have PUQ analyze
@@ -63 +67 @@
 sw.run(hname, overwrite=True)
 
-print "Finished with get_params.py\n"
+print("Finished with get_params.py\n")