Changeset 4211


Ignore:
Timestamp:
06/24/10 16:57:38 (15 years ago)
Author:
Eric.Larour
Message:

New Nodes class

Location:
issm/trunk/src
Files:
2 added
163 edited

Legend:

Unmodified
Added
Removed

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

    r4185 r4211  
    132132
    133133
     134/********************************************************NODES************************************************/
     135
     136class Nodes: public DataSet{
     137
     138        public:
     139
     140                /*constructors, destructors: {{{1*/
     141                Nodes();
     142                Nodes(int enum_type);
     143                ~Nodes();
     144                /*}}}*/
     145                /*numerics: {{{1*/
     146                /*}}}*/
     147
     148};
     149
     150
     151/********************************************************VERTICES************************************************/
     152
     153class Vertices: public DataSet{
     154
     155        public:
     156
     157                /*constructors, destructors: {{{1*/
     158                Vertices();
     159                Vertices(int enum_type);
     160                ~Vertices();
     161                /*}}}*/
     162                /*numerics: {{{1*/
     163                /*}}}*/
     164
     165};
     166
     167
    134168
    135169

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

    r4193 r4211  
    204204                                        ./DataSet/Inputs.cpp\
    205205                                        ./DataSet/Results.cpp\
     206                                        ./DataSet/Nodes.cpp\
    206207                                        ./shared/shared.h\
    207208                                        ./shared/Alloc/alloc.h\
    … …  
    730731                                        ./DataSet/Inputs.cpp\
    731732                                        ./DataSet/Results.cpp\
     733                                        ./DataSet/Nodes.cpp\
    732734                                        ./shared/shared.h\
    733735                                        ./shared/Threads/issm_threads.h\

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

    r4034 r4211  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 int BuildNodeSetsx( NodeSets** pnodesets, DataSet* nodes,int analysis_type){
     12int BuildNodeSetsx( NodeSets** pnodesets, Nodes* nodes,int analysis_type){
    1313
    1414        int noerr=1;

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

    r4004 r4211  
    1010
    1111/* local prototypes: */
    12 int             BuildNodeSetsx( NodeSets** pnodesets,DataSet* nodes,int analysis_type);
     12int             BuildNodeSetsx( NodeSets** pnodesets,Nodes* nodes,int analysis_type);
    1313void PartitionSets(Vec* ppvb, Vec* ppvc,Vec flag_pva, Vec flag_pv_b, Vec flag_pv_c,int gsize);
    1414

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

    r4043 r4211  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void    ComputeBasalStressx( Vec* psigma,DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,Parameters* parameters){
     12void    ComputeBasalStressx( Vec* psigma,DataSet* elements,Nodes* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,Parameters* parameters){
    1313
    1414        /*Intermediary*/

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

    r3913 r4211  
    1010
    1111/* local prototypes: */
    12 void    ComputeBasalStressx( Vec* pp_g,DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,  Parameters* parameters,
     12void    ComputeBasalStressx( Vec* pp_g,DataSet* elements,Nodes* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,  Parameters* parameters,
    1313                        int analysis_type,int sub_analysis_type);
    1414

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

    r4185 r4211  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void    ComputePressurex( Vec* pp_g,DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,Parameters* parameters){
     12void    ComputePressurex( Vec* pp_g,DataSet* elements,Nodes* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,Parameters* parameters){
    1313
    1414        /*intermediary*/

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

    r3913 r4211  
    1010
    1111/* local prototypes: */
    12 void    ComputePressurex( Vec* pp_g,DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,  Parameters* parameters,
     12void    ComputePressurex( Vec* pp_g,DataSet* elements,Nodes* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,  Parameters* parameters,
    1313                        int analysis_type,int sub_analysis_type);
    1414

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

    r4043 r4211  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void    ComputeStrainRatex( Vec* peps,DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,Parameters* parameters){
     12void    ComputeStrainRatex( Vec* peps,DataSet* elements,Nodes* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,Parameters* parameters){
    1313
    1414        /*Intermediary*/

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

    r3913 r4211  
    1010
    1111/* local prototypes: */
    12 void    ComputeStrainRatex(Vec* eps_g,DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,  Parameters* parameters,
     12void    ComputeStrainRatex(Vec* eps_g,DataSet* elements,Nodes* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,  Parameters* parameters,
    1313                        int analysis_type,int sub_analysis_type);
    1414

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

    r4118 r4211  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 int     ConfigureObjectsx( DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials,Parameters* parameters){
     12int     ConfigureObjectsx( DataSet* elements, DataSet* loads, Nodes* nodes, DataSet* vertices, DataSet* materials,Parameters* parameters){
    1313
    1414        /*Intermediary*/

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

    r4034 r4211  
    99
    1010/* local prototypes: */
    11 int ConfigureObjectsx( DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials, Parameters* parameters);
     11int ConfigureObjectsx( DataSet* elements, DataSet* loads, Nodes* nodes, DataSet* vertices, DataSet* materials, Parameters* parameters);
    1212
    1313#endif  /* _CONFIGUREOBJECTSX_H */

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

    r4091 r4211  
    1111#include "../SurfaceAreax/SurfaceAreax.h"
    1212
    13 void CostFunctionx( double* pJ, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials,Parameters* parameters){
     13void CostFunctionx( double* pJ, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials,Parameters* parameters){
    1414
    1515        /*Intermediary*/

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

    r4055 r4211  
    1010
    1111/* local prototypes: */
    12 void CostFunctionx( double* pJ, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
     12void CostFunctionx( double* pJ, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
    1313
    1414#endif  /* _MISFITX_H */

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

    r4091 r4211  
    1111#include "../SurfaceAreax/SurfaceAreax.h"
    1212
    13 void Dux( Vec* pdu_g, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters){
     13void Dux( Vec* pdu_g, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters){
    1414
    1515        /*Intermediary*/

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

    r4055 r4211  
    1010
    1111/* local prototypes: */
    12 void Dux( Vec* pdu_g, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
     12void Dux( Vec* pdu_g, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
    1313#endif  /* _DUX_H */
    1414

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

    r4185 r4211  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void FieldAverageOntoVerticesx(Vec* pfield, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters){
     12void FieldAverageOntoVerticesx(Vec* pfield, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters){
    1313
    1414        /*Intermediary*/

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

    r3913 r4211  
    99
    1010/* local prototypes: */
    11 void FieldAverageOntoVerticesx(Vec* field, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
     11void FieldAverageOntoVerticesx(Vec* field, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
    1212
    1313#endif  /* _FIELDDEPTHAVERAGEX_H */

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

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

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

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

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

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

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

    r4055 r4211  
    1010
    1111/* local prototypes: */
    12 void GetSolutionFromInputsx( Vec* psolution, DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,  Parameters* parameters);
     12void GetSolutionFromInputsx( Vec* psolution, DataSet* elements,Nodes* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,  Parameters* parameters);
    1313
    1414#endif  /* _GETSOLUTIONFROMINPUTSXX_H */

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

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

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

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

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

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

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

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

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

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

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

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

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

    r4070 r4211  
    99#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    11 void InputControlConstrainx(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,Nodes* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int control_type,double cm_min, double cm_max){
    1212
    1313        /*intermediary:*/

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

    r4070 r4211  
    99
    1010/* local prototypes: */
    11 void InputControlConstrainx(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,Nodes* 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/InputConvergencex/InputConvergencex.cpp

    r4057 r4211  
    88#include "../../EnumDefinitions/EnumDefinitions.h"
    99
    10 int InputConvergencex(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int* enums, int num_enums, int* criterionenums, double* criterionvalues,int num_criterionenums){
     10int InputConvergencex(DataSet* elements,Nodes* nodes,DataSet* vertices,DataSet* loads,DataSet* 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

    r4057 r4211  
    88
    99/* local prototypes: */
    10 int InputConvergencex(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int* enums, int num_enums, int* criterionenums, double* criterionvalues,int num_criterionenums);
     10int InputConvergencex(DataSet* elements,Nodes* nodes,DataSet* vertices,DataSet* loads,DataSet* 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

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

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

    r4073 r4211  
    99
    1010/* local prototypes: */
    11 void InputDepthAveragex( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,int enum_type,int average_enum_type);
     11void InputDepthAveragex( DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,int enum_type,int average_enum_type);
    1212
    1313#endif  /* _DEPTHAVERAGEINPUTX_H */

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

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

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

    r4062 r4211  
    99
    1010/* local prototypes: */
    11 void InputDuplicatex(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int reinitialized_enum, int original_enum);
     11void InputDuplicatex(DataSet* elements,Nodes* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int reinitialized_enum, int original_enum);
    1212
    1313#endif  /* _INPUTDUPLICATEX_H */

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

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

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

    r4064 r4211  
    99
    1010/* local prototypes: */
    11 void InputExtrudex( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,int enum_type);
     11void InputExtrudex( DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,int enum_type);
    1212
    1313#endif  /* _INPUTEXTRUDEX_H */

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

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

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

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

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

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

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

    r4037 r4211  
    99
    1010/* local prototypes: */
    11 void InputToResultx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int enum_type,int step=1, double time=0);
     11void InputToResultx(DataSet* elements,Nodes* nodes,DataSet* vertices,DataSet* loads,DataSet* 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    r4043 r4211  
    1010
    1111/* local prototypes: */
    12 void MassFluxx(double* pmass_flux, DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads,DataSet* materials, Parameters* parameters,double* segments,int num_segments);
     12void MassFluxx(double* pmass_flux, DataSet* elements,Nodes* nodes, DataSet* vertices,DataSet* loads,DataSet* materials, Parameters* parameters,double* segments,int num_segments);
    1313
    1414

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

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

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

    r4043 r4211  
    1010
    1111/* local prototypes: */
    12 void MaxAbsVxx( double* pmaxabsvx, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
     12void MaxAbsVxx( double* pmaxabsvx, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
    1313
    1414#endif  /* _MAXABSVXX_H */

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

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

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

    r4043 r4211  
    1010
    1111/* local prototypes: */
    12 void MaxAbsVyx( double* pmaxabsvy, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
     12void MaxAbsVyx( double* pmaxabsvy, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
    1313
    1414#endif  /* _MAXABSVYX_H */

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

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

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

    r4043 r4211  
    1010
    1111/* local prototypes: */
    12 void MaxAbsVzx( double* pmaxabsvz, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
     12void MaxAbsVzx( double* pmaxabsvz, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
    1313
    1414#endif  /* _MAXABSVZX_H */

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

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

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

    r4042 r4211  
    1010
    1111/* local prototypes: */
    12 void MaxVelx( double* pmaxvel, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
     12void MaxVelx( double* pmaxvel, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
    1313
    1414#endif  /* _MAXVELX_H */

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

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

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

    r4043 r4211  
    99
    1010/* local prototypes: */
    11 void MaxVxx( double* pmaxvx, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
     11void MaxVxx( double* pmaxvx, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
    1212
    1313#endif  /* _MAXVXX_H */

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

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

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

    r4043 r4211  
    1010
    1111/* local prototypes: */
    12 void MaxVyx( double* pmaxvy, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
     12void MaxVyx( double* pmaxvy, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
    1313
    1414#endif  /* _MAXVYX_H */

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

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

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

    r4043 r4211  
    1010
    1111/* local prototypes: */
    12 void MaxVzx( double* pmaxvz, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
     12void MaxVzx( double* pmaxvz, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
    1313
    1414#endif  /* _MAXVZX_H */

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

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

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

    r4042 r4211  
    1010
    1111/* local prototypes: */
    12 void MinVelx( double* pminvel, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
     12void MinVelx( double* pminvel, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
    1313
    1414#endif  /* _MINVELX_H */

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

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

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

    r4043 r4211  
    1010
    1111/* local prototypes: */
    12 void MinVxx( double* pminvx, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
     12void MinVxx( double* pminvx, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
    1313
    1414#endif  /* _MINVX_H */

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

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

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

    r4043 r4211  
    1010
    1111/* local prototypes: */
    12 void MinVyx( double* pminvy, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
     12void MinVyx( double* pminvy, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
    1313
    1414#endif  /* _MINVYX_H */

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

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

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

    r4043 r4211  
    1010
    1111/* local prototypes: */
    12 void MinVzx( double* pminvz, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
     12void MinVzx( double* pminvz, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
    1313
    1414#endif  /* _MINVZX_H */

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

    r4091 r4211  
    1111#include "../SurfaceAreax/SurfaceAreax.h"
    1212
    13 void Misfitx( double* pJ, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials,Parameters* parameters){
     13void Misfitx( double* pJ, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials,Parameters* parameters){
    1414       
    1515        /*Intermediary*/

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

    r4043 r4211  
    1010
    1111/* local prototypes: */
    12 void Misfitx( double* pJ, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
     12void Misfitx( double* pJ, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
    1313
    1414#endif  /* _MISFITX_H */

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

    r4144 r4211  
    1313#include "../ModelProcessorx.h"
    1414
    15 void    CreateNodesBalancedthickness(DataSet** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
     15void    CreateNodesBalancedthickness(Nodes** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
    1616
    1717        /*Intermediary*/
    … …  
    2020
    2121        /*DataSets: */
    22         DataSet*    nodes = NULL;
     22        Nodes*    nodes = NULL;
    2323
    2424        /*Recover pointer: */
    … …  
    2626
    2727        /*Create nodes if they do not exist yet*/
    28         if(!nodes) nodes = new DataSet(NodesEnum);
     28        if(!nodes) nodes = new Nodes(NodesEnum);
    2929
    3030        /*Continuous Galerkin partition of nodes: */

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

    r4144 r4211  
    1313#include "../ModelProcessorx.h"
    1414
    15 void    CreateNodesBalancedthickness2(DataSet** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
     15void    CreateNodesBalancedthickness2(Nodes** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
    1616
    1717        /*Intermediary*/
    … …  
    2323
    2424        /*DataSets: */
    25         DataSet* nodes = NULL;
     25        Nodes* nodes = NULL;
    2626
    2727        /*Recover pointer: */
    … …  
    2929
    3030        /*Create nodes if they do not exist yet*/
    31         if(!nodes) nodes = new DataSet(NodesEnum);
     31        if(!nodes) nodes = new Nodes(NodesEnum);
    3232
    3333        /*Continuous Galerkin partition of nodes: */

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

    r4144 r4211  
    1313#include "../ModelProcessorx.h"
    1414
    15 void    CreateNodesBalancedvelocities(DataSet** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
     15void    CreateNodesBalancedvelocities(Nodes** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
    1616
    1717        /*Intermediary*/
    … …  
    2020
    2121        /*DataSets: */
    22         DataSet*    nodes = NULL;
     22        Nodes*    nodes = NULL;
    2323
    2424        /*Recover pointer: */
    … …  
    2626
    2727        /*Create nodes if they do not exist yet*/
    28         if(!nodes) nodes = new DataSet(NodesEnum);
     28        if(!nodes) nodes = new Nodes(NodesEnum);
    2929
    3030        /*Continuous Galerkin partition of nodes: */

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

    r4055 r4211  
    1616
    1717
    18 void CreateDataSets(DataSet** pelements,DataSet** pnodes, DataSet** pvertices, DataSet** pmaterials, DataSet** pconstraints, DataSet** ploads,Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type,int nummodels,int analysis_counter){
     18void CreateDataSets(DataSet** pelements,Nodes** pnodes, DataSet** pvertices, DataSet** pmaterials, DataSet** pconstraints, DataSet** 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/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp

    r4144 r4211  
    1313#include "../ModelProcessorx.h"
    1414
    15 void    CreateNodesDiagnosticHoriz(DataSet** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
     15void    CreateNodesDiagnosticHoriz(Nodes** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
    1616
    1717        /*Intermediary*/
    … …  
    2020
    2121        /*DataSets: */
    22         DataSet*    nodes = NULL;
     22        Nodes*    nodes = NULL;
    2323
    2424        /*First create nodes*/
    25         nodes = new DataSet(NodesEnum);
     25        nodes = new Nodes(NodesEnum);
    2626       
    2727        /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */

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

    r4144 r4211  
    1313#include "../ModelProcessorx.h"
    1414
    15 void    CreateNodesDiagnosticHutter(DataSet** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
     15void    CreateNodesDiagnosticHutter(Nodes** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
    1616
    1717        /*Intermediary*/
    … …  
    2020
    2121        /*DataSets: */
    22         DataSet*    nodes = NULL;
     22        Nodes*    nodes = NULL;
    2323
    2424        /*Recover pointer: */
    … …  
    2626
    2727        /*Create nodes if they do not exist yet*/
    28         if(!nodes) nodes = new DataSet(NodesEnum);
     28        if(!nodes) nodes = new Nodes(NodesEnum);
    2929
    3030        /*Now, is the flag ishutter on? otherwise, do nothing: */

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

    r4144 r4211  
    1313#include "../ModelProcessorx.h"
    1414
    15 void    CreateNodesDiagnosticStokes(DataSet** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
     15void    CreateNodesDiagnosticStokes(Nodes** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
    1616
    1717        /*Intermediary*/
    … …  
    2020
    2121        /*DataSets: */
    22         DataSet*    nodes = NULL;
     22        Nodes*    nodes = NULL;
    2323
    2424        /*Recover pointer: */
    … …  
    2626
    2727        /*Create nodes if they do not exist yet*/
    28         if(!nodes) nodes = new DataSet(NodesEnum);
     28        if(!nodes) nodes = new Nodes(NodesEnum);
    2929
    3030        /*Now, do we have Stokes elements?*/

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

    r4144 r4211  
    1313#include "../ModelProcessorx.h"
    1414
    15 void    CreateNodesDiagnosticVert(DataSet** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
     15void    CreateNodesDiagnosticVert(Nodes** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
    1616
    1717        /*Intermediary*/
    … …  
    2020
    2121        /*DataSets: */
    22         DataSet*    nodes = NULL;
     22        Nodes*    nodes = NULL;
    2323
    2424        /*Recover pointer: */
    … …  
    2626
    2727        /*Create nodes if they do not exist yet*/
    28         if(!nodes) nodes = new DataSet(NodesEnum);
     28        if(!nodes) nodes = new Nodes(NodesEnum);
    2929
    3030        /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */

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

    r4144 r4211  
    1313#include "../ModelProcessorx.h"
    1414
    15 void    CreateNodesMelting(DataSet** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
     15void    CreateNodesMelting(Nodes** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
    1616
    1717        /*Intermediary*/
    … …  
    2020
    2121        /*DataSets: */
    22         DataSet*    nodes = NULL;
     22        Nodes*    nodes = NULL;
    2323
    2424        /*Recover pointer: */
    … …  
    2626
    2727        /*Create nodes if they do not exist yet*/
    28         if(!nodes) nodes = new DataSet(NodesEnum);
     28        if(!nodes) nodes = new Nodes(NodesEnum);
    2929
    3030        /*Continuous Galerkin partition of nodes: */

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

    r4117 r4211  
    1616#include "../../modules/modules.h"
    1717
    18 void ModelProcessorx(DataSet** pelements, DataSet** pnodes, DataSet** pvertices, DataSet** pmaterials, DataSet** pconstraints, DataSet** ploads, Parameters** pparameters, ConstDataHandle IOMODEL,int solution_type,int nummodels, int* analysis_type_list){
     18void ModelProcessorx(DataSet** pelements, Nodes** pnodes, DataSet** pvertices, DataSet** pmaterials, DataSet** pconstraints, DataSet** ploads, Parameters** pparameters, ConstDataHandle IOMODEL,int solution_type,int nummodels, int* analysis_type_list){
    1919
    2020        int i;
    … …  
    2323        /*output: */
    2424        DataSet* elements=NULL;
    25         DataSet* nodes=NULL;
     25        Nodes* nodes=NULL;
    2626        DataSet* vertices=NULL;
    2727        DataSet* materials=NULL;

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

    r4063 r4211  
    1313#include "../../io/io.h"
    1414
    15 void ModelProcessorx(DataSet** pelements, DataSet** pnodes, DataSet** pvertices, DataSet** pmaterials, DataSet** pconstraints, DataSet** ploads, Parameters** pparameters, ConstDataHandle iomodel_handle,int solution_type,int nummodels, int* analysis_type_list);
     15void ModelProcessorx(DataSet** pelements, Nodes** pnodes, DataSet** pvertices, DataSet** pmaterials, DataSet** pconstraints, DataSet** 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(DataSet** pelements,DataSet** pnodes,DataSet** pvertices, DataSet** pmaterials, DataSet** pconstraints, DataSet** ploads,Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type,int nummodels,int analysis_counter);
     18void  CreateDataSets(DataSet** pelements,Nodes** pnodes,DataSet** pvertices, DataSet** pmaterials, DataSet** pconstraints, DataSet** ploads,Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type,int nummodels,int analysis_counter);
    1919void  CreateElementsVerticesAndMaterials(DataSet** pelements,DataSet** pvertices,DataSet** 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);
    … …  
    2525
    2626/*diagnostic horizontal*/
    27 void    CreateNodesDiagnosticHoriz(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     27void    CreateNodesDiagnosticHoriz(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    2828void    CreateConstraintsDiagnosticHoriz(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    2929void  CreateLoadsDiagnosticHoriz(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    … …  
    3131
    3232/*diagnostic vertical*/
    33 void    CreateNodesDiagnosticVert(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     33void    CreateNodesDiagnosticVert(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    3434void    CreateConstraintsDiagnosticVert(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    3535void    CreateLoadsDiagnosticVert(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    … …  
    3737
    3838/*diagnostic hutter*/
    39 void    CreateNodesDiagnosticHutter(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     39void    CreateNodesDiagnosticHutter(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    4040void    CreateConstraintsDiagnosticHutter(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    4141void    CreateLoadsDiagnosticHutter(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    … …  
    4343
    4444/*diagnostic stokes*/
    45 void    CreateNodesDiagnosticStokes(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     45void    CreateNodesDiagnosticStokes(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    4646void    CreateConstraintsDiagnosticStokes(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    4747void    CreateLoadsDiagnosticStokes(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    … …  
    4949
    5050/*slope compute*/
    51 void    CreateNodesSlopeCompute(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     51void    CreateNodesSlopeCompute(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    5252void    CreateConstraintsSlopeCompute(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    5353void    CreateLoadsSlopeCompute(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    … …  
    5555
    5656/*thermal:*/
    57 void    CreateNodesThermal(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     57void    CreateNodesThermal(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    5858void    CreateConstraintsThermal(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    5959void    CreateLoadsThermal(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    … …  
    6161
    6262/*melting:*/
    63 void    CreateNodesMelting(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     63void    CreateNodesMelting(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    6464void    CreateConstraintsMelting(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    6565void    CreateLoadsMelting(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    … …  
    6767
    6868/*prognostic:*/
    69 void    CreateNodesPrognostic(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     69void    CreateNodesPrognostic(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    7070void    CreateConstraintsPrognostic(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    7171void    CreateLoadsPrognostic(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    … …  
    7373
    7474/*prognostic2:*/
    75 void    CreateNodesPrognostic2(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     75void    CreateNodesPrognostic2(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    7676void    CreateConstraintsPrognostic2(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    7777void    CreateLoadsPrognostic2(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    … …  
    7979
    8080/*balancedthickness:*/
    81 void    CreateNodesBalancedthickness(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     81void    CreateNodesBalancedthickness(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    8282void    CreateConstraintsBalancedthickness(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    8383void    CreateLoadsBalancedthickness(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    8484void    UpdateElementsBalancedthickness(DataSet* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
    8585
    86 void    CreateNodesBalancedthickness2(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     86void    CreateNodesBalancedthickness2(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    8787void    CreateConstraintsBalancedthickness2(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    8888void    CreateLoadsBalancedthickness2(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    … …  
    9090
    9191/*balancedvelocities:*/
    92 void    CreateNodesBalancedvelocities(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     92void    CreateNodesBalancedvelocities(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    9393void    CreateConstraintsBalancedvelocities(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    9494void    CreateLoadsBalancedvelocities(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    … …  
    104104
    105105/*Diverse: */
    106 void  SortDataSets(DataSet** pelements,DataSet** pnodes,DataSet** pvertices, DataSet** ploads, DataSet** pmaterials, DataSet** pconstraints, Parameters** pparameters);
    107 void  UpdateCounters(IoModel* iomodel,DataSet** pnodes,DataSet** ploads, DataSet** pconstraints);
     106void  SortDataSets(DataSet** pelements,Nodes** pnodes,DataSet** pvertices, DataSet** ploads, DataSet** pmaterials, DataSet** pconstraints, Parameters** pparameters);
     107void  UpdateCounters(IoModel* iomodel,Nodes** pnodes,DataSet** ploads, DataSet** pconstraints);
    108108
    109109#endif

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

    r4144 r4211  
    1313#include "../ModelProcessorx.h"
    1414
    15 void    CreateNodesPrognostic(DataSet** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
     15void    CreateNodesPrognostic(Nodes** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
    1616
    1717        /*Intermediary*/
    … …  
    2020
    2121        /*DataSets: */
    22         DataSet*    nodes = NULL;
     22        Nodes*    nodes = NULL;
    2323
    2424        /*Recover pointer: */
    … …  
    2626
    2727        /*Create nodes if they do not exist yet*/
    28         if(!nodes) nodes = new DataSet(NodesEnum);
     28        if(!nodes) nodes = new Nodes(NodesEnum);
    2929
    3030        /*Continuous Galerkin partition of nodes: */

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

    r4144 r4211  
    1313#include "../ModelProcessorx.h"
    1414
    15 void    CreateNodesPrognostic2(DataSet** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
     15void    CreateNodesPrognostic2(Nodes** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
    1616
    1717        /*Intermediary*/
    … …  
    2323
    2424        /*DataSets: */
    25         DataSet* nodes = NULL;
     25        Nodes* nodes = NULL;
    2626
    2727        /*Recover pointer: */
    … …  
    2929
    3030        /*Create nodes if they do not exist yet*/
    31         if(!nodes) nodes = new DataSet(NodesEnum);
     31        if(!nodes) nodes = new Nodes(NodesEnum);
    3232
    3333        /*Continuous Galerkin partition of nodes: */

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

    r4144 r4211  
    1313#include "../ModelProcessorx.h"
    1414
    15 void    CreateNodesSlopeCompute(DataSet** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
     15void    CreateNodesSlopeCompute(Nodes** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
    1616
    1717        /*Intermediary*/
    … …  
    2020
    2121        /*DataSets: */
    22         DataSet*    nodes = NULL;
     22        Nodes*    nodes = NULL;
    2323
    2424        /*Recover pointer: */
    … …  
    2626
    2727        /*Create nodes if they do not exist yet*/
    28         if(!nodes) nodes = new DataSet(NodesEnum);
     28        if(!nodes) nodes = new Nodes(NodesEnum);
    2929       
    3030        /*Continuous Galerkin partition of nodes: */

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

    r4025 r4211  
    1616
    1717
    18 void SortDataSets(DataSet** pelements,DataSet** pnodes,DataSet** pvertices, DataSet** ploads, DataSet** pmaterials, DataSet** pconstraints, Parameters** pparameters){
     18void SortDataSets(DataSet** pelements,Nodes** pnodes,DataSet** pvertices, DataSet** ploads, DataSet** pmaterials, DataSet** pconstraints, Parameters** pparameters){
    1919
    2020        DataSet* elements=NULL;
    21         DataSet* nodes=NULL;
     21        Nodes* nodes=NULL;
    2222        DataSet* vertices=NULL;
    2323        DataSet* loads=NULL;

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

    r4144 r4211  
    1313#include "../ModelProcessorx.h"
    1414
    15 void    CreateNodesThermal(DataSet** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
     15void    CreateNodesThermal(Nodes** pnodes, IoModel* iomodel,ConstDataHandle iomodel_handle){
    1616
    1717        /*Intermediary*/
    … …  
    2020
    2121        /*DataSets: */
    22         DataSet*    nodes = NULL;
     22        Nodes*    nodes = NULL;
    2323       
    2424        /*Recover pointer: */
    … …  
    2626
    2727        /*Create nodes if they do not exist yet*/
    28         if(!nodes) nodes = new DataSet(NodesEnum);
     28        if(!nodes) nodes = new Nodes(NodesEnum);
    2929
    3030        /*Continuous Galerkin partition of nodes: */

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

    r4185 r4211  
    1515#include "./ModelProcessorx.h"
    1616
    17 void    UpdateCounters(IoModel* iomodel,DataSet** pnodes,DataSet** ploads, DataSet** pconstraints){
     17void    UpdateCounters(IoModel* iomodel,Nodes** pnodes,DataSet** ploads, DataSet** pconstraints){
    1818
    19         DataSet* nodes=NULL;
     19        Nodes* nodes=NULL;
    2020        DataSet* loads=NULL;
    2121        DataSet* constraints=NULL;

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

    r4185 r4211  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 int MpcNodesx( Mat* pRmg, DataSet* nodes,DataSet* constraints,int analysis_type){
     12int MpcNodesx( Mat* pRmg, Nodes* nodes,DataSet* constraints,int analysis_type){
    1313
    1414        int i;

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

    r4003 r4211  
    1010
    1111/* local prototypes: */
    12 int             MpcNodesx( Mat* pRmg, DataSet* nodes,DataSet* constraints,int analysis_type);
     12int             MpcNodesx( Mat* pRmg, Nodes* nodes,DataSet* constraints,int analysis_type);
    1313
    1414#endif  /* _MPCNODESX_H */

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

    r4185 r4211  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void NodesDofx(DataSet* nodes, Parameters* parameters){
     12void NodesDofx(Nodes* nodes, Parameters* parameters){
    1313
    1414        int noerr=1;

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

    r4009 r4211  
    1010
    1111/* local prototypes: */
    12 void NodesDofx(DataSet* nodes, Parameters* parameters);
     12void NodesDofx(Nodes* nodes, Parameters* parameters);
    1313
    1414#endif  /* _NODESDOFX_H */

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

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

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

    r4182 r4211  
    1717               
    1818#ifdef _SERIAL_
    19 void OutputResultsx(mxArray** pdataref, DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials, Parameters* parameters,DataSet* results){
     19void OutputResultsx(mxArray** pdataref, DataSet* elements, Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,DataSet* results){
    2020#else
    21 void OutputResultsx(DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials, Parameters* parameters,DataSet* results){
     21void OutputResultsx(                    DataSet* elements, Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,DataSet* results){
    2222#endif
    2323
    … …  
    2929
    3030        /*Transfer element results into the femmodel->results dataset: */
    31         ElementResultsToPatch( elements,  loads,  nodes,  vertices, materials, parameters,results);
     31        ElementResultsToPatch( elements,  nodes,  vertices,  loads, materials, parameters,results);
    3232
    3333        #ifdef _PARALLEL_

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

    r4182 r4211  
    1313
    1414class DataSet;
     15class Nodes;
    1516class Parameters;
     17
    1618
    1719#ifdef _SERIAL_
    1820#include <mex.h>
    19 void OutputResultsx(mxArray** pdataref, DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials, Parameters* parameters,DataSet* results);
     21void OutputResultsx(mxArray** pdataref, DataSet* elements, Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,DataSet* results);
    2022void MatlabWriteResults(mxArray** pdataref, Parameters* parameters, DataSet* results);
    2123#else
    22 void OutputResultsx(DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials, Parameters* parameters,DataSet* results);
     24void OutputResultsx(DataSet* elements, Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,DataSet* results);
    2325void FileWriteResults(Parameters* parameters, DataSet* results);
    2426#endif
    2527
    2628/* local prototypes: */
    27 void ElementResultsToPatch(DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials, Parameters* parameters,DataSet* results);
     29void ElementResultsToPatch(DataSet* elements,  Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,DataSet* results);
    2830
    2931#endif  /* _OUTPUTRESULTS_H */

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

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

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

    r4043 r4211  
    1010
    1111/* local prototypes: */
    12 void PenaltyConstraintsx(int* pconverged, int* pnum_unstable_constraints, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads,DataSet* materials,  Parameters* parameters);
     12void PenaltyConstraintsx(int* pconverged, int* pnum_unstable_constraints, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads,DataSet* materials,  Parameters* parameters);
    1313
    1414#endif  /* _PENALTYCONSTRAINTSX_H */

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

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

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

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

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

    r4042 r4211  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void SpcNodesx(Vec* pyg, DataSet* nodes,DataSet* constraints,int analysis_type){
     12void SpcNodesx(Vec* pyg, Nodes* nodes,DataSet* constraints,int analysis_type){
    1313
    1414        int i;

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

    r4002 r4211  
    1111
    1212/* local prototypes: */
    13 void SpcNodesx(Vec* pyg, DataSet* nodesin,DataSet* constraints,int analysis_type);
     13void SpcNodesx(Vec* pyg, Nodes* nodesin,DataSet* constraints,int analysis_type);
    1414
    1515#endif  /* _SPCNODESX_H */

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

    r4043 r4211  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void SurfaceAreax( double* pS, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials,Parameters* parameters){
     12void SurfaceAreax( double* pS, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials,Parameters* parameters){
    1313       
    1414        /*Intermediary*/

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

    r4043 r4211  
    1010
    1111/* local prototypes: */
    12 void SurfaceAreax( double* pS, DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
     12void SurfaceAreax( double* pS, DataSet* elements,Nodes* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters);
    1313
    1414#endif  /* _SURFACEAREAX_H */

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

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

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

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

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

    r4164 r4211  
    1010#include "../../DataSet/DataSet.h"
    1111
    12 void UpdateGeometryx( DataSet* elements, DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials, Parameters* parameters){
     12void UpdateGeometryx( DataSet* elements, Nodes* nodes, DataSet* vertices,DataSet* loads, DataSet* materials, Parameters* parameters){
    1313
    1414        /*Intermediary*/

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

    r4055 r4211  
    1010
    1111/* local prototypes: */
    12 void UpdateGeometryx(DataSet* elements, DataSet* nodes,DataSet* vertices,DataSet* loads, DataSet* materials, Parameters* parameters);
     12void UpdateGeometryx(DataSet* elements, Nodes* nodes,DataSet* vertices,DataSet* loads, DataSet* materials, Parameters* parameters);
    1313
    1414#endif  /* _UPDATEGEOMETRYX_H */

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

    r4057 r4211  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 int UpdateVertexPositionsx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters){
     12int UpdateVertexPositionsx(DataSet* elements,Nodes* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters){
    1313
    1414        int i;

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

    r4057 r4211  
    99
    1010/* local prototypes: */
    11 int UpdateVertexPositionsx(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters);
     11int UpdateVertexPositionsx(DataSet* elements,Nodes* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters);
    1212
    1313#endif  /* _UPDATEVERTEXPOSITIONSXX_H */

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

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

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

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

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

    r4166 r4211  
    2828               
    2929                DataSet*            elements; //elements (one set for all analyses)
    30                 DataSet*            nodes; //one set of nodes
     30                Nodes*            nodes; //one set of nodes
    3131                DataSet*            vertices; //one set of vertices
    3232                DataSet*            constraints; //one set of constraints. each constraint knows which analysis_type it handles

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

    r4148 r4211  
    8484
    8585                _printf_("write results to disk:\n");
    86                 OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     86                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
    8787        }
    8888        else{

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

    r4148 r4211  
    8282
    8383                _printf_("write results to disk:\n");
    84                 OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     84                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
    8585
    8686        }

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

    r4148 r4211  
    8585
    8686                _printf_("write results to disk:\n");
    87                 OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     87                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
    8888
    8989        }

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

    r4143 r4211  
    8686
    8787                _printf_("write results to disk:\n");
    88                 OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     88                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
    8989        }
    9090        else{

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

    r4143 r4211  
    2222
    2323        /*write to disk: */
    24         OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     24        OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
    2525
    2626}

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

    r4143 r4211  
    9696
    9797                _printf_("write results to disk:\n");
    98                 OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     98                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
    9999        }
    100100        else{

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

    r4143 r4211  
    8686               
    8787                _printf_("write results to disk:\n");
    88                 OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     88                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
    8989
    9090        }

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

    r4143 r4211  
    8585
    8686                _printf_("write results to disk:\n");
    87                 OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     87                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
    8888
    8989        }

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

    r4143 r4211  
    103103
    104104                _printf_("write results to disk:\n");
    105                 OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     105                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
    106106
    107107        }

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

    r4143 r4211  
    8686
    8787                _printf_("write results to disk:\n");
    88                 OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     88                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
    8989        }
    9090        else{

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

    r4143 r4211  
    8888               
    8989                _printf_("write results to disk:\n");
    90                 OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     90                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
    9191
    9292        }

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

    r4143 r4211  
    8282       
    8383                _printf_("write results to disk:\n");
    84                 OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     84                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
    8585        }
    8686        else{

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

    r4143 r4211  
    8282       
    8383                _printf_("write results to disk:\n");
    84                 OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     84                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
    8585        }
    8686        else{

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

    r4143 r4211  
    7070                if (step%5==0){
    7171                        if(verbose)_printf_("%s","      saving temporary results...");
    72                         OutputResultsx(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters,femmodel->results);
     72                        OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
    7373                }
    7474        }

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

    r4004 r4211  
    1212
    1313        /*input datasets: */
    14         DataSet*     nodes=NULL;
     14        Nodes*     nodes=NULL;
    1515        int analysis_type;
    1616
    … …  
    2525
    2626        /*Input datasets: */
    27         FetchData(&nodes,NODES);
     27        FetchData((DataSet**)&nodes,NODES);
    2828        FetchData(&analysis_type,ANALYSISTYPE);
    2929       

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

    r3712 r4211  
    1212        /*input datasets: */
    1313        DataSet* elements=NULL;
    14         DataSet* nodes=NULL;
     14        Nodes* nodes=NULL;
    1515        DataSet* vertices=NULL;
    1616        DataSet* loads=NULL;
    … …  
    3232        /*Input datasets: */
    3333        FetchData(&elements,ELEMENTS);
    34         FetchData(&nodes,NODES);
     34        FetchData((DataSet**)&nodes,NODES);
    3535        FetchData(&vertices,VERTICES);
    3636        FetchData(&loads,LOADS);

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

    r3712 r4211  
    1212        /*input datasets: */
    1313        DataSet* elements=NULL;
    14         DataSet* nodes=NULL;
     14        Nodes* nodes=NULL;
    1515        DataSet* vertices=NULL;
    1616        DataSet* loads=NULL;
    … …  
    3232        /*Input datasets: */
    3333        FetchData(&elements,ELEMENTS);
    34         FetchData(&nodes,NODES);
     34        FetchData((DataSet**)&nodes,NODES);
    3535        FetchData(&vertices,VERTICES);
    3636        FetchData(&loads,LOADS);

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

    r4198 r4211  
    1313        DataSet* elements=NULL;
    1414        DataSet* loads=NULL;
    15         DataSet* nodes=NULL;
     15        Nodes* nodes=NULL;
    1616        DataSet* vertices=NULL;
    1717        DataSet* materials=NULL;
    … …  
    2929        FetchData(&elements,ELEMENTSIN);
    3030        FetchData(&loads,LOADSIN);
    31         FetchData(&nodes,NODES);
     31        FetchData((DataSet**)&nodes,NODES);
    3232        FetchData(&vertices,VERTICES);
    3333        FetchData(&materials,MATERIALS);

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

    r4099 r4211  
    1313        DataSet* elements=NULL;
    1414        DataSet* loads=NULL;
    15         DataSet* nodes=NULL;
     15        Nodes* nodes=NULL;
    1616        DataSet* vertices=NULL;
    1717        DataSet* materials=NULL;
    … …  
    2929        /*Input datasets: */
    3030        FetchData(&elements,ELEMENTS);
    31         FetchData(&nodes,NODES);
     31        FetchData((DataSet**)&nodes,NODES);
    3232        FetchData(&vertices,VERTICES);
    3333        FetchData(&loads,LOADS);

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

    r4099 r4211  
    1212        /*input datasets: */
    1313        DataSet* elements=NULL;
    14         DataSet* nodes=NULL;
     14        Nodes* nodes=NULL;
    1515        DataSet* vertices=NULL;
    1616        DataSet* loads=NULL;
    … …  
    2929        /*Input datasets: */
    3030        FetchData(&elements,ELEMENTS);
    31         FetchData(&nodes,NODES);
     31        FetchData((DataSet**)&nodes,NODES);
    3232        FetchData(&vertices,VERTICES);
    3333        FetchData(&loads,LOADS);

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

    r3712 r4211  
    1212        /*input datasets: */
    1313        DataSet* elements=NULL;
    14         DataSet* nodes=NULL;
     14        Nodes* nodes=NULL;
    1515        DataSet* vertices=NULL;
    1616        DataSet* loads=NULL;
    … …  
    2727        /*Input datasets: */
    2828        FetchData(&elements,ELEMENTS);
    29         FetchData(&nodes,NODES);
     29        FetchData((DataSet**)&nodes,NODES);
    3030        FetchData(&vertices,VERTICES);
    3131        FetchData(&loads,LOADS);

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

    r3712 r4211  
    1212        /*input datasets: */
    1313        DataSet* elements=NULL;
    14         DataSet* nodes=NULL;
     14        Nodes* nodes=NULL;
    1515        DataSet* vertices=NULL;
    1616        DataSet* loads=NULL;
    … …  
    2828        /*Input datasets: */
    2929        FetchData(&elements,ELEMENTS);
    30         FetchData(&nodes,NODES);
     30        FetchData((DataSet**)&nodes,NODES);
    3131        FetchData(&vertices,VERTICES);
    3232        FetchData(&loads,LOADS);

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

    r4103 r4211  
    1212        /*input datasets: */
    1313        DataSet* elements=NULL;
    14         DataSet* nodes=NULL;
     14        Nodes* nodes=NULL;
    1515        DataSet* vertices=NULL;
    1616        DataSet* loads=NULL;
    … …  
    2929        /*Input datasets: */
    3030        FetchData(&elements,ELEMENTSIN);
    31         FetchData(&nodes,NODES);
     31        FetchData((DataSet**)&nodes,NODES);
    3232        FetchData(&vertices,VERTICES);
    3333        FetchData(&loads,LOADSIN);

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

    r4103 r4211  
    1212        /*input datasets: */
    1313        DataSet    *elements     = NULL;
    14         DataSet    *nodes        = NULL;
     14        Nodes      *nodes        = NULL;
    1515        DataSet    *vertices     = NULL;
    1616        DataSet    *loads        = NULL;
    … …  
    3131        /*Input datasets: */
    3232        FetchData(&elements,ELEMENTS);
    33         FetchData(&nodes,NODES);
     33        FetchData((DataSet**)&nodes,NODES);
    3434        FetchData(&vertices,VERTICES);
    3535        FetchData(&loads,LOADS);

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

    r4098 r4211  
    1212/*input datasets: */
    1313DataSet    *elements          = NULL;
    14 DataSet    *nodes             = NULL;
     14Nodes      *nodes             = NULL;
    1515DataSet    *vertices          = NULL;
    1616DataSet    *loads             = NULL;
    … …  
    2929/*Input datasets: */
    3030FetchData(&elements,ELEMENTSIN);
    31 FetchData(&nodes,NODESIN);
     31FetchData((DataSet**)&nodes,NODESIN);
    3232FetchData(&vertices,VERTICESIN);
    3333FetchData(&loads,LOADSIN);

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

    r4098 r4211  
    1212/*input datasets: */
    1313DataSet    *elements          = NULL;
    14 DataSet    *nodes             = NULL;
     14Nodes       *nodes             = NULL;
    1515DataSet    *vertices          = NULL;
    1616DataSet    *loads             = NULL;
    … …  
    2828/*Input datasets: */
    2929FetchData(&elements,ELEMENTSIN);
    30 FetchData(&nodes,NODESIN);
     30FetchData((DataSet**)&nodes,NODESIN);
    3131FetchData(&vertices,VERTICESIN);
    3232FetchData(&loads,LOADSIN);

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

    r4103 r4211  
    1212        /*input datasets: */
    1313        DataSet* elements=NULL;
    14         DataSet* nodes=NULL;
     14        Nodes* nodes=NULL;
    1515        DataSet* vertices=NULL;
    1616        DataSet* loads=NULL;
    … …  
    2727        /*Input datasets: */
    2828        FetchData(&elements,ELEMENTS);
    29         FetchData(&nodes,NODES);
     29        FetchData((DataSet**)&nodes,NODES);
    3030        FetchData(&vertices,VERTICES);
    3131        FetchData(&loads,LOADS);

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

    r4101 r4211  
    1212        /*input datasets: */
    1313        DataSet* elements=NULL;
    14         DataSet* nodes=NULL;
     14        Nodes* nodes=NULL;
    1515        DataSet* vertices=NULL;
    1616        DataSet* loads=NULL;
    … …  
    2727        /*Input datasets: */
    2828        FetchData(&elements,ELEMENTS);
    29         FetchData(&nodes,NODES);
     29        FetchData((DataSet**)&nodes,NODES);
    3030        FetchData(&vertices,VERTICES);
    3131        FetchData(&loads,LOADS);

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

    r4138 r4211  
    1212        /*input datasets: */
    1313        DataSet* elements=NULL;
    14         DataSet* nodes=NULL;
     14        Nodes* nodes=NULL;
    1515        DataSet* vertices=NULL;
    1616        DataSet* loads=NULL;
    … …  
    2828        /*Input datasets: */
    2929        FetchData(&elements,ELEMENTS);
    30         FetchData(&nodes,NODES);
     30        FetchData((DataSet**)&nodes,NODES);
    3131        FetchData(&vertices,VERTICES);
    3232        FetchData(&loads,LOADS);

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

    r4138 r4211  
    1212        /*input datasets: */
    1313        DataSet* elements=NULL;
    14         DataSet* nodes=NULL;
     14        Nodes* nodes=NULL;
    1515        DataSet* vertices=NULL;
    1616        DataSet* loads=NULL;
    … …  
    2828        /*Input datasets: */
    2929        FetchData(&elements,ELEMENTS);
    30         FetchData(&nodes,NODES);
     30        FetchData((DataSet**)&nodes,NODES);
    3131        FetchData(&vertices,VERTICES);
    3232        FetchData(&loads,LOADS);

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

    r4105 r4211  
    1212/*input datasets: */
    1313DataSet* elements=NULL;
    14 DataSet* nodes=NULL;
     14Nodes* nodes=NULL;
    1515DataSet* vertices=NULL;
    1616DataSet* loads=NULL;
    … …  
    2828/*Input datasets: */
    2929FetchData(&elements,ELEMENTSIN);
    30 FetchData(&nodes,NODESIN);
     30FetchData((DataSet**)&nodes,NODESIN);
    3131FetchData(&vertices,VERTICESIN);
    3232FetchData(&loads,LOADSIN);

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

    r4108 r4211  
    1212/*input datasets: */
    1313DataSet* elements=NULL;
    14 DataSet* nodes=NULL;
     14Nodes* nodes=NULL;
    1515DataSet* vertices=NULL;
    1616DataSet* loads=NULL;
    … …  
    2727/*Input datasets: */
    2828FetchData(&elements,ELEMENTSIN);
    29 FetchData(&nodes,NODESIN);
     29FetchData((DataSet**)&nodes,NODESIN);
    3030FetchData(&vertices,VERTICESIN);
    3131FetchData(&loads,LOADSIN);

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

    r4110 r4211  
    1212/*input datasets: */
    1313DataSet* elements=NULL;
    14 DataSet* nodes=NULL;
     14Nodes* nodes=NULL;
    1515DataSet* vertices=NULL;
    1616DataSet* loads=NULL;
    … …  
    3030/*Input datasets: */
    3131FetchData(&elements,ELEMENTSIN);
    32 FetchData(&nodes,NODESIN);
     32FetchData((DataSet**)&nodes,NODESIN);
    3333FetchData(&vertices,VERTICESIN);
    3434FetchData(&loads,LOADSIN);

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

    r4103 r4211  
    1212        /*input datasets: */
    1313        DataSet* elements=NULL;
    14         DataSet* nodes=NULL;
     14        Nodes* nodes=NULL;
    1515        DataSet* vertices=NULL;
    1616        DataSet* loads=NULL;
    … …  
    3232        /*Input datasets: */
    3333        FetchData(&elements,ELEMENTS);
    34         FetchData(&nodes,NODES);
     34        FetchData((DataSet**)&nodes,NODES);
    3535        FetchData(&vertices,VERTICES);
    3636        FetchData(&loads,LOADS);

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

    r4103 r4211  
    1212        /*input datasets: */
    1313        DataSet* elements=NULL;
    14         DataSet* nodes=NULL;
     14        Nodes* nodes=NULL;
    1515        DataSet* vertices=NULL;
    1616        DataSet* loads=NULL;
    … …  
    2929        /*Input datasets: */
    3030        FetchData(&elements,ELEMENTS);
    31         FetchData(&nodes,NODES);
     31        FetchData((DataSet**)&nodes,NODES);
    3232        FetchData(&vertices,VERTICES);
    3333        FetchData(&loads,LOADS);

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

    r4198 r4211  
    1818        /* output datasets: */
    1919        DataSet* elements=NULL;
    20         DataSet* nodes=NULL;
     20        Nodes* nodes=NULL;
    2121        DataSet* vertices=NULL;
    2222        DataSet* constraints=NULL;

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

    r4003 r4211  
    1212
    1313        /*input datasets: */
    14         DataSet* nodes=NULL;
     14        Nodes* nodes=NULL;
    1515        DataSet* constraints=NULL;
    1616        int      analysis_type;
    … …  
    2626
    2727        /*Input datasets: */
    28         FetchData(&nodes,NODESIN);
     28        FetchData((DataSet**)&nodes,NODESIN);
    2929        FetchData(&constraints,CONSTRAINTS);
    3030        FetchData(&analysis_type,ANALYSISTYPE);

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

    r4198 r4211  
    88
    99        /*input datasets: */
    10         DataSet* nodes=NULL;
     10        Nodes* nodes=NULL;
    1111        Parameters* parameters=NULL;
    1212
    … …  
    1818
    1919        /*Input datasets: */
    20         FetchData(&nodes,NODESIN);
     20        FetchData((DataSet**)&nodes,NODESIN);
    2121        FetchParams(&parameters,PARAMETERS);
    2222

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

    r4182 r4211  
    1212        /*input datasets: */
    1313        DataSet* elements=NULL;
    14         DataSet* nodes=NULL;
     14        Nodes*  nodes=NULL;
    1515        DataSet* vertices=NULL;
    1616        DataSet* loads=NULL;
    … …  
    3030        /*Input datasets: */
    3131        FetchData(&elements,ELEMENTS);
    32         FetchData(&nodes,NODES);
     32        FetchData((DataSet**)&nodes,NODES);
    3333        FetchData(&vertices,VERTICES);
    3434        FetchData(&loads,LOADS);

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

    r3841 r4211  
    1212        /*input datasets: */
    1313        DataSet* elements=NULL;
    14         DataSet* nodes=NULL;
     14        Nodes* nodes=NULL;
    1515        DataSet* loads=NULL;
    1616        DataSet* materials=NULL;
    … …  
    3131        /*Input datasets: */
    3232        FetchData(&elements,ELEMENTS);
    33         FetchData(&nodes,NODES);
     33        FetchData((DataSet**)&nodes,NODES);
    3434        FetchData(&loads,LOADS);
    3535        FetchData(&materials,MATERIALS);

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

    r4103 r4211  
    1212        /*input datasets: */
    1313        DataSet* elements=NULL;
    14         DataSet* nodes=NULL;
     14        Nodes* nodes=NULL;
    1515        DataSet* vertices=NULL;
    1616        DataSet* loads=NULL;
    … …  
    3030        /*Input datasets: */
    3131        FetchData(&elements,ELEMENTS);
    32         FetchData(&nodes,NODES);
     32        FetchData((DataSet**)&nodes,NODES);
    3333        FetchData(&vertices,VERTICES);
    3434        FetchData(&loads,LOADSIN);

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

    r4103 r4211  
    1717        Vec      pg=NULL;
    1818        DataSet* elements=NULL;
    19         DataSet* nodes=NULL;
     19        Nodes* nodes=NULL;
    2020        DataSet* vertices=NULL;
    2121        DataSet* loads=NULL;
    … …  
    3434        FetchData(&pg,PGIN);
    3535        FetchData(&elements,ELEMENTS);
    36         FetchData(&nodes,NODES);
     36        FetchData((DataSet**)&nodes,NODES);
    3737        FetchData(&vertices,VERTICES);
    3838        FetchData(&loads,LOADS);

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

    r4193 r4211  
    3636
    3737        /*Fetch parameters from femmodel structure: */
    38         FetchData(&parameters,PARAMETERS);
     38        FetchParams(&parameters,PARAMETERS);
    3939
    4040        /*!Generate internal degree of freedom numbers: */

  • issm/trunk/src/mex/Qmu/Qmu.h

    r4103 r4211  
    2020/* serial input macros: */
    2121#define FEMMODEL (mxArray*)prhs[0]
     22#define PARAMETERS (mxArray*)prhs[1]
    2223
    2324/* serial output macros: */
    … …  
    2728#define NLHS  0
    2829#undef NRHS
    29 #define NRHS  1
     30#define NRHS  2
    3031
    3132

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

    r4186 r4211  
    1212
    1313        /*input datasets: */
    14         DataSet* nodes=NULL;
     14        Nodes* nodes=NULL;
    1515        DataSet* constraints=NULL;
    1616        int      analysis_type;
    … …  
    2626
    2727        /*Input datasets: */
    28         FetchData(&nodes,NODESIN);
     28        FetchData((DataSet**)&nodes,NODESIN);
    2929        FetchData(&constraints,CONSTRAINTS);
    3030        FetchData(&analysis_type,ANALYSISTYPE);

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

    r4103 r4211  
    1212        /*input datasets: */
    1313        DataSet* elements=NULL;
    14         DataSet* nodes=NULL;
     14        Nodes* nodes=NULL;
    1515        DataSet* vertices=NULL;
    1616        DataSet* loads=NULL;
    … …  
    3131        /*Input datasets: */
    3232        FetchData(&elements,ELEMENTS);
    33         FetchData(&nodes,NODES);
     33        FetchData((DataSet**)&nodes,NODES);
    3434        FetchData(&vertices,VERTICES);
    3535        FetchData(&loads,LOADS);

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

    r4111 r4211  
    1212/*input datasets: */
    1313DataSet    *elements          = NULL;
    14 DataSet    *nodes             = NULL;
     14Nodes      *nodes             = NULL;
    1515DataSet    *vertices          = NULL;
    1616DataSet    *loads             = NULL;
    … …  
    2626/*Input datasets: */
    2727FetchData(&elements,ELEMENTSIN);
    28 FetchData(&nodes,NODESIN);
     28FetchData((DataSet**)&nodes,NODESIN);
    2929FetchData(&vertices,VERTICESIN);
    3030FetchData(&loads,LOADSIN);

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

    r4111 r4211  
    1212/*input datasets: */
    1313DataSet    *elements          = NULL;
    14 DataSet    *nodes             = NULL;
     14Nodes      *nodes             = NULL;
    1515DataSet    *vertices          = NULL;
    1616DataSet    *loads             = NULL;
    … …  
    2626/*Input datasets: */
    2727FetchData(&elements,ELEMENTSIN);
    28 FetchData(&nodes,NODESIN);
     28FetchData((DataSet**)&nodes,NODESIN);
    2929FetchData(&vertices,VERTICESIN);
    3030FetchData(&loads,LOADSIN);
Note: See TracChangeset for help on using the changeset viewer.