Changeset 4034


Ignore:
Timestamp:
06/10/10 13:05:47 (15 years ago)
Author:
Eric.Larour
Message:

Some minor debugging

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

Legend:

Unmodified
Added
Removed

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

    r4021 r4034  
    550550/*Objects methods*/
    551551/*FUNCTION DataSet::Configure{{{1*/
    552 void DataSet::Configure(DataSet* elements,DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials,Parameters* parameters,int analysis_counter,int analysis_type){
     552void DataSet::Configure(DataSet* elements,DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials,Parameters* parameters){
    553553
    554554        vector<Object*>::iterator object;
    … …  
    562562
    563563                        element=(Element*)(*object);
    564                         element->Configure(elements,loads,nodes,materials,parameters,analysis_counter);
     564                        element->Configure(elements,loads,nodes,materials,parameters);
    565565                }
    566566                if(EnumIsLoad((*object)->Enum())){

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

    r4021 r4034  
    6363                void  FlagNodeSets(Vec pv_g, Vec pv_m, Vec pv_n, Vec pv_f, Vec pv_s,int analysis_type);
    6464                void  clear();
    65                 void Configure(DataSet* elements,DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials,Parameters* parameters,int analysis_counter,int analysis_type);
     65                void Configure(DataSet* elements,DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials,Parameters* parameters);
    6666                Object* GetObjectByOffset(int offset);
    6767                Object* GetObjectById(int* poffset,int eid);

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

    r4029 r4034  
    2929        AnalysisTypeEnum,
    3030        SubAnalysisTypeEnum,
     31        AnalysisCounterEnum,
    3132        //diagnostic
    3233        DiagnosticAnalysisEnum,

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

    r4004 r4034  
    4848                /*Now, go through all nodes and have every node plug into
    4949                 * pv_m, pv_n, pv_f and pv_s, their own set flags, for each dof: */
    50                 nodes->FlagNodeSets(flag_pv_g,flag_pv_m,flag_pv_n,flag_pv_f,flag_pv_s);
     50                nodes->FlagNodeSets(flag_pv_g,flag_pv_m,flag_pv_n,flag_pv_f,flag_pv_s,analysis_type);
    5151
    5252                /*Now, every cpu has 4 flag vectors, of size gsize. Create partition vectors (like a pos=find(flag_pv_g) in matlab*/

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

    r4021 r4034  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 int     ConfigureObjectsx( DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials,Parameters* parameters,int analysis_counter,int analysis_type){
     12int     ConfigureObjectsx( DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials,Parameters* parameters){
    1313
    1414        /*Intermediary*/
    … …  
    1818        Load* load=NULL;
    1919        Node* node=NULL;
     20        int analysis_type;
     21
     22        /*Get analysis type: */
     23        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
    2024       
    2125        //_printf_("      Configuring elements...\n");
    2226        for (i=0;i<elements->Size();i++){
    2327                element=(Element*)elements->GetObjectByOffset(i);
    24                 element->Configure(elements,loads,nodes,materials,parameters,analysis_counter);
     28                element->Configure(elements,loads,nodes,materials,parameters);
    2529        }
    2630        //_printf_("      Configuring loads...\n");

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

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

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

    r4025 r4034  
    3737       
    3838        /*Get size of matrix: */
    39         gsize=nodes->NumberOfDofs();
     39        gsize=nodes->NumberOfDofs(analysis_type);
    4040
    4141        /*Allocate du_g: */

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

    r3971 r4034  
    2626
    2727        /*Get size of vector: */
    28         gsize=nodes->NumberOfDofs();
     28        gsize=nodes->NumberOfDofs(analysis_type);
    2929       
    3030        /*Initialize solution: */

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

    r4028 r4034  
    116116       
    117117        /*Generate objects that are not dependent on any analysis_type: */
    118         CreateParameters(pparameters,iomodel,iomodel_handle,solution_type,analysis_type);
     118        CreateParameters(pparameters,iomodel,iomodel_handle,solution_type,analysis_type,analysis_counter);
    119119
    120120        /*Sort datasets: */

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

    r4028 r4034  
    1212#include "./ModelProcessorx.h"
    1313
    14 void CreateParameters(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type){
     14void CreateParameters(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type,int analysis_counter){
    1515       
    1616        int i;
    … …  
    3131        parameters = new Parameters(ParametersEnum);
    3232
     33        parameters->AddObject(new    IntParam(SolutionTypeEnum,solution_type));
     34        parameters->AddObject(new    IntParam(AnalysisTypeEnum,analysis_type));
     35        parameters->AddObject(new    IntParam(AnalysisCounterEnum,analysis_counter));
    3336        parameters->AddObject(new    IntParam(SolutionTypeEnum,solution_type));
    3437        if (iomodel->dim==2) parameters->AddObject(new IntParam(DimEnum,2));

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

    r4028 r4034  
    1616void  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);
    1717void  CreateElementsVerticesAndMaterials(DataSet** pelements,DataSet** pvertices,DataSet** pmaterials, IoModel* iomodel,ConstDataHandle iomodel_handle,int nummodels);
    18 void  CreateParameters(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type);
     18void  CreateParameters(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type,int analysis_counter);
    1919void  CreateParametersControl(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int analysis_type);
    2020void  CreateParametersQmu(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int analysis_type);

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

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

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

    r3965 r4034  
    3636
    3737        /*Get size of matrix: */
    38         gsize=nodes->NumberOfDofs();
     38        gsize=nodes->NumberOfDofs(analysis_type);
    3939
    4040        /*Compute stiffness matrix*/

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

    r4025 r4034  
    4343                /*}}}*/
    4444                /*object management: {{{1*/
    45                 void  Configure(DataSet* elements,DataSet* loads,DataSet* nodes,DataSet* materials,Parameters* parameters,int analysis_counter);
     45                void  Configure(DataSet* elements,DataSet* loads,DataSet* nodes,DataSet* materials,Parameters* parameters);
    4646                void  Echo();
    4747                void  DeepEcho();

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

    r4025 r4034  
    2424               
    2525                virtual        ~Element(){};
    26                 virtual void   Configure(DataSet* elements,DataSet* loads,DataSet* nodes,DataSet* materials,Parameters* parameters,int analysis_counter)=0;
     26                virtual void   Configure(DataSet* elements,DataSet* loads,DataSet* nodes,DataSet* materials,Parameters* parameters)=0;
    2727               
    2828                virtual void   CreateKMatrix(Mat Kgg,int analysis_type,int sub_analysis_type)=0;

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

    r4021 r4034  
    264264/*Object management: */
    265265/*FUNCTION Penta::Configure {{{1*/
    266 void  Penta::Configure(DataSet* elementsin, DataSet* loadsin, DataSet* nodesin, DataSet* materialsin, Parameters* parametersin,int analysis_counter){
     266void  Penta::Configure(DataSet* elementsin, DataSet* loadsin, DataSet* nodesin, DataSet* materialsin, Parameters* parametersin){
     267
     268        int analysis_counter;
     269       
     270        /*go into parameters and get the analysis_counter: */
     271        parametersin->FindParam(&analysis_counter,AnalysisCounterEnum);
    267272
    268273        /*Take care of hooking up all objects for this element, ie links the objects in the hooks to their respective

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

    r4025 r4034  
    4747                /*}}}*/
    4848                /*FUNCTION object management {{{1*/
    49                 void  Configure(DataSet* elements,DataSet* loads,DataSet* nodes,DataSet* materials,Parameters* parameters,int analysis_counter);
     49                void  Configure(DataSet* elements,DataSet* loads,DataSet* nodes,DataSet* materials,Parameters* parameters);
    5050                Object* copy();
    5151                void  DeepEcho();

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

    r4025 r4034  
    3939/*Object management*/
    4040/*FUNCTION Sing::Configure {{{1*/
    41 void  Sing::Configure(DataSet* elementsin,DataSet* loadsin, DataSet* nodesin, DataSet* materialsin, Parameters* parametersin,int analysis_counter){
     41void  Sing::Configure(DataSet* elementsin,DataSet* loadsin, DataSet* nodesin, DataSet* materialsin, Parameters* parametersin){
    4242
    4343        ISSMERROR(" not supported yet!");

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

    r4025 r4034  
    4343                /*}}}*/
    4444                /*object management: {{{1*/
    45                 void  Configure(DataSet* elements,DataSet* loads,DataSet* nodes,DataSet* materials,Parameters* parameters,int analysis_counter);
     45                void  Configure(DataSet* elements,DataSet* loads,DataSet* nodes,DataSet* materials,Parameters* parameters);
    4646                Object* copy();
    4747                void  DeepEcho();

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

    r4028 r4034  
    246246/*Object management: */
    247247/*FUNCTION Tria::Configure {{{1*/
    248 void  Tria::Configure(DataSet* elementsin, DataSet* loadsin, DataSet* nodesin, DataSet* materialsin, Parameters* parametersin,int analysis_counter){
     248void  Tria::Configure(DataSet* elementsin, DataSet* loadsin, DataSet* nodesin, DataSet* materialsin, Parameters* parametersin){
     249
     250        int analysis_counter;
     251       
     252        /*go into parameters and get the analysis_counter: */
     253        parametersin->FindParam(&analysis_counter,AnalysisCounterEnum);
    249254
    250255        /*Take care of hooking up all objects for this element, ie links the objects in the hooks to their respective
    … …  
    30033008                gauss_l1l2l3[2]=*(third_gauss_area_coord+ig);
    30043009
    3005                 if ( (sub_analysis_type==SurfaceXAnalysisEnum) || (sub_analysis_type==SurfaceYAnalysisEnum)){
     3010                if ( (sub_analysis_type==SurfaceSlopeXAnalysisEnum) || (sub_analysis_type==SurfaceSlopeYAnalysisEnum)){
    30063011                        inputs->GetParameterDerivativeValue(&slope[0],&xyz_list[0][0],&gauss_l1l2l3[0],SurfaceEnum);
    30073012                }
    3008                 if ( (sub_analysis_type==BedXAnalysisEnum) || (sub_analysis_type==BedYAnalysisEnum)){
     3013                if ( (sub_analysis_type==BedSlopeXAnalysisEnum) || (sub_analysis_type==BedSlopeYAnalysisEnum)){
    30093014                        inputs->GetParameterDerivativeValue(&slope[0],&xyz_list[0][0],&gauss_l1l2l3[0],BedEnum);
    30103015                }
    … …  
    30173022
    30183023                /*Build pe_g_gaussian vector: */
    3019                 if ( (sub_analysis_type==SurfaceXAnalysisEnum) || (sub_analysis_type==BedXAnalysisEnum)){
     3024                if ( (sub_analysis_type==SurfaceSlopeXAnalysisEnum) || (sub_analysis_type==BedSlopeXAnalysisEnum)){
    30203025                        for(i=0;i<numdof;i++) pe_g_gaussian[i]=Jdet*gauss_weight*slope[0]*l1l2l3[i];
    30213026                }
    3022                 if ( (sub_analysis_type==SurfaceYAnalysisEnum) || (sub_analysis_type==BedYAnalysisEnum)){
     3027                if ( (sub_analysis_type==SurfaceSlopeYAnalysisEnum) || (sub_analysis_type==BedSlopeYAnalysisEnum)){
    30233028                        for(i=0;i<numdof;i++) pe_g_gaussian[i]=Jdet*gauss_weight*slope[1]*l1l2l3[i];
    30243029                }

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

    r4021 r4034  
    4242                /*}}}*/
    4343                /*FUNCTION object management {{{1*/
    44                 void  Configure(DataSet* elements,DataSet* loads,DataSet* nodes,DataSet* materials,Parameters* parameters,int analysis_counter);
     44                void  Configure(DataSet* elements,DataSet* loads,DataSet* nodes,DataSet* materials,Parameters* parameters);
    4545                Object* copy();
    4646                void  DeepEcho();

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

    r4028 r4034  
    7878
    7979                _printf_("   configuring element and loads:\n");
    80                 ConfigureObjectsx(elements, loads, nodes, vertices, materials,parameters,i,analysis_type);
     80                ConfigureObjectsx(elements, loads, nodes, vertices, materials,parameters);
    8181        }
    8282

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

    r3959 r4034  
    8585        //compute slopes
    8686        if(verbose)_printf_("%s\n","computing bed slope (x and y derivatives)...");
    87         diagnostic_core_linear(&slopex,fem_sl,SlopecomputeAnalysisEnum,BedXAnalysisEnum);
    88         diagnostic_core_linear(&slopey,fem_sl,SlopecomputeAnalysisEnum,BedYAnalysisEnum);
     87        diagnostic_core_linear(&slopex,fem_sl,SlopecomputeAnalysisEnum,BedSlopeXAnalysisEnum);
     88        diagnostic_core_linear(&slopey,fem_sl,SlopecomputeAnalysisEnum,BedSlopeYAnalysisEnum);
    8989        FieldExtrudex( slopex, fem_sl->elements,fem_sl->nodes,fem_sl->vertices,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopex",0);
    9090        FieldExtrudex( slopey, fem_sl->elements,fem_sl->nodes,fem_sl->vertices,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopey",0);
Note: See TracChangeset for help on using the changeset viewer.