Changeset 15396 for issm/trunk/src/m/solve/WriteData.py

Timestamp:

07/02/13 09:24:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 15394

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/solve/WriteData.py (modified) (2 diffs)

issm/trunk

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

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

@@ -35 +35 @@
         format  = options.getfieldvalue('format')
         mattype = options.getfieldvalue('mattype',0)    #only required for matrices
+        forcinglength = options.getfieldvalue('forcinglength',-1)
 
         #Process sparse matrices
@@ -40 +41 @@
 #               data=full(data);
 #       end
+
+        #Scale data if necesarry
+        if options.exist('scale'):
+                scale = options.getfieldvalue('scale')
+                if numpy.size(data) > 1 :
+                        if numpy.size(data,0)==forcinglength:
+                                data=numpy.array(data)
+                                data[0:-1,:] = scale*data[0:-1,:]
+                        else:
+                                data  = scale*data
+                else:
+                        data  = scale*data
 
         #Step 1: write the enum to identify this record uniquely

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache