Changeset 13097

Timestamp:

08/20/12 14:03:54 (13 years ago)

Author:

jschierm

Message:

CHG: Changes for first successful python run (including very important missing 'else').

Location:

issm/trunk-jpl/src/m

Files:

• os/issmscpin.py (modified) (1 diff)
• solve/WriteData.py (modified) (5 diffs)
• solve/loadresultsfromcluster.py (modified) (1 diff)
• solve/loadresultsfromdisk.py (modified) (1 diff)
• solve/marshall.py (modified) (1 diff)

issm/trunk-jpl/src/m/os/issmscpin.py

@@ -64 +64 @@
                                 string=string[:-1]+'}'
 
-
                         if port:
                                 subprocess.call('scp -P %d %s@localhost:%s %s' % (port,login,os.path.join(path,string),os.getcwd),shell=True)

issm/trunk-jpl/src/m/solve/WriteData.py

@@ -104 +104 @@
                         data=numpy.array([data])
                 if len(data.shape) == 1:
-                        data=data.reshape(1,numpy.size(data,0))
+                        if numpy.size(data):
+                                data=data.reshape(numpy.size(data),1)
+                        else:
+                                data=data.reshape(0,0)
 
                 #Get size
@@ -132 +135 @@
                         data=numpy.array([data])
                 if len(data.shape) == 1:
-                        data=data.reshape(1,numpy.size(data,0))
+                        if numpy.size(data):
+                                data=data.reshape(numpy.size(data),1)
+                        else:
+                                data=data.reshape(0,0)
 
                 #Get size
@@ -160 +166 @@
                         data=numpy.array([data])
                 if len(data.shape) == 1:
-                        data=data.reshape(1,numpy.size(data,0))
+                        if numpy.size(data):
+                                data=data.reshape(numpy.size(data),1)
+                        else:
+                                data=data.reshape(0,0)
 
                 #Get size
@@ -191 +200 @@
                                 matrix=numpy.array([matrix])
                         if len(matrix.shape) == 1:
-                                matrix=matrix.reshape(1,numpy.size(matrix,0))
+                                if numpy.size(matrix):
+                                        matrix=matrix.reshape(numpy.size(matrix),1)
+                                else:
+                                        matrix=matrix.reshape(0,0)
 
                         s=matrix.shape
@@ -210 +222 @@
                                 matrix=numpy.array([matrix])
                         if len(matrix.shape) == 1:
-                                matrix=matrix.reshape(1,numpy.size(matrix,0))
+                                matrix=matrix.reshape(numpy.size(matrix),1)
 
                         s=matrix.shape

issm/trunk-jpl/src/m/solve/loadresultsfromcluster.py

@@ -27 +27 @@
                         if md.qmu.params['tabular_graphics_data']:
                                 filelist.append('dakota_tabular.dat')
+        else:
                 filelist.append(md.miscellaneous.name+'.outbin')
         cluster.Download(md.private.runtimename,filelist)

issm/trunk-jpl/src/m/solve/loadresultsfromdisk.py

@@ -19 +19 @@
                 #Check that file exists
                 if not os.path.exists(filename):
-                        raise ValueError("binary file '%s' not found." % filename)
+                        raise OSError("binary file '%s' not found." % filename)
 
                 #initialize md.results if not a structure yet

issm/trunk-jpl/src/m/solve/marshall.py

@@ -27 +27 @@
         fields=vars(md)
 
-        for field in fields.iterkeys():
+#       for field in fields.iterkeys():
+        for field in ['mesh','mask','geometry','constants','surfaceforcings','basalforcings','materials','friction','flowequation','timestepping','initialization','rifts','debug','verbose','settings','solver','cluster','balancethickness','diagnostic','groundingline','hydrology','prognostic','thermal','steadystate','transient','autodiff','flaim','inversion','qmu','results','radaroverlay','miscellaneous','private']:
 
                 #Some properties do not need to be marshalled