Ignore:
Timestamp:
06/02/10 18:21:45 (15 years ago)
Author:
Eric.Larour
Message:

Spcs and Mpcs now handled on a per analysis basis... getting there

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/objects/Constraints/Rgb.cpp

    r3775 r4003  
    2525/*}}}1*/
    2626/*FUNCTION Rgb::creation {{{1*/
    27 Rgb::Rgb(int rgb_id,int rgb_nodeid1,int rgb_nodeid2, int rgb_dof){
     27Rgb::Rgb(int rgb_id,int rgb_nodeid1,int rgb_nodeid2, int rgb_dof,int rgb_analysis_type){
    2828
    2929        id=rgb_id;
     
    3131        nodeid2=rgb_nodeid2;
    3232        dof=rgb_dof;
     33        analysis_type=rgb_analysis_type;
    3334
    3435        return;
     
    6263        memcpy(marshalled_dataset,&nodeid2,sizeof(nodeid2));marshalled_dataset+=sizeof(nodeid2);
    6364        memcpy(marshalled_dataset,&dof,sizeof(dof));marshalled_dataset+=sizeof(dof);
     65        memcpy(marshalled_dataset,&analysis_type,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type);
    6466
    6567        *pmarshalled_dataset=marshalled_dataset;
     
    7476                sizeof(nodeid2)+
    7577                sizeof(dof)+
     78                sizeof(analysis_type)+
    7679                sizeof(int); //sizeof(int) for enum type
    7780}
     
    9295        memcpy(&nodeid2,marshalled_dataset,sizeof(nodeid2));marshalled_dataset+=sizeof(nodeid2);
    9396        memcpy(&dof,marshalled_dataset,sizeof(dof));marshalled_dataset+=sizeof(dof);
     97        memcpy(&analysis_type,marshalled_dataset,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type);
    9498
    9599        /*return: */
     
    113117        printf("   nodeid2: %i\n",nodeid2);
    114118        printf("   dof: %i\n",dof);
     119        printf("   analysis_type: %s\n",EnumAsString(analysis_type));
    115120        return;
    116121}               
     
    124129        printf("   nodeid2: %i\n",nodeid2);
    125130        printf("   dof: %i\n",dof);
     131        printf("   analysis_type: %s\n",EnumAsString(analysis_type));
    126132        return;
    127133}
     
    160166}
    161167/*}}}1*/
     168/*FUNCTION Rgb::InAnalysis(int analysis_type){{{1*/
     169bool Rgb::InAnalysis(int in_analysis_type){
     170        if (in_analysis_type=this->analysis_type)return true;
     171        else return false;
     172}
     173/*}}}*/
     174
Note: See TracChangeset for help on using the changeset viewer.