Changeset 19370

Timestamp:

05/14/15 15:59:15 (10 years ago)

Author:

Mathieu Morlighem

Message:

BUG: put time back in

Location:

issm/trunk-jpl

Files:

• src/m/solve/parseresultsfromdisk.m (modified) (3 diffs)
• test/NightlyRun/IdFromString.m (modified) (1 diff)

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

@@ -62 +62 @@
         results(index).step=result.step;
         results(index).(result.fieldname)=result.field;
+        if(result.time~=-9999),
+                results(index).time=result.time;
+        end
 
         %read next result
@@ -177 +180 @@
         if strcmp(fieldname,'BalancethicknessThickeningRate'),
                 field = field*yts;
-        elseif strcmp(fieldname,'Time'),
-                field = field/yts;
         elseif strcmp(fieldname,'HydrologyWaterVx'),
                 field = field*yts;
@@ -206 +207 @@
 
         result.fieldname=fieldname;
-        result.time=time;
+        result.time=time/yts;
         result.step=step;
         result.field=field;

issm/trunk-jpl/test/NightlyRun/IdFromString.m

@@ -27 +27 @@
 
 %Process string (delete return carriage);
-ids_raw=strsplit(ids_raw,char(10));
+ids_raw=strsplit_strict(ids_raw,char(10));
 ids_raw=ids_raw(1:end-1);
 for i=1:length(ids_raw),