Changeset 3703 for issm/trunk/src/c/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp

Timestamp:

05/11/10 08:28:39 (15 years ago)

Author:

Eric.Larour

Message:

Big commit

File:

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

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

@@ -9 +9 @@
 #include "../EnumDefinitions/EnumDefinitions.h"
 
-int UpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,Vec solution, int analysis_type, int sub_analysis_type){
+void UpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,Vec solution, int analysis_type, int sub_analysis_type){
 
-        int noerr=1;
-        int i;
+        double* serial_solution=NULL;
 
-        int  found=0;
-        extern int num_procs;
-        extern int my_rank;
-        double* serial_solution=NULL;
+        /*Serialize solution, so that elements can index into it on every CPU: */
+        VecToMPISerial(&serial_solution,solution);
 
         /*First, get elements and loads configured: */
@@ -25 +22 @@
         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
 
-        /*Serialize solution, so that elements can index into it on every CPU: */
-        VecToMPISerial(&serial_solution,solution);
-
-        /*Update elements, nodes, loads and materials from inputs: */
+        
+        /*Elements drive the update: */
         elements->UpdateInputsFromSolution(serial_solution,analysis_type,sub_analysis_type);
-        nodes->UpdateInputsFromSolution(serial_solution,analysis_type,sub_analysis_type);
-        vertices->UpdateInputsFromSolution(serial_solution,analysis_type,sub_analysis_type);
-        loads->UpdateInputsFromSolution(serial_solution,analysis_type,sub_analysis_type);
-        materials->UpdateInputsFromSolution(serial_solution,analysis_type,sub_analysis_type);
-        parameters->UpdateInputsFromSolution(serial_solution,analysis_type,sub_analysis_type);
 
         /*Free ressources:*/
         xfree((void**)&serial_solution);
 
-        return noerr;
-
 }