Changeset 4082

Timestamp:

06/21/10 11:53:17 (15 years ago)

Author:

Eric.Larour

Message:

renamed UpdateInputsFromDakotax to InputUpdateFromDakotax

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (2 diffs)
• modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (modified) (2 diffs)
• modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h (modified) (2 diffs)
• modules/Qmux/SpawnCoreParallel.cpp (modified) (1 diff)
• modules/modules.h (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -428 +428 @@
                                         ./modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h\
                                         ./modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp\
+                                        ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h\
+                                        ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp\
                                         ./modules/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.h\
                                         ./modules/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp\
@@ -949 +951 @@
                                         ./modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h\
                                         ./modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp\
+                                        ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h\
+                                        ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp\
                                         ./modules/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.h\
                                         ./modules/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp\

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

@@ -1 @@
-/*!\file UpdateInputsFromDakotax
+/*!\file InputUpdateFromDakotax
  * \brief: update datasets using  parameter inputs
  */
 
-#include "./UpdateInputsFromDakotax.h"
+#include "./InputUpdateFromDakotax.h"
 #include "../../shared/shared.h"
 #include "../../include/include.h"
@@ -9 +9 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-void UpdateInputsFromDakotax(double* variables,char** variables_descriptors,int numvariables,FemModel* femmodel,double* qmu_part,int qmu_npart){
+void InputUpdateFromDakotax(double* variables,char** variables_descriptors,int numvariables,FemModel* femmodel,double* qmu_part,int qmu_npart){
 
         ISSMERROR(" not supported yet!");

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

@@ -1 @@
-/*!\file:  UpdateInputsFromDakotax.h
+/*!\file:  InputUpdateFromDakotax.h
  * \brief header file for updating datasets from inputs
  */ 
 
-#ifndef _UPDATEINPUTSFROMDAKOTAXX_H
-#define _UPDATEINPUTSFROMDAKOTAXX_H
+#ifndef _INPUTUPDATEFROMDAKOTAXX_H
+#define _INPUTUPDATEFROMDAKOTAXX_H
 
 #include "../../objects/objects.h"
@@ -10 +10 @@
 
 
-void UpdateInputsFromDakotax(double* variables,char** variables_descriptors,int numvariables,FemModel* femmodel,double* qmu_part,int qmu_npart);
+void InputUpdateFromDakotax(double* variables,char** variables_descriptors,int numvariables,FemModel* femmodel,double* qmu_part,int qmu_npart);
 
-#endif  /* _UPDATEINPUTSFROMDAKOTAXX_H */
+#endif  /* _INPUTUPDATEFROMDAKOTAXX_H */
 

issm/trunk/src/c/modules/Qmux/SpawnCoreParallel.cpp

@@ -89 +89 @@
 
         /*Modify core inputs in objects contained in femmodel, to reflect the dakota variables inputs: */
-        UpdateInputsFromDakotax(variables,variables_descriptors,numvariables,femmodel,qmu_part,qmu_npart);
+        InputUpdateFromDakotax(variables,variables_descriptors,numvariables,femmodel,qmu_part,qmu_npart);
 
         /*Run the analysis core solution sequence: */

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

@@ -30 +30 @@
 #include "./InputUpdateFromConstantx/InputUpdateFromConstantx.h"
 #include "./UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.h"
-#include "./UpdateInputsFromDakotax/UpdateInputsFromDakotax.h"
+#include "./InputUpdateFromDakotax/InputUpdateFromDakotax.h"
 #include "./UpdateInputsFromVectorx/UpdateInputsFromVectorx.h"
 #include "./UpdateGeometryx/UpdateGeometryx.h"