Changeset 4076

Timestamp:

06/21/10 11:33:26 (15 years ago)

Author:

Eric.Larour

Message:

renamed ScaleInputx to InputScalex

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (2 diffs)
• modules/InputScalex/InputScalex.cpp (modified) (3 diffs)
• modules/InputScalex/InputScalex.h (modified) (2 diffs)
• modules/modules.h (modified) (1 diff)
• 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/diagnostic_core.cpp (modified) (1 diff)
• solutions/stokescontrolinit.cpp (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -408 +408 @@
                                         ./modules/InputDuplicatex/InputDuplicatex.h\
                                         ./modules/InputDuplicatex/InputDuplicatex.cpp\
-                                        ./modules/ScaleInputx/ScaleInputx.h\
-                                        ./modules/ScaleInputx/ScaleInputx.cpp\
+                                        ./modules/InputScalex/InputScalex.h\
+                                        ./modules/InputScalex/InputScalex.cpp\
                                         ./modules/InputAXPYx/InputAXPYx.h\
                                         ./modules/InputAXPYx/InputAXPYx.cpp\
@@ -929 +929 @@
                                         ./modules/InputDuplicatex/InputDuplicatex.h\
                                         ./modules/InputDuplicatex/InputDuplicatex.cpp\
-                                        ./modules/ScaleInputx/ScaleInputx.h\
-                                        ./modules/ScaleInputx/ScaleInputx.cpp\
+                                        ./modules/InputScalex/InputScalex.h\
+                                        ./modules/InputScalex/InputScalex.cpp\
                                         ./modules/InputAXPYx/InputAXPYx.h\
                                         ./modules/InputAXPYx/InputAXPYx.cpp\

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

@@ -1 @@
-/*!\file ScaleInputx
+/*!\file InputScalex
  * \brief: duplicte  an input inside the elements, onto another, and wipe it off.
  */
 
-#include "./ScaleInputx.h"
+#include "./InputScalex.h"
 #include "../../shared/shared.h"
 #include "../../include/include.h"
@@ -9 +9 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-void ScaleInputx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int enum_type, double scale_factor){
+void InputScalex(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int enum_type, double scale_factor){
 
         /*intermediary:*/
@@ -20 +20 @@
         for(i=0;i<elements->Size();i++){
                 Element* element=(Element*)elements->GetObjectByOffset(i);
-                element->ScaleInput(enum_type,scale_factor);
+                element->InputScale(enum_type,scale_factor);
         }
 

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

@@ -1 @@
-/*!\file:  ScaleInputx.h
+/*!\file:  InputScalex.h
  * \brief header file for field extrusion
  */ 
@@ -9 +9 @@
 
 /* local prototypes: */
-void ScaleInputx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int enum_type, double scale_factor);
+void InputScalex(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int enum_type, double scale_factor);
 
 #endif  /* _SCALEINPUTX_H */

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

@@ -79 +79 @@
 #include "./MaxAbsVzx/MaxAbsVzx.h"
 #include "./InputDuplicatex/InputDuplicatex.h"
-#include "./ScaleInputx/ScaleInputx.h"
+#include "./InputScalex/InputScalex.h"
 #include "./InputAXPYx/InputAXPYx.h"
 #include "./GetVectorFromInputsx/GetVectorFromInputsx.h"

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

@@ -997 +997 @@
 }
 /*}}}*/
-/*FUNCTION Beam::ScaleInput(int enum_type,double scale_factor){{{1*/
-void  Beam::ScaleInput(int enum_type,double scale_factor){
+/*FUNCTION Beam::InputScale(int enum_type,double scale_factor){{{1*/
+void  Beam::InputScale(int enum_type,double scale_factor){
 
         Input* input=NULL;

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

@@ -95 +95 @@
                 void  MaxAbsVz(double* pmaxabsvz, bool process_units);
                 void  InputDuplicate(int original_enum,int new_enum);
-                void  ScaleInput(int enum_type,double scale_factor);
+                void  InputScale(int enum_type,double scale_factor);
                 void  InputAXPY(int YEnum, double scalar, int XEnum);
                 void  InputControlConstrain(int control_type,double cm_min, double cm_max);

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

@@ -65 +65 @@
                 virtual void   MaxAbsVz(double* pmaxabsvz, bool process_units)=0;
                 virtual void   InputDuplicate(int original_enum,int new_enum)=0;
-                virtual void   ScaleInput(int enum_type,double scale_factor)=0;
+                virtual void   InputScale(int enum_type,double scale_factor)=0;
                 virtual void   GetVectorFromInputs(Vec vector,int NameEnum)=0;
                 virtual void   InputAXPY(int YEnum, double scalar, int XEnum)=0;

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

@@ -5250 +5250 @@
 }
 /*}}}*/
-/*FUNCTION Penta::ScaleInput(int enum_type,double scale_factor){{{1*/
-void  Penta::ScaleInput(int enum_type,double scale_factor){
+/*FUNCTION Penta::InputScale(int enum_type,double scale_factor){{{1*/
+void  Penta::InputScale(int enum_type,double scale_factor){
 
         Input* input=NULL;

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

@@ -162 +162 @@
                 void  MaxAbsVz(double* pmaxabsvz, bool process_units);
                 void  InputDuplicate(int original_enum,int new_enum);
-                void  ScaleInput(int enum_type,double scale_factor);
+                void  InputScale(int enum_type,double scale_factor);
                 void  InputAXPY(int YEnum, double scalar, int XEnum);
                 void  InputControlConstrain(int control_type,double cm_min, double cm_max);

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

@@ -696 +696 @@
 }
 /*}}}*/
-/*FUNCTION Sing::ScaleInput(int enum_type,double scale_factor){{{1*/
-void  Sing::ScaleInput(int enum_type,double scale_factor){
+/*FUNCTION Sing::InputScale(int enum_type,double scale_factor){{{1*/
+void  Sing::InputScale(int enum_type,double scale_factor){
 
         Input* input=NULL;

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

@@ -94 +94 @@
                 void  MaxAbsVz(double* pmaxabsvz, bool process_units);
                 void  InputDuplicate(int original_enum,int new_enum);
-                void  ScaleInput(int enum_type,double scale_factor);
+                void  InputScale(int enum_type,double scale_factor);
                 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);

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

@@ -5429 +5429 @@
 }
 /*}}}*/
-/*FUNCTION Tria::ScaleInput(int enum_type,double scale_factor){{{1*/
-void  Tria::ScaleInput(int enum_type,double scale_factor){
+/*FUNCTION Tria::InputScale(int enum_type,double scale_factor){{{1*/
+void  Tria::InputScale(int enum_type,double scale_factor){
 
         Input* input=NULL;

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

@@ -140 +140 @@
                 void  MaxAbsVz(double* pmaxabsvz, bool process_units);
                 void  InputDuplicate(int original_enum,int new_enum);
-                void  ScaleInput(int enum_type,double scale_factor);
+                void  InputScale(int enum_type,double scale_factor);
                 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);

issm/trunk/src/c/solutions/diagnostic_core.cpp

@@ -73 +73 @@
                         //"recondition" pressure computed previously:
                         InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum,PressureStokesEnum);
-                        ScaleInputx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureStokesEnum,1.0/stokesreconditioning);
+                        InputScalex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureStokesEnum,1.0/stokesreconditioning);
 
                         if(verbose)_printf_("%s\n"," update boundary conditions for stokes using velocities previously computed...");

issm/trunk/src/c/solutions/stokescontrolinit.cpp

@@ -45 +45 @@
         //recondition" pressure computed previously:
         InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum,PressureStokesEnum);
-        ScaleInputx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureStokesEnum,1.0/stokesreconditioning);
+        InputScalex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureStokesEnum,1.0/stokesreconditioning);
 
         if(verbose)_printf_("%s\n"," update boundary conditions for stokes using velocities previously computed...");