Changeset 11027 for issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.cpp

Timestamp:

12/09/11 20:36:51 (13 years ago)

Author:

Eric.Larour

Message:

merged trunk-jpl and trunk for revision 11026

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src/c/modules/OutputResultsx/OutputResultsx.cpp (modified) (2 diffs)

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

@@ -17 +17 @@
                 
 #ifdef _SERIAL_
-void OutputResultsx(mxArray** pdataref, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results** presults, int step, double time){
+void OutputResultsx(mxArray** pdataref, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results** presults){
 #else 
-void OutputResultsx(                    Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results** presults, int step, double time){
+void OutputResultsx(                    Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results** presults){
 #endif
 
@@ -54 +54 @@
         /*We have results inside our elements, loads, etc ... Get them out of there, into the results dataset: */
         elements->ProcessResultsUnits();
-        elements->ToResults(results,parameters,step,time);
+        elements->ToResults(results,parameters);
         elements->DeleteResults();