Changeset 22204

Timestamp:

10/31/17 16:17:26 (7 years ago)

Author:

dlcheng

Message:

CHG: Adding Nathan's frictionwaterlayer.py and committing a fix for WriteData.py when marshalling yts/timestep fields.

Location:

issm/trunk-jpl/src/m

Files:

• Makefile.am (modified) (1 diff)
• classes/frictionwaterlayer.py (added)
• solve/WriteData.py (modified) (1 diff)

issm/trunk-jpl/src/m/Makefile.am

@@ -65 +65 @@
                                         ${ISSM_DIR}/src/m/mesh/*.py \
                                         ${ISSM_DIR}/src/m/mesh/rifts/*.py \
+                                        ${ISSM_DIR}/src/m/mesh/planet/gmsh/*.py \
                                         ${ISSM_DIR}/src/m/miscellaneous/*.py \
                                         ${ISSM_DIR}/src/m/modules/*.py \

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

@@ -44 +44 @@
                 data=np.array(data)
                 scale = options.getfieldvalue('scale')
-                if np.size(data) > 1 :
-                        if np.size(data,0)==timeserieslength:
-                                data[0:-1,:] = scale*data[0:-1,:]
-                        else:
-                                data  = scale*data
+                if np.size(data) > 1 and np.ndim(data) > 1 and np.size(data,0)==timeserieslength:
+                        data[0:-1,:] = scale*data[0:-1,:]
                 else:
                         data  = scale*data
-        if np.size(data) > 1 :
-                if np.size(data,0)==timeserieslength:
-                        yts = options.getfieldvalue('yts')
-                        data[-1,:] = yts*data[-1,:]
+        if np.size(data) > 1 and np.size(data,0)==timeserieslength:
+                yts = options.getfieldvalue('yts')
+                if np.ndim(data) > 1:
+                        data[-1,:] = data[-1,:]*yts
+                else:
+                        data[-1] = data[-1]*yts
 
         #Step 1: write the enum to identify this record uniquely