Changeset 4218


Ignore:
Timestamp:
06/24/10 19:02:41 (15 years ago)
Author:
Eric.Larour
Message:

New class Materials

Location:
issm/trunk/src
Files:
1 added
144 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/DataSet/DataSet.cpp

    r4215 r4218  
    565565/*Objects methods*/
    566566/*FUNCTION DataSet::Configure{{{1*/
    567 void DataSet::Configure(Elements* elements,Loads* loads, DataSet* nodes, Vertices* vertices, DataSet* materials,Parameters* parameters){
     567void DataSet::Configure(Elements* elements,Loads* loads, DataSet* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){
    568568
    569569        vector<Object*>::iterator object;

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

    r4217 r4218  
    1212
    1313/*forward declarations */
     14class Constraints;
     15class Materials;
    1416class Parameters;
    1517class Elements;
    … …  
    7072                void  FlagNodeSets(Vec pv_g, Vec pv_m, Vec pv_n, Vec pv_f, Vec pv_s,int analysis_type);
    7173                void  clear();
    72                 void  Configure(Elements* elements,Loads* loads, DataSet* nodes, Vertices* vertices, DataSet* materials,Parameters* parameters);
     74                void  Configure(Elements* elements,Loads* loads, DataSet* nodes, Vertices* vertices, Materials* materials,Parameters* parameters);
    7375                Object* GetObjectByOffset(int offset);
    7476                Object* GetObjectById(int* poffset,int eid);
    … …  
    218220};
    219221
    220 
     222/********************************************************MATERIALS************************************************/
     223
     224class Materials: public DataSet{
     225
     226        public:
     227
     228                /*constructors, destructors: {{{1*/
     229                Materials();
     230                Materials(int enum_type);
     231                ~Materials();
     232                /*}}}*/
     233                /*numerics: {{{1*/
     234                /*}}}*/
     235
     236};
    221237
    222238

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

    r4217 r4218  
    209209                                        ./DataSet/Elements.cpp\
    210210                                        ./DataSet/Constraints.cpp\
     211                                        ./DataSet/Materials.cpp\
    211212                                        ./shared/shared.h\
    212213                                        ./shared/Alloc/alloc.h\
    … …  
    740741                                        ./DataSet/Elements.cpp\
    741742                                        ./DataSet/Constraints.cpp\
     743                                        ./DataSet/Materials.cpp\
    742744                                        ./shared/shared.h\
    743745                                        ./shared/Threads/issm_threads.h\

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

    r4215 r4218  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void    ComputeBasalStressx( Vec* psigma,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, DataSet* materials,Parameters* parameters){
     12void    ComputeBasalStressx( Vec* psigma,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,Parameters* parameters){
    1313
    1414        /*Intermediary*/

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void    ComputeBasalStressx( Vec* pp_g,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, DataSet* materials,  Parameters* parameters,
     12void    ComputeBasalStressx( Vec* pp_g,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,
    1313                        int analysis_type,int sub_analysis_type);
    1414

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

    r4215 r4218  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void    ComputePressurex( Vec* pp_g,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, DataSet* materials,Parameters* parameters){
     12void    ComputePressurex( Vec* pp_g,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,Parameters* parameters){
    1313
    1414        /*intermediary*/

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void    ComputePressurex( Vec* pp_g,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, DataSet* materials,  Parameters* parameters,
     12void    ComputePressurex( Vec* pp_g,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,
    1313                        int analysis_type,int sub_analysis_type);
    1414

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

    r4215 r4218  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void    ComputeStrainRatex( Vec* peps,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, DataSet* materials,Parameters* parameters){
     12void    ComputeStrainRatex( Vec* peps,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,Parameters* parameters){
    1313
    1414        /*Intermediary*/

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void    ComputeStrainRatex(Vec* eps_g,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, DataSet* materials,  Parameters* parameters,
     12void    ComputeStrainRatex(Vec* eps_g,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,
    1313                        int analysis_type,int sub_analysis_type);
    1414

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

    r4215 r4218  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 int     ConfigureObjectsx( Elements* elements, Loads* loads, Nodes* nodes, Vertices* vertices, DataSet* materials,Parameters* parameters){
     12int     ConfigureObjectsx( Elements* elements, Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){
    1313
    1414        /*Intermediary*/

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

    r4215 r4218  
    99
    1010/* local prototypes: */
    11 int ConfigureObjectsx( Elements* elements, Loads* loads, Nodes* nodes, Vertices* vertices, DataSet* materials, Parameters* parameters);
     11int ConfigureObjectsx( Elements* elements, Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials, Parameters* parameters);
    1212
    1313#endif  /* _CONFIGUREOBJECTSX_H */

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

    r4215 r4218  
    1111#include "../SurfaceAreax/SurfaceAreax.h"
    1212
    13 void CostFunctionx( double* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials,Parameters* parameters){
     13void CostFunctionx( double* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters){
    1414
    1515        /*Intermediary*/

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void CostFunctionx( double* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters);
     12void CostFunctionx( double* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters);
    1313
    1414#endif  /* _MISFITX_H */

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

    r4215 r4218  
    1111#include "../SurfaceAreax/SurfaceAreax.h"
    1212
    13 void Dux( Vec* pdu_g, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters){
     13void Dux( Vec* pdu_g, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters){
    1414
    1515        /*Intermediary*/

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void Dux( Vec* pdu_g, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters);
     12void Dux( Vec* pdu_g, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters);
    1313#endif  /* _DUX_H */
    1414

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

    r4215 r4218  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void FieldAverageOntoVerticesx(Vec* pfield, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters){
     12void FieldAverageOntoVerticesx(Vec* pfield, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters){
    1313
    1414        /*Intermediary*/

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

    r4215 r4218  
    99
    1010/* local prototypes: */
    11 void FieldAverageOntoVerticesx(Vec* field, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters);
     11void FieldAverageOntoVerticesx(Vec* field, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters);
    1212
    1313#endif  /* _FIELDDEPTHAVERAGEX_H */

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

    r4215 r4218  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void FieldDepthAveragex( Vec field, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,char* fieldname){
     12void FieldDepthAveragex( Vec field, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,char* fieldname){
    1313
    1414        /*Intermediary*/

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

    r4215 r4218  
    99
    1010/* local prototypes: */
    11 void FieldDepthAveragex( Vec field, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,char* fieldname);
     11void FieldDepthAveragex( Vec field, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,char* fieldname);
    1212
    1313#endif  /* _FIELDDEPTHAVERAGEX_H */

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

    r4215 r4218  
    99#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    11 void    GetSolutionFromInputsx( Vec* psolution, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, DataSet* materials,  Parameters* parameters){
     11void    GetSolutionFromInputsx( Vec* psolution, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters){
    1212
    1313        /*intermediary: */

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void GetSolutionFromInputsx( Vec* psolution, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, DataSet* materials,  Parameters* parameters);
     12void GetSolutionFromInputsx( Vec* psolution, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters);
    1313
    1414#endif  /* _GETSOLUTIONFROMINPUTSXX_H */

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

    r4215 r4218  
    99#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    11 void GetVectorFromInputsx( Vec* pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters, int NameEnum, int TypeEnum){
     11void GetVectorFromInputsx( Vec* pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int NameEnum, int TypeEnum){
    1212
    1313
    … …  
    4040}
    4141
    42 void GetVectorFromInputsx( double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters, int NameEnum, int TypeEnum){
     42void GetVectorFromInputsx( double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int NameEnum, int TypeEnum){
    4343       
    4444        /*output: */

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

    r4215 r4218  
    99
    1010/* local prototypes: */
    11 void    GetVectorFromInputsx( Vec* pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, DataSet* materials,  Parameters* parameters,int NameEnum,int TypeEnum);
    12 void    GetVectorFromInputsx( double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, DataSet* materials,  Parameters* parameters,int NameEnum,int TypeEnum);
     11void    GetVectorFromInputsx( Vec* pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,int NameEnum,int TypeEnum);
     12void    GetVectorFromInputsx( double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,int NameEnum,int TypeEnum);
    1313
    1414#endif  /* _GETVECTORFROMINPUTSXX_H */

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

    r4215 r4218  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void Gradjx( Vec* pgradient, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,int control_type){
     12void Gradjx( Vec* pgradient, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int control_type){
    1313
    1414        int i;

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void Gradjx(Vec* pgrad_g, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials,  Parameters* parameters, int control_type);
     12void Gradjx(Vec* pgrad_g, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,  Parameters* parameters, int control_type);
    1313
    1414#endif  /* _GRADJX_H */

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

    r4215 r4218  
    99#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    11 void InputAXPYx(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,DataSet* materials,Parameters* parameters,int YEnum, double scalar, int XEnum){
     11void InputAXPYx(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,int YEnum, double scalar, int XEnum){
    1212
    1313        /*intermediary:*/

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

    r4215 r4218  
    99
    1010/* local prototypes: */
    11 void InputAXPYx(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,DataSet* materials,Parameters* parameters,int YEnum, double scalar, int XEnum);
     11void InputAXPYx(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,int YEnum, double scalar, int XEnum);
    1212
    1313#endif  /* _AXPYINPUTX_H */

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

    r4215 r4218  
    99#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    11 void InputControlConstrainx(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,DataSet* materials,Parameters* parameters,int control_type,double cm_min, double cm_max){
     11void InputControlConstrainx(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,int control_type,double cm_min, double cm_max){
    1212
    1313        /*intermediary:*/

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

    r4215 r4218  
    99
    1010/* local prototypes: */
    11 void InputControlConstrainx(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,DataSet* materials,Parameters* parameters,int control_type,double cm_min, double cm_max);
     11void InputControlConstrainx(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,int control_type,double cm_min, double cm_max);
    1212
    1313#endif  /* _ControlConstrainINPUTX_H */

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

    r4215 r4218  
    88#include "../../EnumDefinitions/EnumDefinitions.h"
    99
    10 int InputConvergencex(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,DataSet* materials,Parameters* parameters,int* enums, int num_enums, int* criterionenums, double* criterionvalues,int num_criterionenums){
     10int InputConvergencex(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,int* enums, int num_enums, int* criterionenums, double* criterionvalues,int num_criterionenums){
    1111
    1212        /*intermediary:*/

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

    r4215 r4218  
    88
    99/* local prototypes: */
    10 int InputConvergencex(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,DataSet* materials,Parameters* parameters,int* enums, int num_enums, int* criterionenums, double* criterionvalues,int num_criterionenums);
     10int InputConvergencex(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,int* enums, int num_enums, int* criterionenums, double* criterionvalues,int num_criterionenums);
    1111
    1212#endif  /* _INPUTCONVERGENCEX_H */

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

    r4215 r4218  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void InputDepthAveragex( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,int enum_type,int average_enum_type){
     12void InputDepthAveragex( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int enum_type,int average_enum_type){
    1313       
    1414        /*Intermediary*/

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

    r4215 r4218  
    99
    1010/* local prototypes: */
    11 void InputDepthAveragex( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,int enum_type,int average_enum_type);
     11void InputDepthAveragex( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int enum_type,int average_enum_type);
    1212
    1313#endif  /* _DEPTHAVERAGEINPUTX_H */

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

    r4215 r4218  
    99#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    11 void InputDuplicatex(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,DataSet* materials,Parameters* parameters,int original_enum, int new_enum){
     11void InputDuplicatex(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,int original_enum, int new_enum){
    1212
    1313        /*intermediary:*/

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

    r4215 r4218  
    99
    1010/* local prototypes: */
    11 void InputDuplicatex(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,DataSet* materials,Parameters* parameters,int reinitialized_enum, int original_enum);
     11void InputDuplicatex(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,int reinitialized_enum, int original_enum);
    1212
    1313#endif  /* _INPUTDUPLICATEX_H */

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

    r4215 r4218  
    99#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    11 void InputExtrudex( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,int enum_type){
     11void InputExtrudex( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int enum_type){
    1212
    1313        int i;

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

    r4215 r4218  
    99
    1010/* local prototypes: */
    11 void InputExtrudex( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,int enum_type);
     11void InputExtrudex( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int enum_type);
    1212
    1313#endif  /* _INPUTEXTRUDEX_H */

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

    r4215 r4218  
    99#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    11 void InputScalex(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,DataSet* materials,Parameters* parameters,int enum_type, double scale_factor){
     11void InputScalex(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,int enum_type, double scale_factor){
    1212
    1313        /*intermediary:*/

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

    r4215 r4218  
    99
    1010/* local prototypes: */
    11 void InputScalex(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,DataSet* materials,Parameters* parameters,int enum_type, double scale_factor);
     11void InputScalex(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,int enum_type, double scale_factor);
    1212
    1313#endif  /* _SCALEINPUTX_H */

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

    r4215 r4218  
    99#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    11 void InputToResultx(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,DataSet* materials,Parameters* parameters,int enum_type,int step, double time){
     11void InputToResultx(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,int enum_type,int step, double time){
    1212
    1313        /*intermediary:*/

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

    r4215 r4218  
    99
    1010/* local prototypes: */
    11 void InputToResultx(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,DataSet* materials,Parameters* parameters,int enum_type,int step=1, double time=0);
     11void InputToResultx(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,int enum_type,int step=1, double time=0);
    1212
    1313#endif  /* _INPUTTORESULTX_H */

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

    r4215 r4218  
    99#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    11 void InputUpdateFromConstantx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,bool   constant, int name){
     11void InputUpdateFromConstantx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,bool   constant, int name){
    1212
    1313        int i;
    … …  
    3030        }
    3131}
    32 void InputUpdateFromConstantx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,int    constant, int name){
     32void InputUpdateFromConstantx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int    constant, int name){
    3333       
    3434        int i;
    … …  
    5151        }
    5252}
    53 void InputUpdateFromConstantx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,double constant, int name){
     53void InputUpdateFromConstantx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double constant, int name){
    5454
    5555        int i;

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void            InputUpdateFromConstantx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, DataSet* materials,  Parameters* parameters, bool   constant, int name);
    13 void            InputUpdateFromConstantx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, DataSet* materials,  Parameters* parameters, int    constant, int name);
    14 void            InputUpdateFromConstantx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, DataSet* materials,  Parameters* parameters, double constant, int name);
     12void            InputUpdateFromConstantx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters, bool   constant, int name);
     13void            InputUpdateFromConstantx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters, int    constant, int name);
     14void            InputUpdateFromConstantx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters, double constant, int name);
    1515
    1616#endif  /* _UPDATEINPUTSFROMCONSTANTXX_H */

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

    r4215 r4218  
    99#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    11 void InputUpdateFromSolutionx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,Vec solution){
     11void InputUpdateFromSolutionx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Vec solution){
    1212
    1313        double* serial_solution=NULL;
    … …  
    2525
    2626
    27 void InputUpdateFromSolutionx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,double* solution){
     27void InputUpdateFromSolutionx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* solution){
    2828
    2929        /*Intermediary*/

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void            InputUpdateFromSolutionx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, DataSet* materials,  Parameters* parameters,Vec solution);
    13 void        InputUpdateFromSolutionx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,double* solution);
     12void            InputUpdateFromSolutionx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,Vec solution);
     13void        InputUpdateFromSolutionx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* solution);
    1414
    1515//with timestep
    16 void            InputUpdateFromSolutionx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, DataSet* materials,  Parameters* parameters,Vec solution,int timestep);
    17 void        InputUpdateFromSolutionx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,double* solution, int timestep);
     16void            InputUpdateFromSolutionx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,Vec solution,int timestep);
     17void        InputUpdateFromSolutionx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* solution, int timestep);
    1818
    1919#endif  /* _UPDATEINPUTSFROMSOLUTIONXX_H */

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

    r4215 r4218  
    99#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    11 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,Vec vector, int NameEnum, int TypeEnum){
     11void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Vec vector, int NameEnum, int TypeEnum){
    1212
    1313        double* serial_vector=NULL;
    … …  
    2222
    2323       
    24 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,double* vector, int NameEnum, int TypeEnum){
     24void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* vector, int NameEnum, int TypeEnum){
    2525
    2626        int i;
    … …  
    6060}
    6161
    62 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,int* vector, int NameEnum, int TypeEnum){
     62void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int* vector, int NameEnum, int TypeEnum){
    6363       
    6464        int i;
    … …  
    9898}
    9999
    100 void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,bool* vector, int NameEnum, int TypeEnum){
     100void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,bool* vector, int NameEnum, int TypeEnum){
    101101
    102102        int i;

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void    InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, DataSet* materials,  Parameters* parameters,Vec vector, int NameEnum,int TypeEnum);
    13 void    InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, DataSet* materials,  Parameters* parameters,double* vector, int NameEnum,int TypeEnum);
    14 void    InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, DataSet* materials,  Parameters* parameters,int* vector, int NameEnum,int TypeEnum);
    15 void    InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, DataSet* materials,  Parameters* parameters,bool* vector, int NameEnum,int TypeEnum);
     12void    InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,Vec vector, int NameEnum,int TypeEnum);
     13void    InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,double* vector, int NameEnum,int TypeEnum);
     14void    InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,int* vector, int NameEnum,int TypeEnum);
     15void    InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,bool* vector, int NameEnum,int TypeEnum);
    1616
    1717#endif  /* _UPDATEINPUTSFROMVECTORXX_H */

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

    r4215 r4218  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void MassFluxx(double* pmass_flux, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,DataSet* materials,Parameters* parameters,  double* segments,int num_segments){
     12void MassFluxx(double* pmass_flux, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,  double* segments,int num_segments){
    1313
    1414        int i,j;

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void MassFluxx(double* pmass_flux, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,DataSet* materials, Parameters* parameters,double* segments,int num_segments);
     12void MassFluxx(double* pmass_flux, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,double* segments,int num_segments);
    1313
    1414

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

    r4215 r4218  
    1010#include "../SurfaceAreax/SurfaceAreax.h"
    1111
    12 void MaxAbsVxx( double* pmaxabsvx, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials,Parameters* parameters){
     12void MaxAbsVxx( double* pmaxabsvx, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters){
    1313       
    1414        int i;

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void MaxAbsVxx( double* pmaxabsvx, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters);
     12void MaxAbsVxx( double* pmaxabsvx, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters);
    1313
    1414#endif  /* _MAXABSVXX_H */

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

    r4215 r4218  
    1010#include "../SurfaceAreax/SurfaceAreax.h"
    1111
    12 void MaxAbsVyx( double* pmaxabsvy, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials,Parameters* parameters){
     12void MaxAbsVyx( double* pmaxabsvy, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters){
    1313       
    1414        int i;

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void MaxAbsVyx( double* pmaxabsvy, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters);
     12void MaxAbsVyx( double* pmaxabsvy, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters);
    1313
    1414#endif  /* _MAXABSVYX_H */

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

    r4215 r4218  
    1010#include "../SurfaceAreax/SurfaceAreax.h"
    1111
    12 void MaxAbsVzx( double* pmaxabsvz, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials,Parameters* parameters){
     12void MaxAbsVzx( double* pmaxabsvz, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters){
    1313       
    1414        int i;

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void MaxAbsVzx( double* pmaxabsvz, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters);
     12void MaxAbsVzx( double* pmaxabsvz, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters);
    1313
    1414#endif  /* _MAXABSVZX_H */

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

    r4215 r4218  
    1111#include "../SurfaceAreax/SurfaceAreax.h"
    1212
    13 void MaxVelx( double* pmaxvel, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials,Parameters* parameters){
     13void MaxVelx( double* pmaxvel, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters){
    1414       
    1515        int i;

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void MaxVelx( double* pmaxvel, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters);
     12void MaxVelx( double* pmaxvel, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters);
    1313
    1414#endif  /* _MAXVELX_H */

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

    r4215 r4218  
    1010#include "../SurfaceAreax/SurfaceAreax.h"
    1111
    12 void MaxVxx( double* pmaxvx, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials,Parameters* parameters){
     12void MaxVxx( double* pmaxvx, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters){
    1313       
    1414        int i;

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

    r4215 r4218  
    99
    1010/* local prototypes: */
    11 void MaxVxx( double* pmaxvx, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters);
     11void MaxVxx( double* pmaxvx, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters);
    1212
    1313#endif  /* _MAXVXX_H */

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

    r4215 r4218  
    1010#include "../SurfaceAreax/SurfaceAreax.h"
    1111
    12 void MaxVyx( double* pmaxvy, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials,Parameters* parameters){
     12void MaxVyx( double* pmaxvy, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters){
    1313       
    1414        int i;

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void MaxVyx( double* pmaxvy, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters);
     12void MaxVyx( double* pmaxvy, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters);
    1313
    1414#endif  /* _MAXVYX_H */

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

    r4215 r4218  
    1111#include "../SurfaceAreax/SurfaceAreax.h"
    1212
    13 void MaxVzx( double* pmaxvz, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials,Parameters* parameters){
     13void MaxVzx( double* pmaxvz, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters){
    1414       
    1515        int i;

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void MaxVzx( double* pmaxvz, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters);
     12void MaxVzx( double* pmaxvz, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters);
    1313
    1414#endif  /* _MAXVZX_H */

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

    r4215 r4218  
    1111#include "../SurfaceAreax/SurfaceAreax.h"
    1212
    13 void MinVelx( double* pminvel, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials,Parameters* parameters){
     13void MinVelx( double* pminvel, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters){
    1414       
    1515        int i;

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void MinVelx( double* pminvel, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters);
     12void MinVelx( double* pminvel, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters);
    1313
    1414#endif  /* _MINVELX_H */

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

    r4215 r4218  
    1010#include "../SurfaceAreax/SurfaceAreax.h"
    1111
    12 void MinVxx( double* pminvx, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials,Parameters* parameters){
     12void MinVxx( double* pminvx, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters){
    1313       
    1414        int i;

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void MinVxx( double* pminvx, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters);
     12void MinVxx( double* pminvx, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters);
    1313
    1414#endif  /* _MINVX_H */

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

    r4215 r4218  
    1010#include "../SurfaceAreax/SurfaceAreax.h"
    1111
    12 void MinVyx( double* pminvy, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials,Parameters* parameters){
     12void MinVyx( double* pminvy, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters){
    1313       
    1414        int i;

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void MinVyx( double* pminvy, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters);
     12void MinVyx( double* pminvy, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters);
    1313
    1414#endif  /* _MINVYX_H */

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

    r4215 r4218  
    1010#include "../SurfaceAreax/SurfaceAreax.h"
    1111
    12 void MinVzx( double* pminvz, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials,Parameters* parameters){
     12void MinVzx( double* pminvz, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters){
    1313       
    1414        int i;

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void MinVzx( double* pminvz, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters);
     12void MinVzx( double* pminvz, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters);
    1313
    1414#endif  /* _MINVZX_H */

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

    r4215 r4218  
    1111#include "../SurfaceAreax/SurfaceAreax.h"
    1212
    13 void Misfitx( double* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials,Parameters* parameters){
     13void Misfitx( double* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters){
    1414       
    1515        /*Intermediary*/

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void Misfitx( double* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters);
     12void Misfitx( double* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters);
    1313
    1414#endif  /* _MISFITX_H */

  • issm/trunk/src/c/modules/ModelProcessorx/CreateDataSets.cpp

    r4217 r4218  
    1616
    1717
    18 void CreateDataSets(Elements** pelements,Nodes** pnodes, Vertices** pvertices, DataSet** pmaterials, Constraints** pconstraints, Loads** ploads,Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type,int nummodels,int analysis_counter){
     18void CreateDataSets(Elements** pelements,Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads,Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type,int nummodels,int analysis_counter){
    1919
    2020        bool continuous=true;

  • issm/trunk/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp

    r4215 r4218  
    1313#include "./ModelProcessorx.h"
    1414
    15 void    CreateElementsVerticesAndMaterials(Elements** pelements,Vertices** pvertices,DataSet** pmaterials, IoModel* iomodel,ConstDataHandle iomodel_handle,int nummodels){
     15void    CreateElementsVerticesAndMaterials(Elements** pelements,Vertices** pvertices,Materials** pmaterials, IoModel* iomodel,ConstDataHandle iomodel_handle,int nummodels){
    1616
    1717        /*Intermediary*/
    … …  
    1919
    2020        /*DataSets: */
    21         Elements*   elements  = NULL;
    22         Vertices*   vertices = NULL;
    23         DataSet*    materials = NULL;
     21        Elements*     elements  = NULL;
     22        Vertices*     vertices = NULL;
     23        Materials*    materials = NULL;
    2424
    2525        /*Did we already create the elements? : */
    … …  
    2929        elements  = new Elements(ElementsEnum);
    3030        vertices  = new Vertices(VerticesEnum);
    31         materials = new DataSet(MaterialsEnum);
     31        materials = new Materials(MaterialsEnum);
    3232       
    3333        /*First, partition elements and vertices. Nodes will partitioned on a per analysis_type basis. If partitining already done, ignore: */

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

    r4217 r4218  
    1616#include "../../modules/modules.h"
    1717
    18 void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, DataSet** pmaterials, Constraints** pconstraints, Loads** ploads, Parameters** pparameters, ConstDataHandle IOMODEL,int solution_type,int nummodels, int* analysis_type_list){
     18void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads, Parameters** pparameters, ConstDataHandle IOMODEL,int solution_type,int nummodels, int* analysis_type_list){
    1919
    2020        int i;
    … …  
    2525        Nodes* nodes=NULL;
    2626        Vertices* vertices=NULL;
    27         DataSet* materials=NULL;
     27        Materials* materials=NULL;
    2828        Constraints* constraints=NULL;
    2929        Loads* loads=NULL;

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

    r4217 r4218  
    1313#include "../../io/io.h"
    1414
    15 void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, DataSet** pmaterials, Constraints** pconstraints, Loads** ploads, Parameters** pparameters, ConstDataHandle iomodel_handle,int solution_type,int nummodels, int* analysis_type_list);
     15void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads, Parameters** pparameters, ConstDataHandle iomodel_handle,int solution_type,int nummodels, int* analysis_type_list);
    1616
    1717/*Creation of fem datasets: general drivers*/
    18 void  CreateDataSets(Elements** pelements,Nodes** pnodes,Vertices** pvertices, DataSet** pmaterials, Constraints** pconstraints, Loads** ploads,Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type,int nummodels,int analysis_counter);
    19 void  CreateElementsVerticesAndMaterials(Elements** pelements,Vertices** pvertices,DataSet** pmaterials, IoModel* iomodel,ConstDataHandle iomodel_handle,int nummodels);
     18void  CreateDataSets(Elements** pelements,Nodes** pnodes,Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads,Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type,int nummodels,int analysis_counter);
     19void  CreateElementsVerticesAndMaterials(Elements** pelements,Vertices** pvertices,Materials** pmaterials, IoModel* iomodel,ConstDataHandle iomodel_handle,int nummodels);
    2020void  CreateParameters(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type,int analysis_counter);
    2121void  CreateParametersControl(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int analysis_type);
    … …  
    104104
    105105/*Diverse: */
    106 void  SortDataSets(Elements** pelements,Nodes** pnodes,Vertices** pvertices, Loads** ploads, DataSet** pmaterials, Constraints** pconstraints, Parameters** pparameters);
     106void  SortDataSets(Elements** pelements,Nodes** pnodes,Vertices** pvertices, Loads** ploads, Materials** pmaterials, Constraints** pconstraints, Parameters** pparameters);
    107107void  UpdateCounters(IoModel* iomodel,Nodes** pnodes,Loads** ploads, Constraints** pconstraints);
    108108

  • issm/trunk/src/c/modules/ModelProcessorx/SortDataSets.cpp

    r4217 r4218  
    1616
    1717
    18 void SortDataSets(Elements** pelements,Nodes** pnodes,Vertices** pvertices, Loads** ploads, DataSet** pmaterials, Constraints** pconstraints, Parameters** pparameters){
     18void SortDataSets(Elements** pelements,Nodes** pnodes,Vertices** pvertices, Loads** ploads, Materials** pmaterials, Constraints** pconstraints, Parameters** pparameters){
    1919
    2020        Elements* elements=NULL;
    … …  
    2222        Vertices* vertices=NULL;
    2323        Loads* loads=NULL;
    24         DataSet* materials=NULL;
     24        Materials* materials=NULL;
    2525        Constraints* constraints=NULL;
    2626        Parameters* parameters=NULL;

  • issm/trunk/src/c/modules/OutputResultsx/ElementResultsToPatch.cpp

    r4215 r4218  
    1515#include "../../objects/objects.h"
    1616               
    17 void ElementResultsToPatch(Elements* elements,  Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,DataSet* results){
     17void ElementResultsToPatch(Elements* elements,  Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,DataSet* results){
    1818
    1919        int i;

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

    r4215 r4218  
    1717               
    1818#ifdef _SERIAL_
    19 void OutputResultsx(mxArray** pdataref, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,DataSet* results){
     19void OutputResultsx(mxArray** pdataref, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,DataSet* results){
    2020#else
    21 void OutputResultsx(                    Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,DataSet* results){
     21void OutputResultsx(                    Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,DataSet* results){
    2222#endif
    2323

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

    r4215 r4218  
    1616#ifdef _SERIAL_
    1717#include <mex.h>
    18 void OutputResultsx(mxArray** pdataref, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads,  DataSet* materials, Parameters* parameters,DataSet* results);
     18void OutputResultsx(mxArray** pdataref, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads,  Materials* materials, Parameters* parameters,DataSet* results);
    1919void MatlabWriteResults(mxArray** pdataref, Parameters* parameters, DataSet* results);
    2020#else
    21 void OutputResultsx(Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads,  DataSet* materials, Parameters* parameters,DataSet* results);
     21void OutputResultsx(Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads,  Materials* materials, Parameters* parameters,DataSet* results);
    2222void FileWriteResults(Parameters* parameters, DataSet* results);
    2323#endif
    2424
    2525/* local prototypes: */
    26 void ElementResultsToPatch(Elements* elements,  Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,DataSet* results);
     26void ElementResultsToPatch(Elements* elements,  Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,DataSet* results);
    2727
    2828#endif  /* _OUTPUTRESULTS_H */

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

    r4215 r4218  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void PenaltyConstraintsx(int* pconverged, int* pnum_unstable_constraints, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads,DataSet* materials,  Parameters* parameters){
     12void PenaltyConstraintsx(int* pconverged, int* pnum_unstable_constraints, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads,Materials* materials,  Parameters* parameters){
    1313
    1414        int i;

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void PenaltyConstraintsx(int* pconverged, int* pnum_unstable_constraints, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads,DataSet* materials,  Parameters* parameters);
     12void PenaltyConstraintsx(int* pconverged, int* pnum_unstable_constraints, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads,Materials* materials,  Parameters* parameters);
    1313
    1414#endif  /* _PENALTYCONSTRAINTSX_H */

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

    r4215 r4218  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void PenaltySystemMatricesx(Mat Kgg, Vec pg,double* pkmax,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,DataSet* materials, Parameters* parameters, int kflag,int pflag){
     12void PenaltySystemMatricesx(Mat Kgg, Vec pg,double* pkmax,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters, int kflag,int pflag){
    1313       
    1414        int i;

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void PenaltySystemMatricesx(Mat Kgg, Vec pg,double* pkmax, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,DataSet* materials, Parameters* parameters, int kflag,int pflag);
     12void PenaltySystemMatricesx(Mat Kgg, Vec pg,double* pkmax, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters, int kflag,int pflag);
    1313
    1414#endif  /* _PENALTYSYSTEMMATRICESX_H */

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

    r4215 r4218  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void SurfaceAreax( double* pS, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials,Parameters* parameters){
     12void SurfaceAreax( double* pS, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters){
    1313       
    1414        /*Intermediary*/

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void SurfaceAreax( double* pS, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters);
     12void SurfaceAreax( double* pS, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters);
    1313
    1414#endif  /* _SURFACEAREAX_H */

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

    r4215 r4218  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void SystemMatricesx(Mat* pKgg, Vec* ppg,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,DataSet* materials, Parameters* parameters, int kflag,int pflag){
     12void SystemMatricesx(Mat* pKgg, Vec* ppg,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters, int kflag,int pflag){
    1313       
    1414        /*intermediary: */

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void SystemMatricesx(Mat* pKgg, Vec* ppg,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,DataSet* materials, Parameters* parameters, int kflag,int pflag);
     12void SystemMatricesx(Mat* pKgg, Vec* ppg,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters, int kflag,int pflag);
    1313
    1414#endif  /* _SYSTEMMATRICESX_H */

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

    r4215 r4218  
    1010#include "../../DataSet/DataSet.h"
    1111
    12 void UpdateGeometryx( Elements* elements, Nodes* nodes, Vertices* vertices,Loads* loads, DataSet* materials, Parameters* parameters){
     12void UpdateGeometryx( Elements* elements, Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters){
    1313
    1414        /*Intermediary*/

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

    r4215 r4218  
    1010
    1111/* local prototypes: */
    12 void UpdateGeometryx(Elements* elements, Nodes* nodes,Vertices* vertices,Loads* loads, DataSet* materials, Parameters* parameters);
     12void UpdateGeometryx(Elements* elements, Nodes* nodes,Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters);
    1313
    1414#endif  /* _UPDATEGEOMETRYX_H */

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

    r4215 r4218  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 int UpdateVertexPositionsx(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,DataSet* materials,Parameters* parameters){
     12int UpdateVertexPositionsx(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters){
    1313
    1414        int i;

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

    r4215 r4218  
    99
    1010/* local prototypes: */
    11 int UpdateVertexPositionsx(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,DataSet* materials,Parameters* parameters);
     11int UpdateVertexPositionsx(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters);
    1212
    1313#endif  /* _UPDATEVERTEXPOSITIONSXX_H */

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

    r4215 r4218  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void VecExtrudex( Vec vector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,int collapse){
     12void VecExtrudex( Vec vector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int collapse){
    1313
    1414        double* vector_serial=NULL;

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

    r4215 r4218  
    99
    1010/* local prototypes: */
    11 void VecExtrudex( Vec vector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, DataSet* materials, Parameters* parameters,int collapse);
     11void VecExtrudex( Vec vector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int collapse);
    1212
    1313#endif  /* _VECEXTRUDEX_H */

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

    r4215 r4218  
    6767/*}}}*/
    6868/*FUNCTION Beam::Configure {{{1*/
    69 void  Beam::Configure(Elements* elementsin,Loads* loadsin, DataSet* nodesin, DataSet* materialsin, Parameters* parametersin){
     69void  Beam::Configure(Elements* elementsin,Loads* loadsin, DataSet* nodesin, Materials* materialsin, Parameters* parametersin){
    7070
    7171        ISSMERROR(" not supported yet!");

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

    r4215 r4218  
    4444                /*}}}*/
    4545                /*object management: {{{1*/
    46                 void  Configure(Elements* elements,Loads* loads,DataSet* nodes,DataSet* materials,Parameters* parameters);
     46                void  Configure(Elements* elements,Loads* loads,DataSet* nodes,Materials* materials,Parameters* parameters);
    4747                void  Echo();
    4848                void  DeepEcho();

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

    r4215 r4218  
    2525               
    2626                virtual        ~Element(){};
    27                 virtual void   Configure(Elements* elements,Loads* loads,DataSet* nodes,DataSet* materials,Parameters* parameters)=0;
     27                virtual void   Configure(Elements* elements,Loads* loads,DataSet* nodes,Materials* materials,Parameters* parameters)=0;
    2828               
    2929                virtual void   CreateKMatrix(Mat Kgg)=0;

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

    r4215 r4218  
    275275/*Object management: */
    276276/*FUNCTION Penta::Configure {{{1*/
    277 void  Penta::Configure(Elements* elementsin, Loads* loadsin, DataSet* nodesin, DataSet* materialsin, Parameters* parametersin){
     277void  Penta::Configure(Elements* elementsin, Loads* loadsin, DataSet* nodesin, Materials* materialsin, Parameters* parametersin){
    278278
    279279        int analysis_counter;

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

    r4215 r4218  
    4949                /*}}}*/
    5050                /*FUNCTION object management {{{1*/
    51                 void  Configure(Elements* elements,Loads* loads,DataSet* nodes,DataSet* materials,Parameters* parameters);
     51                void  Configure(Elements* elements,Loads* loads,DataSet* nodes,Materials* materials,Parameters* parameters);
    5252                Object* copy();
    5353                void  DeepEcho();

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

    r4215 r4218  
    3939/*Object management*/
    4040/*FUNCTION Sing::Configure {{{1*/
    41 void  Sing::Configure(Elements* elementsin,Loads* loadsin, DataSet* nodesin, DataSet* materialsin, Parameters* parametersin){
     41void  Sing::Configure(Elements* elementsin,Loads* loadsin, DataSet* nodesin, Materials* materialsin, Parameters* parametersin){
    4242
    4343        ISSMERROR(" not supported yet!");

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

    r4215 r4218  
    4444                /*}}}*/
    4545                /*object management: {{{1*/
    46                 void  Configure(Elements* elements,Loads* loads,DataSet* nodes,DataSet* materials,Parameters* parameters);
     46                void  Configure(Elements* elements,Loads* loads,DataSet* nodes,Materials* materials,Parameters* parameters);
    4747                Object* copy();
    4848                void  DeepEcho();

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

    r4215 r4218  
    256256/*Object management: */
    257257/*FUNCTION Tria::Configure {{{1*/
    258 void  Tria::Configure(Elements* elementsin, Loads* loadsin, DataSet* nodesin, DataSet* materialsin, Parameters* parametersin){
     258void  Tria::Configure(Elements* elementsin, Loads* loadsin, DataSet* nodesin, Materials* materialsin, Parameters* parametersin){
    259259
    260260        int analysis_counter;

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

    r4215 r4218  
    4444                /*}}}*/
    4545                /*FUNCTION object management {{{1*/
    46                 void  Configure(Elements* elements,Loads* loads,DataSet* nodes,DataSet* materials,Parameters* parameters);
     46                void  Configure(Elements* elements,Loads* loads,DataSet* nodes,Materials* materials,Parameters* parameters);
    4747                Object* copy();
    4848                void  DeepEcho(void);

  • issm/trunk/src/c/objects/FemModel.h

    r4217 r4218  
    3232                Constraints*        constraints; //one set of constraints. each constraint knows which analysis_type it handles
    3333                Loads*              loads;  //one set of constraints. each constraint knows which analysis_type it handles
    34                 DataSet*            materials;  //one set of materials, for each element
     34                Materials*          materials;  //one set of materials, for each element
    3535                Parameters*         parameters; //one set of parameters, independent of the analysis_type
    3636                DataSet*            results; //results that cannot be fit into the elements (such as one time constants, arrays, strings, etc ...)

  • issm/trunk/src/c/objects/Loads/Icefront.cpp

    r4215 r4218  
    136136/*Object marshall*/
    137137/*FUNCTION Icefront::Configure {{{1*/
    138 void  Icefront::Configure(Elements* elementsin,Loads* loadsin,DataSet* nodesin,Vertices* verticesin,DataSet* materialsin,Parameters* parametersin){
     138void  Icefront::Configure(Elements* elementsin,Loads* loadsin,DataSet* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){
    139139
    140140        /*Take care of hooking up all objects for this element, ie links the objects in the hooks to their respective

  • issm/trunk/src/c/objects/Loads/Icefront.h

    r4215 r4218  
    4040                /*}}}*/
    4141                /*object management: {{{1*/
    42                 void  Configure(Elements* elementsin,Loads* loadsin,DataSet* nodesin,Vertices* verticesin,DataSet* materialsin,Parameters* parametersin);
     42                void  Configure(Elements* elementsin,Loads* loadsin,DataSet* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin);
    4343                void  DeepEcho();
    4444                void  Demarshall(char** pmarshalled_dataset);

  • issm/trunk/src/c/objects/Loads/Load.h

    r4215 r4218  
    2929                virtual int   MarshallSize()=0;
    3030                virtual void  Demarshall(char** pmarshalled_dataset)=0;
    31                 virtual void  Configure(Elements* elements,Loads* loads,DataSet* nodes,Vertices* vertices,DataSet* materials,Parameters* parameters)=0;
     31                virtual void  Configure(Elements* elements,Loads* loads,DataSet* nodes,Vertices* vertices,Materials* materials,Parameters* parameters)=0;
    3232                virtual void  CreateKMatrix(Mat Kgg)=0;
    3333                virtual void  CreatePVector(Vec pg)=0;

  • issm/trunk/src/c/objects/Loads/Numericalflux.cpp

    r4215 r4218  
    156156/*Object marshall*/
    157157/*FUNCTION Numericalflux::Configure {{{1*/
    158 void  Numericalflux::Configure(Elements* elementsin,Loads* loadsin,DataSet* nodesin,Vertices* verticesin,DataSet* materialsin,Parameters* parametersin){
     158void  Numericalflux::Configure(Elements* elementsin,Loads* loadsin,DataSet* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){
    159159
    160160        /*Take care of hooking up all objects for this element, ie links the objects in the hooks to their respective

  • issm/trunk/src/c/objects/Loads/Numericalflux.h

    r4215 r4218  
    3535                /*}}}*/
    3636                /*Object management: {{{1*/
    37                 void  Configure(Elements* elements,Loads* loads,DataSet* nodes,Vertices* vertices,DataSet* materials,Parameters* parameters);
     37                void  Configure(Elements* elements,Loads* loads,DataSet* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
    3838                void  DeepEcho();
    3939                void  Demarshall(char** pmarshalled_dataset);

  • issm/trunk/src/c/objects/Loads/Pengrid.cpp

    r4215 r4218  
    107107/*Object management*/
    108108/*FUNCTION Pengrid::Configure {{{1*/
    109 void  Pengrid::Configure(Elements* elementsin,Loads* loadsin,DataSet* nodesin,Vertices* verticesin,DataSet* materialsin,Parameters* parametersin){
     109void  Pengrid::Configure(Elements* elementsin,Loads* loadsin,DataSet* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){
    110110
    111111        /*Take care of hooking up all objects for this load, ie links the objects in the hooks to their respective

  • issm/trunk/src/c/objects/Loads/Pengrid.h

    r4215 r4218  
    4141                /*}}}*/
    4242                /*FUNCTION object management {{{1*/
    43                 void  Configure(Elements* elementsin,Loads* loadsin,DataSet* nodesin,Vertices* verticesin,DataSet* materialsin,Parameters* parametersin);
     43                void  Configure(Elements* elementsin,Loads* loadsin,DataSet* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin);
    4444                void  DeepEcho();
    4545                void  Demarshall(char** pmarshalled_dataset);

  • issm/trunk/src/c/objects/Loads/Penpair.cpp

    r4215 r4218  
    7373/*Object marshall*/
    7474/*FUNCTION Penpair::Configure {{{1*/
    75 void  Penpair::Configure(Elements* elementsin,Loads* loadsin,DataSet* nodesin,Vertices* verticesin,DataSet* materialsin,Parameters* parametersin){
     75void  Penpair::Configure(Elements* elementsin,Loads* loadsin,DataSet* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){
    7676
    7777        /*Take care of hooking up all objects for this element, ie links the objects in the hooks to their respective

  • issm/trunk/src/c/objects/Loads/Penpair.h

    r4215 r4218  
    3232                /*}}}*/
    3333                /*object management: {{{1*/
    34                 void  Configure(Elements* elements,Loads* loads,DataSet* nodes,Vertices* vertices,DataSet* materials,Parameters* parameters);
     34                void  Configure(Elements* elements,Loads* loads,DataSet* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
    3535                void  DeepEcho();
    3636                void  Demarshall(char** pmarshalled_dataset);

  • issm/trunk/src/c/objects/Loads/Riftfront.cpp

    r4215 r4218  
    131131/*Object marshall*/
    132132/*FUNCTION Riftfront::Configure {{{1*/
    133 void  Riftfront::Configure(Elements* elementsin,Loads* loadsin,DataSet* nodesin,Vertices* verticesin,DataSet* materialsin,Parameters* parametersin){
     133void  Riftfront::Configure(Elements* elementsin,Loads* loadsin,DataSet* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){
    134134
    135135        /*Take care of hooking up all objects for this element, ie links the objects in the hooks to their respective

  • issm/trunk/src/c/objects/Loads/Riftfront.h

    r4215 r4218  
    4949                /*}}}*/
    5050                /*object management: {{{1*/
    51                 void  Configure(Elements* elements,Loads* loads,DataSet* nodes,Vertices* vertices,DataSet* materials,Parameters* parameters);
     51                void  Configure(Elements* elements,Loads* loads,DataSet* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
    5252                Object* copy();
    5353                void  DeepEcho();

  • issm/trunk/src/mex/ComputeBasalStress/ComputeBasalStress.cpp

    r4215 r4218  
    1515        Vertices* vertices=NULL;
    1616        Loads* loads=NULL;
    17         DataSet* materials=NULL;
     17        Materials* materials=NULL;
    1818        Parameters* parameters=NULL;
    1919        int      numberofnodes;
    … …  
    3535        FetchData((DataSet**)&vertices,VERTICES);
    3636        FetchData((DataSet**)&loads,LOADS);
    37         FetchData(&materials,MATERIALS);
     37        FetchData((DataSet**)&materials,MATERIALS);
    3838        FetchParams(&parameters,PARAMETERS);
    3939        FetchData(&analysis_type,ANALYSIS);

  • issm/trunk/src/mex/ComputePressure/ComputePressure.cpp

    r4215 r4218  
    1515        Vertices* vertices=NULL;
    1616        Loads* loads=NULL;
    17         DataSet* materials=NULL;
     17        Materials* materials=NULL;
    1818        Parameters* parameters=NULL;
    1919        int      numberofnodes;
    … …  
    3535        FetchData((DataSet**)&vertices,VERTICES);
    3636        FetchData((DataSet**)&loads,LOADS);
    37         FetchData(&materials,MATERIALS);
     37        FetchData((DataSet**)&materials,MATERIALS);
    3838        FetchParams(&parameters,PARAMETERS);
    3939        FetchData(&analysis_type,ANALYSIS);

  • issm/trunk/src/mex/ConfigureObjects/ConfigureObjects.cpp

    r4215 r4218  
    1515        Nodes* nodes=NULL;
    1616        Vertices* vertices=NULL;
    17         DataSet* materials=NULL;
     17        Materials* materials=NULL;
    1818        Parameters* parameters=NULL;
    1919
    … …  
    3131        FetchData((DataSet**)&nodes,NODES);
    3232        FetchData((DataSet**)&vertices,VERTICES);
    33         FetchData(&materials,MATERIALS);
     33        FetchData((DataSet**)&materials,MATERIALS);
    3434        FetchParams(&parameters,PARAMETERS);
    3535

  • issm/trunk/src/mex/CostFunction/CostFunction.cpp

    r4215 r4218  
    1515        Nodes* nodes=NULL;
    1616        Vertices* vertices=NULL;
    17         DataSet* materials=NULL;
     17        Materials* materials=NULL;
    1818        Parameters* parameters=NULL;
    1919
    … …  
    3232        FetchData((DataSet**)&vertices,VERTICES);
    3333        FetchData((DataSet**)&loads,LOADS);
    34         FetchData(&materials,MATERIALS);
     34        FetchData((DataSet**)&materials,MATERIALS);
    3535        FetchParams(&parameters,PARAMETERS);
    3636

  • issm/trunk/src/mex/Du/Du.cpp

    r4215 r4218  
    1515        Vertices* vertices=NULL;
    1616        Loads* loads=NULL;
    17         DataSet* materials=NULL;
     17        Materials* materials=NULL;
    1818        Parameters* parameters=NULL;
    1919
    … …  
    3232        FetchData((DataSet**)&vertices,VERTICES);
    3333        FetchData((DataSet**)&loads,LOADS);
    34         FetchData(&materials,MATERIALS);
     34        FetchData((DataSet**)&materials,MATERIALS);
    3535        FetchParams(&parameters,PARAMETERS);
    3636

  • issm/trunk/src/mex/FieldAverageOntoVertices/FieldAverageOntoVertices.cpp

    r4215 r4218  
    1515        Vertices* vertices=NULL;
    1616        Loads* loads=NULL;
    17         DataSet* materials=NULL;
     17        Materials* materials=NULL;
    1818        Parameters* parameters=NULL;
    1919        Vec      field=NULL;
    … …  
    3030        FetchData((DataSet**)&vertices,VERTICES);
    3131        FetchData((DataSet**)&loads,LOADS);
    32         FetchData(&materials,MATERIALS);
     32        FetchData((DataSet**)&materials,MATERIALS);
    3333        FetchParams(&parameters,PARAMETERS);
    3434        FetchData(&field,FIELD);

  • issm/trunk/src/mex/FieldDepthAverage/FieldDepthAverage.cpp

    r4215 r4218  
    1515        Vertices* vertices=NULL;
    1616        Loads* loads=NULL;
    17         DataSet* materials=NULL;
     17        Materials* materials=NULL;
    1818        Parameters* parameters=NULL;
    1919        Vec      field=NULL;
    … …  
    3131        FetchData((DataSet**)&vertices,VERTICES);
    3232        FetchData((DataSet**)&loads,LOADS);
    33         FetchData(&materials,MATERIALS);
     33        FetchData((DataSet**)&materials,MATERIALS);
    3434        FetchParams(&parameters,PARAMETERS);
    3535        FetchData(&field,FIELD);

  • issm/trunk/src/mex/GetSolutionFromInputs/GetSolutionFromInputs.cpp

    r4215 r4218  
    1515        Vertices* vertices=NULL;
    1616        Loads* loads=NULL;
    17         DataSet* materials=NULL;
     17        Materials* materials=NULL;
    1818        Parameters* parameters=NULL;
    1919        Vec      ug=NULL;
    … …  
    3232        FetchData((DataSet**)&vertices,VERTICES);
    3333        FetchData((DataSet**)&loads,LOADSIN);
    34         FetchData(&materials,MATERIALS);
     34        FetchData((DataSet**)&materials,MATERIALS);
    3535        FetchParams(&parameters,PARAMETERS);
    3636

  • issm/trunk/src/mex/Gradj/Gradj.cpp

    r4215 r4218  
    1515        Vertices    *vertices     = NULL;
    1616        Loads     *loads        = NULL;
    17         DataSet    *materials    = NULL;
     17        Materials   *materials    = NULL;
    1818        Parameters *parameters   = NULL;
    1919        int         control_type;
    … …  
    3434        FetchData((DataSet**)&vertices,VERTICES);
    3535        FetchData((DataSet**)&loads,LOADS);
    36         FetchData(&materials,MATERIALS);
     36        FetchData((DataSet**)&materials,MATERIALS);
    3737        FetchParams(&parameters,PARAMETERS);
    3838        parameters->FindParam(&control_type,ControlTypeEnum);

  • issm/trunk/src/mex/InputControlConstrain/InputControlConstrain.cpp

    r4215 r4218  
    1515Vertices    *vertices          = NULL;
    1616Loads     *loads             = NULL;
    17 DataSet    *materials         = NULL;
     17Materials   *materials         = NULL;
    1818Parameters *parameters        = NULL;
    1919int         control_type;
    … …  
    3232FetchData((DataSet**)&vertices,VERTICESIN);
    3333FetchData((DataSet**)&loads,LOADSIN);
    34 FetchData(&materials,MATERIALSIN);
     34FetchData((DataSet**)&materials,MATERIALSIN);
    3535FetchParams(&parameters,PARAMETERSIN);
    3636FetchData(&control_type,CONTROLTYPE);

  • issm/trunk/src/mex/InputDepthAverage/InputDepthAverage.cpp

    r4215 r4218  
    1515Vertices    *vertices          = NULL;
    1616Loads     *loads             = NULL;
    17 DataSet    *materials         = NULL;
     17Materials   *materials         = NULL;
    1818Parameters *parameters        = NULL;
    1919int         enum_type;
    … …  
    3131FetchData((DataSet**)&vertices,VERTICESIN);
    3232FetchData((DataSet**)&loads,LOADSIN);
    33 FetchData(&materials,MATERIALSIN);
     33FetchData((DataSet**)&materials,MATERIALSIN);
    3434FetchParams(&parameters,PARAMETERSIN);
    3535FetchData(&enum_type,ENUMTYPE);

  • issm/trunk/src/mex/InputDuplicate/InputDuplicate.cpp

    r4215 r4218  
    1515        Vertices* vertices=NULL;
    1616        Loads* loads=NULL;
    17         DataSet* materials=NULL;
     17        Materials* materials=NULL;
    1818        Parameters* parameters=NULL;
    1919        int      original_enum,new_enum;
    … …  
    3030        FetchData((DataSet**)&vertices,VERTICES);
    3131        FetchData((DataSet**)&loads,LOADS);
    32         FetchData(&materials,MATERIALS);
     32        FetchData((DataSet**)&materials,MATERIALS);
    3333        FetchParams(&parameters,PARAMETERS);
    3434       

  • issm/trunk/src/mex/InputExtrude/InputExtrude.cpp

    r4215 r4218  
    1515        Vertices* vertices=NULL;
    1616        Loads* loads=NULL;
    17         DataSet* materials=NULL;
     17        Materials* materials=NULL;
    1818        Parameters* parameters=NULL;
    1919        int      NameEnum;
    … …  
    3030        FetchData((DataSet**)&vertices,VERTICES);
    3131        FetchData((DataSet**)&loads,LOADS);
    32         FetchData(&materials,MATERIALS);
     32        FetchData((DataSet**)&materials,MATERIALS);
    3333        FetchParams(&parameters,PARAMETERS);
    3434        FetchData(&NameEnum,NAME);

  • issm/trunk/src/mex/InputScale/InputScale.cpp

    r4215 r4218  
    1515        Vertices* vertices=NULL;
    1616        Loads* loads=NULL;
    17         DataSet* materials=NULL;
     17        Materials* materials=NULL;
    1818        Parameters* parameters=NULL;
    1919        int      enum_type;
    … …  
    3131        FetchData((DataSet**)&vertices,VERTICES);
    3232        FetchData((DataSet**)&loads,LOADS);
    33         FetchData(&materials,MATERIALS);
     33        FetchData((DataSet**)&materials,MATERIALS);
    3434        FetchParams(&parameters,PARAMETERS);
    3535       

  • issm/trunk/src/mex/InputToResult/InputToResult.cpp

    r4215 r4218  
    1515        Vertices* vertices=NULL;
    1616        Loads* loads=NULL;
    17         DataSet* materials=NULL;
     17        Materials* materials=NULL;
    1818        Parameters* parameters=NULL;
    1919        int      enum_type,step;
    … …  
    3131        FetchData((DataSet**)&vertices,VERTICES);
    3232        FetchData((DataSet**)&loads,LOADS);
    33         FetchData(&materials,MATERIALS);
     33        FetchData((DataSet**)&materials,MATERIALS);
    3434        FetchParams(&parameters,PARAMETERS);
    3535       

  • issm/trunk/src/mex/InputUpdateFromConstant/InputUpdateFromConstant.cpp

    r4215 r4218  
    1515Vertices* vertices=NULL;
    1616Loads* loads=NULL;
    17 DataSet* materials=NULL;
     17Materials* materials=NULL;
    1818Parameters* parameters=NULL;
    1919double   constant;
    … …  
    3131FetchData((DataSet**)&vertices,VERTICESIN);
    3232FetchData((DataSet**)&loads,LOADSIN);
    33 FetchData(&materials,MATERIALSIN);
     33FetchData((DataSet**)&materials,MATERIALSIN);
    3434FetchParams(&parameters,PARAMETERSIN);
    3535FetchData(&constant,CONSTANT);

  • issm/trunk/src/mex/InputUpdateFromSolution/InputUpdateFromSolution.cpp

    r4215 r4218  
    1515Vertices* vertices=NULL;
    1616Loads* loads=NULL;
    17 DataSet* materials=NULL;
     17Materials* materials=NULL;
    1818Parameters* parameters=NULL;
    1919Vec      solution=NULL;
    … …  
    3030FetchData((DataSet**)&vertices,VERTICESIN);
    3131FetchData((DataSet**)&loads,LOADSIN);
    32 FetchData(&materials,MATERIALSIN);
     32FetchData((DataSet**)&materials,MATERIALSIN);
    3333FetchParams(&parameters,PARAMETERSIN);
    3434FetchData(&solution,SOLUTION);

  • issm/trunk/src/mex/InputUpdateFromVector/InputUpdateFromVector.cpp

    r4215 r4218  
    1515Vertices* vertices=NULL;
    1616Loads* loads=NULL;
    17 DataSet* materials=NULL;
     17Materials* materials=NULL;
    1818Parameters* parameters=NULL;
    1919double*  vector=NULL;
    … …  
    3333FetchData((DataSet**)&vertices,VERTICESIN);
    3434FetchData((DataSet**)&loads,LOADSIN);
    35 FetchData(&materials,MATERIALSIN);
     35FetchData((DataSet**)&materials,MATERIALSIN);
    3636FetchParams(&parameters,PARAMETERSIN);
    3737FetchData(&vector,&dummy,VECTOR);

  • issm/trunk/src/mex/MassFlux/MassFlux.cpp

    r4215 r4218  
    1515        Vertices* vertices=NULL;
    1616        Loads* loads=NULL;
    17         DataSet* materials=NULL;
     17        Materials* materials=NULL;
    1818        Parameters* parameters=NULL;
    1919
    … …  
    3535        FetchData((DataSet**)&vertices,VERTICES);
    3636        FetchData((DataSet**)&loads,LOADS);
    37         FetchData(&materials,MATERIALS);
     37        FetchData((DataSet**)&materials,MATERIALS);
    3838        FetchParams(&parameters,PARAMETERS);
    3939        parameters->FindParam(&segments,&num_segments,NULL,QmuMassFluxSegmentsEnum);

  • issm/trunk/src/mex/Misfit/Misfit.cpp

    r4215 r4218  
    1515        Vertices* vertices=NULL;
    1616        Loads* loads=NULL;
    17         DataSet* materials=NULL;
     17        Materials* materials=NULL;
    1818        Parameters* parameters=NULL;
    1919
    … …  
    3232        FetchData((DataSet**)&vertices,VERTICES);
    3333        FetchData((DataSet**)&loads,LOADS);
    34         FetchData(&materials,MATERIALS);
     34        FetchData((DataSet**)&materials,MATERIALS);
    3535        FetchParams(&parameters,PARAMETERS);
    3636

  • issm/trunk/src/mex/ModelProcessor/ModelProcessor.cpp

    r4217 r4218  
    2222        Constraints* constraints=NULL;
    2323        Loads* loads=NULL;
    24         DataSet* materials=NULL;
     24        Materials* materials=NULL;
    2525        Parameters* parameters=NULL;
    2626

  • issm/trunk/src/mex/OutputResults/OutputResults.cpp

    r4215 r4218  
    1515        Vertices* vertices=NULL;
    1616        Loads* loads=NULL;
    17         DataSet* materials=NULL;
     17        Materials* materials=NULL;
    1818        Parameters* parameters=NULL;
    1919        DataSet* results=NULL;
    … …  
    3333        FetchData((DataSet**)&vertices,VERTICES);
    3434        FetchData((DataSet**)&loads,LOADS);
    35         FetchData(&materials,MATERIALS);
     35        FetchData((DataSet**)&materials,MATERIALS);
    3636        FetchParams(&parameters,PARAMETERS);
    3737        FetchData(&results,RESULTS);

  • issm/trunk/src/mex/ParameterOutput/ParameterOutput.cpp

    r4215 r4218  
    1414        Nodes* nodes=NULL;
    1515        Loads* loads=NULL;
    16         DataSet* materials=NULL;
     16        Materials* materials=NULL;
    1717        DataSet* results=NULL;
    1818        int      analysis_type;
    … …  
    3333        FetchData((DataSet**)&nodes,NODES);
    3434        FetchData((DataSet**)&loads,LOADS);
    35         FetchData(&materials,MATERIALS);
     35        FetchData((DataSet**)&materials,MATERIALS);
    3636        FetchData(&results,RESULTS);
    3737       

  • issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.cpp

    r4215 r4218  
    1515        Vertices* vertices=NULL;
    1616        Loads* loads=NULL;
    17         DataSet* materials=NULL;
     17        Materials* materials=NULL;
    1818        Parameters* parameters=NULL;
    1919
    … …  
    3333        FetchData((DataSet**)&vertices,VERTICES);
    3434        FetchData((DataSet**)&loads,LOADSIN);
    35         FetchData(&materials,MATERIALS);
     35        FetchData((DataSet**)&materials,MATERIALS);
    3636        FetchParams(&parameters,PARAMETERS);
    3737

  • issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.cpp

    r4215 r4218  
    2020        Vertices* vertices=NULL;
    2121        Loads* loads=NULL;
    22         DataSet* materials=NULL;
     22        Materials* materials=NULL;
    2323        Parameters* parameters=NULL;
    2424        int      kflag,pflag;
    … …  
    3737        FetchData((DataSet**)&vertices,VERTICES);
    3838        FetchData((DataSet**)&loads,LOADS);
    39         FetchData(&materials,MATERIALS);
     39        FetchData((DataSet**)&materials,MATERIALS);
    4040        FetchParams(&parameters,PARAMETERS);
    4141       

  • issm/trunk/src/mex/SystemMatrices/SystemMatrices.cpp

    r4215 r4218  
    1515        Vertices* vertices=NULL;
    1616        Loads* loads=NULL;
    17         DataSet* materials=NULL;
     17        Materials* materials=NULL;
    1818        Parameters* parameters=NULL;
    1919        int         kflag,pflag;
    … …  
    3434        FetchData((DataSet**)&vertices,VERTICES);
    3535        FetchData((DataSet**)&loads,LOADS);
    36         FetchData(&materials,MATERIALS);
     36        FetchData((DataSet**)&materials,MATERIALS);
    3737        FetchParams(&parameters,PARAMETERS);
    3838

  • issm/trunk/src/mex/UpdateGeometry/UpdateGeometry.cpp

    r4215 r4218  
    1515Vertices    *vertices          = NULL;
    1616Loads     *loads             = NULL;
    17 DataSet    *materials         = NULL;
     17Materials   *materials         = NULL;
    1818Parameters *parameters        = NULL;
    1919
    … …  
    2929FetchData((DataSet**)&vertices,VERTICESIN);
    3030FetchData((DataSet**)&loads,LOADSIN);
    31 FetchData(&materials,MATERIALSIN);
     31FetchData((DataSet**)&materials,MATERIALSIN);
    3232FetchParams(&parameters,PARAMETERSIN);
    3333

  • issm/trunk/src/mex/UpdateVertexPositions/UpdateVertexPositions.cpp

    r4215 r4218  
    1515Vertices    *vertices          = NULL;
    1616Loads     *loads             = NULL;
    17 DataSet    *materials         = NULL;
     17Materials   *materials         = NULL;
    1818Parameters *parameters        = NULL;
    1919
    … …  
    2929FetchData((DataSet**)&vertices,VERTICESIN);
    3030FetchData((DataSet**)&loads,LOADSIN);
    31 FetchData(&materials,MATERIALSIN);
     31FetchData((DataSet**)&materials,MATERIALSIN);
    3232FetchParams(&parameters,PARAMETERSIN);
    3333
Note: See TracChangeset for help on using the changeset viewer.