Changeset 19343

Timestamp:

05/07/15 16:36:26 (10 years ago)

Author:

Eric.Larour

Message:

CHG: trying to address the issue of time steps being recorded in the results.
If step=0, we are running everything except a transient . Only one step, time =0.
If step=-1, we are a result that belongs nowhere (for ex: solutoin type), plug it in step=1, time=0;
If step>0, legitimate transient step.

Location:

issm/trunk-jpl/src

Files:

• c/modules/OutputResultsx/OutputResultsx.cpp (modified) (1 diff)
• m/solve/parseresultsfromdisk.m (modified) (2 diffs)

issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp

@@ -42 +42 @@
                 femmodel->parameters->FindParam(&solutiontype,SolutionTypeEnum);
                 EnumToStringx(&solutiontypestring,solutiontype);
-                femmodel->results->AddResult(new GenericExternalResult<char*>(femmodel->results->Size()+1,SolutionTypeEnum,solutiontypestring,1));
+                femmodel->results->AddResult(new GenericExternalResult<char*>(femmodel->results->Size()+1,SolutionTypeEnum,solutiontypestring,-1));
                 xDelete<char>(solutiontypestring);
         }

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

@@ -28 +28 @@
 result  = ReadData(fid);
 if isempty(result), error(['no results found in binary file ' filename]); end
+check_nomoresteps=0;
 counter = 1;
 step    = result.step;
 while ~isempty(result), 
+
+        if check_nomoresteps,
+                %check that the new result does not add a step, which would be an error: 
+                if result.step>=1,
+                        error('parsing results for a steady-state core, which incorporates transient results!');
+                end
+        end
 
         %Check step, increase counter if this is a new step
@@ -39 +47 @@
 
         %Add result
-        if(result.step==1),
+        if(result.step==-1), 
+                %specialty case, put this result at the beginning of the structure
+                index = 1;
+                result.step=0;
+        elseif(result.step==0),
+                %if we have a step = 0, this is a steady state solutoin, don't expect more steps. 
+                index = 1;
+                check_nomoresteps=1;
+        elseif(result.step==1),
                 index = 1;
         else