Changeset 4084

Timestamp:

06/21/10 12:02:50 (15 years ago)

Author:

Eric.Larour

Message:

renamed UpdateInputsFromDakotax to InputUpdateFromDakotax

Location:

issm/trunk/src/c/modules/InputUpdateFromSolutionx

Files:

• InputUpdateFromSolutionx.cpp (moved) (moved from issm/trunk/src/c/modules/InputUpdateFromSolutionx/UpdateInputsFromSolutionx.cpp ) (5 diffs)
• InputUpdateFromSolutionx.h (moved) (moved from issm/trunk/src/c/modules/InputUpdateFromSolutionx/UpdateInputsFromSolutionx.h ) (2 diffs)

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

@@ -1 @@
-/*!\file UpdateInputsFromSolutionx
+/*!\file InputUpdateFromSolutionx
  * \brief: update datasets using  parameter inputs
  */
 
-#include "./UpdateInputsFromSolutionx.h"
+#include "./InputUpdateFromSolutionx.h"
 #include "../../shared/shared.h"
 #include "../../include/include.h"
@@ -9 +9 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-void UpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,Vec solution){
+void InputUpdateFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,Vec solution){
 
         double* serial_solution=NULL;
@@ -16 +16 @@
         VecToMPISerial(&serial_solution,solution);
 
-        /*Call overloaded form of UpdateInputsFromSolutionx: */
-        UpdateInputsFromSolutionx( elements, nodes,  vertices,  loads,  materials,  parameters,serial_solution);
+        /*Call overloaded form of InputUpdateFromSolutionx: */
+        InputUpdateFromSolutionx( elements, nodes,  vertices,  loads,  materials,  parameters,serial_solution);
 
         /*Free ressources:*/
@@ -25 +25 @@
 
 
-void UpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,double* solution){
+void InputUpdateFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,double* solution){
 
         /*Intermediary*/
@@ -40 +40 @@
         for (i=0;i<elements->Size();i++){
                 element=(Element*)elements->GetObjectByOffset(i);
-                element->UpdateInputsFromSolution(solution);
+                element->InputUpdateFromSolution(solution);
         }
 

issm/trunk/src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.h

@@ -1 @@
-/*!\file:  UpdateInputsFromSolutionx.h
+/*!\file:  InputUpdateFromSolutionx.h
  * \brief header file for updating datasets from inputs
  */ 
@@ -10 +10 @@
 
 /* local prototypes: */
-void            UpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,  Parameters* parameters,Vec solution);
-void        UpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,double* solution);
+void            InputUpdateFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,  Parameters* parameters,Vec solution);
+void        InputUpdateFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,double* solution);
 
 //with timestep
-void            UpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,  Parameters* parameters,Vec solution,int timestep);
-void        UpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,double* solution, int timestep);
+void            InputUpdateFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,  Parameters* parameters,Vec solution,int timestep);
+void        InputUpdateFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,double* solution, int timestep);
 
 #endif  /* _UPDATEINPUTSFROMSOLUTIONXX_H */