Changeset 19709

Timestamp:

11/12/15 09:45:05 (9 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed step=0 in transient runs

Location:

issm/trunk-jpl/src

Files:

• c/classes/ExternalResults/GenericExternalResult.h (modified) (2 diffs)
• c/cores/controlm1qn3_core.cpp (modified) (1 diff)
• c/modules/OutputResultsx/OutputResultsx.cpp (modified) (1 diff)
• m/solve/parseresultsfromdisk.m (modified) (2 diffs)
• m/solve/parseresultsfromdisk.py (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/ExternalResults/GenericExternalResult.h

@@ -102 +102 @@
                 }
                 /*}}}*/
-                GenericExternalResult(int in_id, int in_enum_type,ResultType in_value,int in_step){ /*{{{*/
+                GenericExternalResult(int in_id, int in_enum_type,ResultType in_value){ /*{{{*/
                         id        = in_id;
                         value     = in_value;
-                        step      = in_step;
+                        step      = UNDEF;
                         time      = UNDEF;
                         M         = 1;
@@ -272 +272 @@
 
 } /*}}}*/
-template <> inline GenericExternalResult<char*>::GenericExternalResult(int in_id, int in_enum_type,char* in_value,int in_step){ /*{{{*/
+template <> inline GenericExternalResult<char*>::GenericExternalResult(int in_id, int in_enum_type,char* in_value){ /*{{{*/
 
         id = in_id;
         value = xNew<char>(strlen(in_value)+1);
         xMemCpy<char>(value,in_value,(strlen(in_value)+1));
-        step  = in_step;
+        step  = UNDEF;
         time  = UNDEF;
 

issm/trunk-jpl/src/c/cores/controlm1qn3_core.cpp

@@ -137 +137 @@
         ControlInputSetGradientx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,G);
         femmodel->OutputControlsx(&femmodel->results);
-        femmodel->results->AddObject(new GenericExternalResult<double>(femmodel->results->Size()+1,JEnum,f,0));
+        femmodel->results->AddObject(new GenericExternalResult<double>(femmodel->results->Size()+1,JEnum,f));
 
         /*Finalize*/

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));
                 xDelete<char>(solutiontypestring);
         }

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

@@ -47 +47 @@
 
         %Add result
-        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(result.step==0),
                 %if we have a step = 0, this is a steady state solutoin, don't expect more steps. 
                 index = 1;
@@ -60 +56 @@
                 index = counter;
         end
-        results(index).step=result.step;
         results(index).(result.fieldname)=result.field;
+        if(result.time~=-9999),
+                results(index).step=result.step;
+        end
         if(result.time~=-9999),
                 results(index).time=result.time;

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

@@ -58 +58 @@
 
                 #Add result
-                if result['step']==-1:
-                        #specialty case, put this result at the beginning of the structure
-                        index = 0
-                        result['step']=0
-                elif result['step']==0:
-                        #if we have a step = 0, this is a steady state solutoin, don't expect more steps. 
+                if result['step']==0:
+                        #if we have a step = 0, this is a steady state solution, don't expect more steps. 
                         index = 0;
                         check_nomoresteps=1
@@ -82 +78 @@
                         
                 #Get time and step
-                setattr(results[index],'step',result['step'])
+                if result['step'] != -9999.:
+                        setattr(results[index],'step',result['step'])
                 if result['time'] != -9999.:
                         setattr(results[index],'time',result['time'])