Changeset 20898

Timestamp:

07/13/16 14:04:59 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: hardcode yts specific to mismip+ tests

Location:

issm/trunk-jpl/src/m/solve

Files:

• WriteData.js (modified) (1 diff)
• WriteData.m (modified) (1 diff)
• WriteData.py (modified) (2 diffs)

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

@@ -66 +66 @@
         if(IsArray(data)){
                 if(data.length == timeserieslength){
-                        var yts=365.0*24.0*3600.0;
+                        var yts = options.getfieldvalue('yts');
                         if (IsArray(data[0])){
                                 for(var j=0;j<data[0].length;j++)data[timeserieslength-1][j]=data[timeserieslength-1][j]*yts;

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

@@ -42 +42 @@
 end
 if(size(data,1)==timeserieslength),
-        yts=365.0*24.0*3600.0;
+        yts = getfieldvalue(options,'yts');
         data(end,:) = data(end,:)*yts;
 end

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

@@ -33 +33 @@
                 data = options.getfieldvalue('data')
                 name = options.getfieldvalue('name')
+
         format  = options.getfieldvalue('format')
         mattype = options.getfieldvalue('mattype',0)    #only required for matrices
@@ -55 +56 @@
         if numpy.size(data) > 1 :
                 if numpy.size(data,0)==timeserieslength:
-                        yts=365.0*24.0*3600.0
+                        yts = options.getfieldvalue('yts')
                         data[-1,:] = yts*data[-1,:]