Changeset 25313

Timestamp:

07/30/20 04:09:29 (5 years ago)

Author:

bdef

Message:

BUG: fix for the scaling in WriteData

Location:

issm/trunk-jpl/src/m

Files:

• classes/SMBgemb.py (modified) (2 diffs)
• solve/WriteData.py (modified) (4 diffs)

issm/trunk-jpl/src/m/classes/SMBgemb.py

@@ -376 +376 @@
         WriteData(fid, prefix, 'object', self, 'class', 'smb', 'fieldname', 'isclimatology', 'format', 'Boolean')
         WriteData(fid, prefix, 'object', self, 'class', 'smb', 'fieldname', 'isconstrainsurfaceT', 'format', 'Boolean')
-
         WriteData(fid, prefix, 'object', self, 'class', 'smb', 'fieldname', 'Ta', 'format', 'DoubleMat', 'mattype', 2, 'timeserieslength', md.mesh.numberofelements + 1, 'yts', yts)
         WriteData(fid, prefix, 'object', self, 'class', 'smb', 'fieldname', 'V', 'format', 'DoubleMat', 'mattype', 2, 'timeserieslength', md.mesh.numberofelements + 1, 'yts', yts)
@@ -434 +433 @@
         time = self.Ta[-1]  #assume all forcings are on the same time step
         dtime = np.diff(time, n=1, axis=0)
-        dt = min(dtime) / yts
+        dt = min(dtime)
 
         WriteData(fid, prefix, 'data', dt, 'name', 'md.smb.dt', 'format', 'Double', 'scale', yts)

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

@@ -17 +17 @@
     #process options
     options = pairoptions.pairoptions(*args)
-
     #Get data properties
     if options.exist('object'):
@@ -49 +48 @@
     #       (see https://ross.ics.uci.edu/jenkins/view/All/job/Debian_Linux-Python/1036).
     #
-    # data = deepcopy(data)
+    data = deepcopy(data)
 
     #Scale data if necessary
@@ -63 +62 @@
                     data[i] = scale * data[i]
             if np.ndim(data[i]) > 1 and data[i].shape[0] == timeserieslength:
-                #no scaling given, use yts instead
+                #no scaling given, just get the time right
                 yts = options.getfieldvalue('yts')
                 #We scale only the last line that holds time
@@ -77 +76 @@
         if np.ndim(data) > 1 and data.shape[0] == timeserieslength:
             yts = options.getfieldvalue('yts')
+            #We scale only the last line that holds time
+            # scaler = np.ones((np.shape(data)))
+            # scaler[-1, :] = yts
+            # data = scaler * data
             data[-1, :] = yts * data[-1, :]