Changeset 4042 for issm/trunk/src/c/modules/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp

Timestamp:

06/14/10 08:25:32 (15 years ago)

Author:

Eric.Larour

Message:

Revamping the Qmu module

File:

• issm/trunk/src/c/modules/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp (modified) (3 diffs)

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

@@ -9 +9 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-void UpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,Vec solution, int analysis_type, int sub_analysis_type,int step=0){
+void UpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,Vec solution, int analysis_type, int sub_analysis_type){
 
         double* serial_solution=NULL;
@@ -17 +17 @@
 
         /*Call overloaded form of UpdateInputsFromSolutionx: */
-        UpdateInputsFromSolutionx( elements, nodes,  vertices,  loads,  materials,  parameters,serial_solution, analysis_type, sub_analysis_type,step);
+        UpdateInputsFromSolutionx( elements, nodes,  vertices,  loads,  materials,  parameters,serial_solution, analysis_type, sub_analysis_type);
 
         /*Free ressources:*/
@@ -44 +44 @@
 
 }
-
-/*Same routines, with additional timestep argument: */
-void UpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,Vec solution, int analysis_type, int sub_analysis_type,int timestep){
-        
-        
-        double* serial_solution=NULL;
-
-        /*Serialize solution, so that elements can index into it on every CPU: */
-        VecToMPISerial(&serial_solution,solution);
-
-        /*Call overloaded form of UpdateInputsFromSolutionx: */
-        UpdateInputsFromSolutionx( elements, nodes,  vertices,  loads,  materials,  parameters,serial_solution, analysis_type, sub_analysis_type,int timestep);
-
-        /*Free ressources:*/
-        xfree((void**)&serial_solution);
-
-}
-
-
-
-void UpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,double* solution, int analysis_type, int sub_analysis_type,int timestep){
-
-        /*Intermediary*/
-        int i;
-        Element* element=NULL;
-
-        /*First, get elements and loads configured: */
-        elements->  Configure(elements,loads, nodes,vertices, materials,parameters);
-        loads->     Configure(elements,loads, nodes,vertices, materials,parameters);
-        nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
-        parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
-        
-        /*Elements drive the update: */
-        for (i=0;i<elements->Size();i++){
-                element=(Element*)elements->GetObjectByOffset(i);
-                element->UpdateInputsFromSolution(solution,analysis_type,sub_analysis_type,timestep);
-        }
-
-}