Changeset 3931


Ignore:
Timestamp:
05/25/10 07:43:35 (15 years ago)
Author:
Mathieu Morlighem
Message:

Added modules/ModelProcessorx/CreateNumberNodeToElementConnectivity.cpp
Added other types in UpdateFromConstantx

Location:
issm/trunk/src/c
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

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

    r3923 r3931  
    296296                                        ./modules/ModelProcessorx/CreateParameters.cpp\
    297297                                        ./modules/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp\
     298                                        ./modules/ModelProcessorx/CreateNumberNodeToElementConnectivity.cpp\
    298299                                        ./modules/ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp\
    299300                                        ./modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp \
    … …  
    737738                                        ./modules/ModelProcessorx/CreateParameters.cpp\
    738739                                        ./modules/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp\
     740                                        ./modules/ModelProcessorx/CreateNumberNodeToElementConnectivity.cpp\
    739741                                        ./modules/ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp\
    740742                                        ./modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp \

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

    r3913 r3931  
    9191/*Conectivity*/
    9292void CreateSingleNodeToElementConnectivity(IoModel* iomodel);
     93void CreateNumberNodeToElementConnectivity(IoModel* iomodel);
    9394
    9495#endif

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

    r3913 r3931  
    99#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    11 void UpdateInputsFromConstantx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,double constant, int name){
     11void UpdateInputsFromConstantx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,bool  constant, int name){
    1212
    1313        /*First, get elements and loads configured: */
    … …  
    2121        loads->UpdateInputsFromConstant(constant,name);
    2222}
     23void UpdateInputsFromConstantx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,int    constant, int name){
     24
     25        /*First, get elements and loads configured: */
     26        elements->Configure(elements,loads, nodes,vertices, materials,parameters);
     27        loads->Configure(elements, loads, nodes,vertices, materials,parameters);
     28        nodes->Configure(elements, loads, nodes,vertices, materials,parameters);
     29        parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
     30
     31        /*Elements drive the update: */
     32        elements->UpdateInputsFromConstant(constant,name);
     33        loads->UpdateInputsFromConstant(constant,name);
     34}
     35void UpdateInputsFromConstantx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,double constant, int name){
     36
     37        /*First, get elements and loads configured: */
     38        elements->Configure(elements,loads, nodes,vertices, materials,parameters);
     39        loads->Configure(elements, loads, nodes,vertices, materials,parameters);
     40        nodes->Configure(elements, loads, nodes,vertices, materials,parameters);
     41        parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
     42
     43        /*Elements drive the update: */
     44        elements->UpdateInputsFromConstant(constant,name);
     45        loads->UpdateInputsFromConstant(constant,name);
     46}

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

    r3913 r3931  
    1010
    1111/* local prototypes: */
     12void            UpdateInputsFromConstantx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,  Parameters* parameters, bool   constant, int name);
     13void            UpdateInputsFromConstantx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,  Parameters* parameters, int    constant, int name);
    1214void            UpdateInputsFromConstantx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,  Parameters* parameters, double constant, int name);
    1315

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

    r3813 r3931  
    113113        xfree((void**)&this->penaltypartitioning);
    114114        xfree((void**)&this->singlenodetoelementconnectivity);
     115        xfree((void**)&this->numbernodetoelementconnectivity);
    115116        #endif
    116117}
    … …  
    384385        this->penaltypartitioning=NULL;
    385386        this->singlenodetoelementconnectivity=NULL;
     387        this->numbernodetoelementconnectivity=NULL;
    386388}
    387389/*}}}*/

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

    r3815 r3931  
    187187                int*    penaltypartitioning;
    188188                int*    singlenodetoelementconnectivity;
     189                int*    numbernodetoelementconnectivity;
    189190                /*}}}*/
    190191                /*Methods: {{{1*/
Note: See TracChangeset for help on using the changeset viewer.