Changeset 4067

Timestamp:

06/21/10 11:19:47 (15 years ago)

Author:

Eric.Larour

Message:

renamde AXPYInput to InputAXPY

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (2 diffs)
• modules/InputAXPYx/InputAXPYx.cpp (modified) (3 diffs)
• modules/InputAXPYx/InputAXPYx.h (modified) (2 diffs)
• objects/Elements/Beam.cpp (modified) (1 diff)
• objects/Elements/Beam.h (modified) (1 diff)
• objects/Elements/Element.h (modified) (1 diff)
• objects/Elements/Penta.cpp (modified) (1 diff)
• objects/Elements/Penta.h (modified) (1 diff)
• objects/Elements/Sing.cpp (modified) (1 diff)
• objects/Elements/Sing.h (modified) (1 diff)
• objects/Elements/Tria.cpp (modified) (1 diff)
• objects/Elements/Tria.h (modified) (1 diff)
• solutions/control_core.cpp (modified) (1 diff)
• solutions/objectivefunctionC.cpp (modified) (1 diff)

issm/trunk/src/c/Makefile.am ¶

@@ -410 +410 @@
                                         ./modules/ScaleInputx/ScaleInputx.h\
                                         ./modules/ScaleInputx/ScaleInputx.cpp\
-                                        ./modules/AXPYInputx/AXPYInputx.h\
-                                        ./modules/AXPYInputx/AXPYInputx.cpp\
+                                        ./modules/InputAXPYx/InputAXPYx.h\
+                                        ./modules/InputAXPYx/InputAXPYx.cpp\
                                         ./modules/ControlConstrainInputx/ControlConstrainInputx.h\
                                         ./modules/ControlConstrainInputx/ControlConstrainInputx.cpp\
@@ -931 +931 @@
                                         ./modules/ScaleInputx/ScaleInputx.h\
                                         ./modules/ScaleInputx/ScaleInputx.cpp\
-                                        ./modules/AXPYInputx/AXPYInputx.h\
-                                        ./modules/AXPYInputx/AXPYInputx.cpp\
+                                        ./modules/InputAXPYx/InputAXPYx.h\
+                                        ./modules/InputAXPYx/InputAXPYx.cpp\
                                         ./modules/ControlConstrainInputx/ControlConstrainInputx.h\
                                         ./modules/ControlConstrainInputx/ControlConstrainInputx.cpp\

issm/trunk/src/c/modules/InputAXPYx/InputAXPYx.cpp ¶

@@ -1 @@
-/*!\file AXPYInputx
+/*!\file InputAXPYx
  * \brief: Y=Y+aX operation on inputs.
  */
 
-#include "./AXPYInputx.h"
+#include "./InputAXPYx.h"
 #include "../../shared/shared.h"
 #include "../../include/include.h"
@@ -9 +9 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-void AXPYInputx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int YEnum, double scalar, int XEnum){
+void InputAXPYx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int YEnum, double scalar, int XEnum){
 
         /*intermediary:*/
@@ -20 +20 @@
         for(i=0;i<elements->Size();i++){
                 Element* element=(Element*)elements->GetObjectByOffset(i);
-                element->AXPYInput(YEnum, scalar, XEnum);
+                element->InputAXPY(YEnum, scalar, XEnum);
         }
 }

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

@@ -1 @@
-/*!\file:  AXPYInputx.h
+/*!\file:  InputAXPYx.h
  * \brief header file for field extrusion
  */ 
@@ -9 +9 @@
 
 /* local prototypes: */
-void AXPYInputx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int YEnum, double scalar, int XEnum);
+void InputAXPYx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int YEnum, double scalar, int XEnum);
 
 #endif  /* _AXPYINPUTX_H */

issm/trunk/src/c/objects/Elements/Beam.cpp ¶

@@ -1009 +1009 @@
 }
 /*}}}*/
-/*FUNCTION Beam::AXPYInput(int YEnum, double scalar, int XEnum);{{{1*/
-void  Beam::AXPYInput(int YEnum, double scalar, int XEnum){
+/*FUNCTION Beam::InputAXPY(int YEnum, double scalar, int XEnum);{{{1*/
+void  Beam::InputAXPY(int YEnum, double scalar, int XEnum){
 
         Input* xinput=NULL;

issm/trunk/src/c/objects/Elements/Beam.h ¶

@@ -96 +96 @@
                 void  InputDuplicate(int original_enum,int new_enum);
                 void  ScaleInput(int enum_type,double scale_factor);
-                void  AXPYInput(int YEnum, double scalar, int XEnum);
+                void  InputAXPY(int YEnum, double scalar, int XEnum);
                 void  ControlConstrainInput(int control_type,double cm_min, double cm_max);
                 void  InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums);

issm/trunk/src/c/objects/Elements/Element.h ¶

@@ -67 +67 @@
                 virtual void   ScaleInput(int enum_type,double scale_factor)=0;
                 virtual void   GetVectorFromInputs(Vec vector,int NameEnum)=0;
-                virtual void   AXPYInput(int YEnum, double scalar, int XEnum)=0;
+                virtual void   InputAXPY(int YEnum, double scalar, int XEnum)=0;
                 virtual void   ControlConstrainInput(int control_type,double cm_min, double cm_max)=0;
                 virtual void   InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums)=0;

issm/trunk/src/c/objects/Elements/Penta.cpp ¶

@@ -5262 +5262 @@
 }
 /*}}}*/
-/*FUNCTION Penta::AXPYInput(int YEnum, double scalar, int XEnum);{{{1*/
-void  Penta::AXPYInput(int YEnum, double scalar, int XEnum){
+/*FUNCTION Penta::InputAXPY(int YEnum, double scalar, int XEnum);{{{1*/
+void  Penta::InputAXPY(int YEnum, double scalar, int XEnum){
 
         Input* xinput=NULL;

issm/trunk/src/c/objects/Elements/Penta.h ¶

@@ -163 +163 @@
                 void  InputDuplicate(int original_enum,int new_enum);
                 void  ScaleInput(int enum_type,double scale_factor);
-                void  AXPYInput(int YEnum, double scalar, int XEnum);
+                void  InputAXPY(int YEnum, double scalar, int XEnum);
                 void  ControlConstrainInput(int control_type,double cm_min, double cm_max);
                 void  InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums);

issm/trunk/src/c/objects/Elements/Sing.cpp ¶

@@ -708 +708 @@
 }
 /*}}}*/
-/*FUNCTION Sing::AXPYInput(int YEnum, double scalar, int XEnum);{{{1*/
-void  Sing::AXPYInput(int YEnum, double scalar, int XEnum){
+/*FUNCTION Sing::InputAXPY(int YEnum, double scalar, int XEnum);{{{1*/
+void  Sing::InputAXPY(int YEnum, double scalar, int XEnum){
 
         Input* xinput=NULL;

issm/trunk/src/c/objects/Elements/Sing.h ¶

@@ -95 +95 @@
                 void  InputDuplicate(int original_enum,int new_enum);
                 void  ScaleInput(int enum_type,double scale_factor);
-                void  AXPYInput(int YEnum, double scalar, int XEnum);
+                void  InputAXPY(int YEnum, double scalar, int XEnum);
                 void  InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums);
                 void  ControlConstrainInput(int control_type,double cm_min, double cm_max);

issm/trunk/src/c/objects/Elements/Tria.cpp ¶

@@ -5441 +5441 @@
 }
 /*}}}*/
-/*FUNCTION Tria::AXPYInput(int YEnum, double scalar, int XEnum);{{{1*/
-void  Tria::AXPYInput(int YEnum, double scalar, int XEnum){
+/*FUNCTION Tria::InputAXPY(int YEnum, double scalar, int XEnum);{{{1*/
+void  Tria::InputAXPY(int YEnum, double scalar, int XEnum){
 
         Input* xinput=NULL;

issm/trunk/src/c/objects/Elements/Tria.h ¶

@@ -141 +141 @@
                 void  InputDuplicate(int original_enum,int new_enum);
                 void  ScaleInput(int enum_type,double scale_factor);
-                void  AXPYInput(int YEnum, double scalar, int XEnum);
+                void  InputAXPY(int YEnum, double scalar, int XEnum);
                 void  InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums);
                 void  ControlConstrainInput(int control_type,double cm_min, double cm_max);

issm/trunk/src/c/solutions/control_core.cpp ¶

@@ -89 +89 @@
 
                 _printf_("%s","      updating parameter using optimized search scalar...");
-                AXPYInputx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,search_scalar*optscal[n],ControlParameterEnum);
+                InputAXPYx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,search_scalar*optscal[n],ControlParameterEnum);
 
                 _printf_("%s","      constraining the new distribution...");    

issm/trunk/src/c/solutions/objectivefunctionC.cpp ¶

@@ -57 +57 @@
         
         /*Use search scalar to shoot parameter in the gradient direction: */
-        AXPYInputx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,search_scalar*optscal[n],ControlParameterEnum);
+        InputAXPYx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,search_scalar*optscal[n],ControlParameterEnum);
 
         /*Constrain:*/