Changeset 4070


Ignore:
Timestamp:
06/21/10 11:23:49 (15 years ago)
Author:
Eric.Larour
Message:

renamde ControlConstrainInputx to InputControlConstrainx

Location:
issm/trunk/src/c
Files:
15 edited

Legend:

Unmodified
Added
Removed

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

    r4067 r4070  
    412412                                        ./modules/InputAXPYx/InputAXPYx.h\
    413413                                        ./modules/InputAXPYx/InputAXPYx.cpp\
    414                                         ./modules/ControlConstrainInputx/ControlConstrainInputx.h\
    415                                         ./modules/ControlConstrainInputx/ControlConstrainInputx.cpp\
     414                                        ./modules/InputControlConstrainx/InputControlConstrainx.h\
     415                                        ./modules/InputControlConstrainx/InputControlConstrainx.cpp\
    416416                                        ./modules/SurfaceAreax/SurfaceAreax.h\
    417417                                        ./modules/SurfaceAreax/SurfaceAreax.cpp\
    … …  
    933933                                        ./modules/InputAXPYx/InputAXPYx.h\
    934934                                        ./modules/InputAXPYx/InputAXPYx.cpp\
    935                                         ./modules/ControlConstrainInputx/ControlConstrainInputx.h\
    936                                         ./modules/ControlConstrainInputx/ControlConstrainInputx.cpp\
     935                                        ./modules/InputControlConstrainx/InputControlConstrainx.h\
     936                                        ./modules/InputControlConstrainx/InputControlConstrainx.cpp\
    937937                                        ./modules/SurfaceAreax/SurfaceAreax.h\
    938938                                        ./modules/SurfaceAreax/SurfaceAreax.cpp\

  • issm/trunk/src/c/modules/InputControlConstrainx/InputControlConstrainx.cpp

    r4069 r4070  
    1 /*!\file ControlConstrainInputx
     1/*!\file InputControlConstrainx
    22 * \brief: Y=Y+aX operation on inputs.
    33 */
    44
    5 #include "./ControlConstrainInputx.h"
     5#include "./InputControlConstrainx.h"
    66#include "../../shared/shared.h"
    77#include "../../include/include.h"
    … …  
    99#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    11 void ControlConstrainInputx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int control_type,double cm_min, double cm_max){
     11void InputControlConstrainx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int control_type,double cm_min, double cm_max){
    1212
    1313        /*intermediary:*/
    … …  
    2323        for(i=0;i<elements->Size();i++){
    2424                Element* element=(Element*)elements->GetObjectByOffset(i);
    25                 element->ControlConstrainInput(control_type,cm_min,cm_max);
     25                element->InputControlConstrain(control_type,cm_min,cm_max);
    2626        }
    2727}

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

    r4069 r4070  
    1 /*!\file:  ControlConstrainInputx.h
     1/*!\file:  InputControlConstrainx.h
    22 * \brief header file for field extrusion
    33 */
    … …  
    99
    1010/* local prototypes: */
    11 void ControlConstrainInputx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int control_type,double cm_min, double cm_max);
     11void InputControlConstrainx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int control_type,double cm_min, double cm_max);
    1212
    1313#endif  /* _ControlConstrainINPUTX_H */

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

    r4065 r4070  
    4747#include "./SurfaceAreax/SurfaceAreax.h"
    4848#include "./CostFunctionx/CostFunctionx.h"
    49 #include "./ControlConstrainInputx/ControlConstrainInputx.h"
     49#include "./InputControlConstrainx/InputControlConstrainx.h"
    5050#include "./FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h"
    5151#include "./FieldDepthAveragex/FieldDepthAveragex.h"

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

    r4067 r4070  
    10271027}
    10281028/*}}}*/
    1029 /*FUNCTION Beam::ControlConstrainInput(int control_type, double cm_min, double cm_max){{{1*/
    1030 void  Beam::ControlConstrainInput(int control_type, double cm_min, double cm_max){
     1029/*FUNCTION Beam::InputControlConstrain(int control_type, double cm_min, double cm_max){{{1*/
     1030void  Beam::InputControlConstrain(int control_type, double cm_min, double cm_max){
    10311031
    10321032        Input* input=NULL;

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

    r4067 r4070  
    9797                void  ScaleInput(int enum_type,double scale_factor);
    9898                void  InputAXPY(int YEnum, double scalar, int XEnum);
    99                 void  ControlConstrainInput(int control_type,double cm_min, double cm_max);
     99                void  InputControlConstrain(int control_type,double cm_min, double cm_max);
    100100                void  InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums);
    101101

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

    r4067 r4070  
    6868                virtual void   GetVectorFromInputs(Vec vector,int NameEnum)=0;
    6969                virtual void   InputAXPY(int YEnum, double scalar, int XEnum)=0;
    70                 virtual void   ControlConstrainInput(int control_type,double cm_min, double cm_max)=0;
     70                virtual void   InputControlConstrain(int control_type,double cm_min, double cm_max)=0;
    7171                virtual void   InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums)=0;
    7272

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

    r4067 r4070  
    52805280}
    52815281/*}}}*/
    5282 /*FUNCTION Penta::ControlConstrainInput(int control_type, double cm_min, double cm_max){{{1*/
    5283 void  Penta::ControlConstrainInput(int control_type, double cm_min, double cm_max){
     5282/*FUNCTION Penta::InputControlConstrain(int control_type, double cm_min, double cm_max){{{1*/
     5283void  Penta::InputControlConstrain(int control_type, double cm_min, double cm_max){
    52845284
    52855285        Input* input=NULL;

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

    r4067 r4070  
    164164                void  ScaleInput(int enum_type,double scale_factor);
    165165                void  InputAXPY(int YEnum, double scalar, int XEnum);
    166                 void  ControlConstrainInput(int control_type,double cm_min, double cm_max);
     166                void  InputControlConstrain(int control_type,double cm_min, double cm_max);
    167167                void  InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums);
    168168                void  GetVectorFromInputs(Vec vector,int NameEnum);

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

    r4067 r4070  
    726726}
    727727/*}}}*/
    728 /*FUNCTION Sing::ControlConstrainInput(int control_type, double cm_min, double cm_max){{{1*/
    729 void  Sing::ControlConstrainInput(int control_type, double cm_min, double cm_max){
     728/*FUNCTION Sing::InputControlConstrain(int control_type, double cm_min, double cm_max){{{1*/
     729void  Sing::InputControlConstrain(int control_type, double cm_min, double cm_max){
    730730
    731731        Input* input=NULL;

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

    r4067 r4070  
    9797                void  InputAXPY(int YEnum, double scalar, int XEnum);
    9898                void  InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums);
    99                 void  ControlConstrainInput(int control_type,double cm_min, double cm_max);
     99                void  InputControlConstrain(int control_type,double cm_min, double cm_max);
    100100
    101101

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

    r4067 r4070  
    54595459}
    54605460/*}}}*/
    5461 /*FUNCTION Tria::ControlConstrainInput(int control_type, double cm_min, double cm_max){{{1*/
    5462 void  Tria::ControlConstrainInput(int control_type, double cm_min, double cm_max){
     5461/*FUNCTION Tria::InputControlConstrain(int control_type, double cm_min, double cm_max){{{1*/
     5462void  Tria::InputControlConstrain(int control_type, double cm_min, double cm_max){
    54635463
    54645464        Input* input=NULL;

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

    r4067 r4070  
    143143                void  InputAXPY(int YEnum, double scalar, int XEnum);
    144144                void  InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums);
    145                 void  ControlConstrainInput(int control_type,double cm_min, double cm_max);
     145                void  InputControlConstrain(int control_type,double cm_min, double cm_max);
    146146                void  GetVectorFromInputs(Vec vector,int NameEnum);
    147147

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

    r4067 r4070  
    9292
    9393                _printf_("%s","      constraining the new distribution...");   
    94                 ControlConstrainInputx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,cm_min,cm_max);
     94                InputControlConstrainx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,cm_min,cm_max);
    9595               
    9696                _printf_("%s","      save new parameter...");

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

    r4067 r4070  
    6060
    6161        /*Constrain:*/
    62         ControlConstrainInputx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,cm_min,cm_max);
     62        InputControlConstrainx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,cm_min,cm_max);
    6363
    6464        /*Run diagnostic with updated inputs: */
Note: See TracChangeset for help on using the changeset viewer.