Changeset 4009


Ignore:
Timestamp:
06/03/10 09:22:56 (15 years ago)
Author:
Mathieu Morlighem
Message:

minor compilation problems fixed. ConfigureObjects is to be fixed

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

Legend:

Unmodified
Added
Removed

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

    r4004 r4009  
    1212
    1313#endif  /* _CONFIGUREOBJECTSX_H */
    14 

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

    r4002 r4009  
    1414
    1515/*Creation of fem datasets: general drivers*/
    16 void    CreateDataSets(DataSet** pelements,DataSet** pnodes,DataSet** pvertices, DataSet** pmaterials, DataSet** pconstraints, DataSet** ploads,Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int analysis_type,int nummodels,int analysis_counter);
    17 void    CreateElementsVerticesAndMaterials(DataSet** pelements,DataSet** pvertices,DataSet** pmaterials, IoModel* iomodel,ConstDataHandle iomodel_handle,int nummodels);
    18 void    CreateParameters(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle);
    19 void    CreateParametersControl(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle);
    20 void    CreateParametersQmu(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle);
     16void  CreateDataSets(DataSet** pelements,DataSet** pnodes,DataSet** pvertices, DataSet** pmaterials, DataSet** pconstraints, DataSet** ploads,Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int analysis_type,int nummodels,int analysis_counter);
     17void  CreateElementsVerticesAndMaterials(DataSet** pelements,DataSet** pvertices,DataSet** pmaterials, IoModel* iomodel,ConstDataHandle iomodel_handle,int nummodels);
     18void  CreateParameters(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle);
     19void  CreateParametersControl(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle);
     20void  CreateParametersQmu(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle);
    2121
    2222/*Creation of fem datasets: specialised drivers: */
    2323
    2424/*diagnostic horizontal*/
    25 void    CreateNodesDiagnosticHoriz(pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     25void    CreateNodesDiagnosticHoriz(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    2626void    CreateConstraintsDiagnosticHoriz(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    27 void    CreateLoadsDiagnosticHoriz(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     27void  CreateLoadsDiagnosticHoriz(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    2828void    UpdateElementsDiagnosticHoriz(DataSet* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    2929
    3030/*diagnostic vertical*/
    31 void    CreateNodesDiagnosticVert(pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     31void    CreateNodesDiagnosticVert(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    3232void    CreateConstraintsDiagnosticVert(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    33 void    CreateLoadsDiagnosticVert(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     33void  CreateLoadsDiagnosticVert(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    3434void    UpdateElements(DataSet* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    3535
    3636/*diagnostic hutter*/
    37 void    CreateNodesDiagnosticHutter(pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     37void    CreateNodesDiagnosticHutter(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    3838void    CreateConstraintsDiagnosticHutter(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    39 void    CreateLoadsDiagnosticHutter(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     39void  CreateLoadsDiagnosticHutter(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    4040void    UpdateElements(DataSet* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    4141
    4242/*diagnostic stokes*/
    43 void    CreateNodesDiagnosticStokes(pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     43void    CreateNodesDiagnosticStokes(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    4444void    CreateConstraintsDiagnosticStokes(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    45 void    CreateLoadsDiagnosticStokes(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     45void  CreateLoadsDiagnosticStokes(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    4646void    UpdateElements(DataSet* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    4747
    4848/*slope compute*/
    49 void    CreateNodesSlopeCompute(pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     49void    CreateNodesSlopeCompute(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    5050void    CreateConstraintsSlopeCompute(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    51 void    CreateLoadsSlopeCompute(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     51void  CreateLoadsSlopeCompute(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    5252void    UpdateElements(DataSet* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    5353
    5454/*thermal:*/
    55 void    CreateNodesThermal(pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     55void    CreateNodesThermal(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    5656void    CreateConstraintsThermal(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    57 void    CreateLoadsThermal(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     57void  CreateLoadsThermal(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    5858void    UpdateElements(DataSet* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    5959
    6060/*melting:*/
    61 void    CreateNodesMelting(pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     61void    CreateNodesMelting(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    6262void    CreateConstraintsMelting(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    63 void    CreateLoadsMelting(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     63void  CreateLoadsMelting(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    6464void    UpdateElements(DataSet* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    6565
    6666/*prognostic:*/
    67 void    CreateNodesPrognostic(pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     67void    CreateNodesPrognostic(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    6868void    CreateConstraintsPrognostic(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    69 void    CreateLoadsPrognostic(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     69void  CreateLoadsPrognostic(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    7070void    UpdateElements(DataSet* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    7171
    7272/*prognostic2:*/
    73 void    CreateNodesPrognostic2(pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     73void    CreateNodesPrognostic2(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    7474void    CreateConstraintsPrognostic2(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    75 void    CreateLoadsPrognostic2(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     75void  CreateLoadsPrognostic2(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    7676void    UpdateElements(DataSet* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    7777
    7878/*balancedthickness:*/
    79 void    CreateNodesBalancedthickness(pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     79void    CreateNodesBalancedthickness(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    8080void    CreateConstraintsBalancedthickness(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    81 void    CreateLoadsBalancedthickness(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     81void  CreateLoadsBalancedthickness(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    8282void    UpdateElements(DataSet* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    8383
    84 void    CreateNodesBalancedthickness2(pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     84void    CreateNodesBalancedthickness2(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    8585void    CreateConstraintsBalancedthickness2(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    86 void    CreateLoadsBalancedthickness2(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     86void  CreateLoadsBalancedthickness2(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    8787void    UpdateElements(DataSet* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    8888
    8989/*balancedvelocities:*/
    90 void    CreateNodesBalancedvelocities(pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
     90void    CreateNodesBalancedvelocities(DataSet** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    9191void    CreateConstraintsBalancedvelocities(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    92 void    CreateLoadsBalancedvelocities(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     92void  CreateLoadsBalancedvelocities(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    9393void    UpdateElements(DataSet* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    9494
    9595/*partitioning: */
    96 void    ElementsAndVerticesPartitioning(bool** pmy_elements, bool** pmy_vertices, bool** pmy_bordervertices, IoModel* iomodel, ConstDataHandle iomodel_handle);
    97 void    NodesPartitioning(bool** pmy_nodes,bool* my_elements, bool* my_vertices, bool* my_bordervertices, IoModel* iomodel, ConstDataHandle iomodel_handle,bool continuous);
     96void  ElementsAndVerticesPartitioning(bool** pmy_elements, bool** pmy_vertices, bool** pmy_bordervertices, IoModel* iomodel, ConstDataHandle iomodel_handle);
     97void  NodesPartitioning(bool** pmy_nodes,bool* my_elements, bool* my_vertices, bool* my_bordervertices, IoModel* iomodel, ConstDataHandle iomodel_handle,bool continuous);
    9898
    9999/*Connectivity*/
    100 void    CreateSingleNodeToElementConnectivity(IoModel* iomodel);
    101 void    CreateNumberNodeToElementConnectivity(IoModel* iomodel);
     100void  CreateSingleNodeToElementConnectivity(IoModel* iomodel);
     101void  CreateNumberNodeToElementConnectivity(IoModel* iomodel);
    102102
    103103/*Diverse: */
    104 void    SortDataSets(DataSet** pelements,DataSet** pnodes,DataSet** pvertices, DataSet** ploads, DataSet** pmaterials, DataSet** pconstraints, Parameters** pparameters);
    105 void    UpdateCounter(IoModel* iomodel,DataSet** pnodes,DataSet** ploads, DataSet** pconstraints);
    106 
    107 
     104void  SortDataSets(DataSet** pelements,DataSet** pnodes,DataSet** pvertices, DataSet** ploads, DataSet** pmaterials, DataSet** pconstraints, Parameters** pparameters);
     105void  UpdateCounter(IoModel* iomodel,DataSet** pnodes,DataSet** ploads, DataSet** pconstraints);
    108106
    109107#endif

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

    r4002 r4009  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void NodesDofx( DataSet* nodes, Parameters* parameters) {
     12void NodesDofx(DataSet* nodes, Parameters* parameters){
    1313
    1414        int noerr=1;
    1515        int i;
    16 
    1716        int  found=0;
    1817       

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

    r4002 r4009  
    1010
    1111/* local prototypes: */
    12 void NodesDofx( DofVec** partition, DofVec** ptpartition,DataSet* elements,DataSet* nodesin, DataSet* verticesin, Parameters* parameters);
     12void NodesDofx(DataSet* nodes, Parameters* parameters);
    1313
    1414#endif  /* _NODESDOFX_H */
    15 

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

    r4004 r4009  
    1212#include "stdio.h"
    1313#include "../DataSet/DataSet.h"
    14 #include "../modules/FemModelProcessorx/FemModelProcessorx.h"
     14#include "../modules/ModelProcessorx/ModelProcessorx.h"
    1515#include "./objects.h"
    1616#include "../include/include.h"
    1717#include "../EnumDefinitions/EnumDefinitions.h"
    1818#include "../modules/modules.h"
    19 
    2019
    2120/*Object constructors and destructor*/
    … …  
    3534        Rmg=(Mat*)xmalloc(nummodels*sizeof(Mat));
    3635        Gmn=(Mat*)xmalloc(nummodels*sizeof(Mat));
    37         nodesets=(NodeSets**)xmalloc(nummodels*sizeof(NodeSet*));
     36        nodesets=(NodeSets**)xmalloc(nummodels*sizeof(NodeSets*));
    3837        yg=(Vec*)xmalloc(nummodels*sizeof(Vec));
    3938        ys=(Vec*)xmalloc(nummodels*sizeof(Vec));
    … …  
    5958                _printf_("   create degrees of freedom: \n");
    6059                VerticesDofx( &partition,&tpartition,vertices,parameters);
    61                 NodesDofx( nodes,parameters);
     60                NodesDofx(nodes,parameters);
    6261
    6362                _printf_("   create single point constraints: \n");
    … …  
    107106                Mat temp_Gmn=Gmn[i];
    108107                MatFree(&temp_Gmn);
    109                 NodeSet* temp_nodesets=nodesets[i];
     108                NodeSets* temp_nodesets=nodesets[i];
    110109                delete nodesets;
    111110                Vec temp_yg=yg[i];
Note: See TracChangeset for help on using the changeset viewer.