Changeset 19216


Ignore:
Timestamp:
03/20/15 16:48:58 (10 years ago)
Author:
Eric.Larour
Message:

CHG: further pushing Marshall capability into low level drivers.

Location:
issm/trunk-jpl/src/c/classes
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.cpp

    r18931 r19216  
    7979}
    8080/*}}}*/
     81void     SpcStatic::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
     82
     83        MARSHALLING_ENUM(SpcStaticEnum);
     84
     85        MARSHALLING(sid);
     86        MARSHALLING(nodeid);
     87        MARSHALLING(dof);
     88        MARSHALLING(value);
     89        MARSHALLING(analysis_type);
     90        MARSHALLING(penalty);
     91
     92}
     93/*}}}*/
    8194
    8295/*Constraint virtual functions definitions: */

  • issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.h

    r19198 r19216  
    3434                int   ObjectEnum();
    3535                Object* copy();
    36                 void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ _error_("not implemented yet!"); };
     36                void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction);
    3737                /*}}}*/
    3838                /*Constraint virtual functions definitions: {{{*/

  • issm/trunk-jpl/src/c/classes/Elements/TriaRef.h

    r19215 r19216  
    3333                int  TensorInterpolation(int fe_stokes);
    3434                int  VelocityInterpolation(int fe_stokes);
    35                 void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ _error_("not implemented yet!"); };
     35                void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*do nothing */};
    3636
    3737};

  • issm/trunk-jpl/src/c/classes/Materials/Matice.cpp

    r18946 r19216  
    122122}
    123123/*}}}*/
     124void       Matice::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
     125
     126        if(marshall_direction==MARSHALLING_BACKWARD)helement=new Hook();
     127       
     128        MARSHALLING_ENUM(MaticeEnum);
     129        MARSHALLING(mid);
     130        MARSHALLING(isdamaged);
     131        this->helement->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
     132
     133
     134}
     135/*}}}*/
    124136
    125137/*Matice management*/

  • issm/trunk-jpl/src/c/classes/Materials/Matice.h

    r19198 r19216  
    4040                int   ObjectEnum();
    4141                Object* copy();
    42                 void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ _error_("not implemented yet!"); };
     42                void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction);
    4343                /*}}}*/
    4444                /*Update virtual funictions definitions: {{{*/

  • issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp

    r19200 r19216  
    208208
    209209        return matpar;
     210}
     211/*}}}*/
     212void Matpar::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
     213
     214        MARSHALLING_ENUM(MatparEnum);
     215
     216        MARSHALLING(mid);
     217        MARSHALLING(rho_ice);
     218        MARSHALLING(rho_water);
     219        MARSHALLING(rho_freshwater);
     220        MARSHALLING(mu_water);
     221        MARSHALLING(heatcapacity);
     222        MARSHALLING(thermalconductivity);
     223        MARSHALLING(temperateiceconductivity);
     224        MARSHALLING(latentheat);
     225        MARSHALLING(beta);
     226        MARSHALLING(meltingpoint);
     227        MARSHALLING(referencetemperature);
     228        MARSHALLING(mixed_layer_capacity);
     229        MARSHALLING(thermal_exchange_velocity);
     230        MARSHALLING(g);
     231        MARSHALLING(omega);
     232        MARSHALLING(desfac);
     233        MARSHALLING(s0p);
     234        MARSHALLING(s0t);
     235        MARSHALLING(rlaps);
     236        MARSHALLING(rlapslgm);
     237        MARSHALLING(dpermil);
     238
     239        /*hydrology Dual Porous Continuum: */
     240        MARSHALLING(sediment_compressibility);
     241        MARSHALLING(sediment_porosity);
     242        MARSHALLING(sediment_thickness);
     243        MARSHALLING(water_compressibility);
     244
     245        MARSHALLING(epl_compressibility);
     246        MARSHALLING(epl_porosity);
     247        MARSHALLING(epl_init_thickness);
     248        MARSHALLING(epl_colapse_thickness);
     249        MARSHALLING(epl_max_thickness);
     250        MARSHALLING(epl_conductivity);
     251
     252        /*gia: */
     253        MARSHALLING(lithosphere_shear_modulus);
     254        MARSHALLING(lithosphere_density);
     255        MARSHALLING(mantle_shear_modulus);
     256        MARSHALLING(mantle_density);
     257
     258        /*Sea ice*/
     259        MARSHALLING(poisson);
     260        MARSHALLING(young_modulus);
     261        MARSHALLING(ridging_exponent);
     262        MARSHALLING(cohesion);
     263        MARSHALLING(internal_friction_coef);
     264        MARSHALLING(compression_coef);
     265        MARSHALLING(traction_coef);
     266        MARSHALLING(time_relaxation_stress);
     267        MARSHALLING(time_relaxation_damage);
     268
    210269}
    211270/*}}}*/

  • issm/trunk-jpl/src/c/classes/Materials/Matpar.h

    r19198 r19216  
    7979                int     ObjectEnum();
    8080                Object *copy();
    81                 void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ _error_("not implemented yet!"); };
     81                void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction);
    8282                /*}}}*/
    8383                /*Update virtual functions resolution: {{{*/

  • issm/trunk-jpl/src/c/classes/Params/BoolParam.cpp

    r18064 r19216  
    5454}
    5555/*}}}*/
     56void BoolParam::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
     57
     58        MARSHALLING_ENUM(BoolParamEnum);
     59
     60        MARSHALLING(enum_type);
     61        MARSHALLING(value);
     62
     63}
     64/*}}}*/
     65
     66               

  • issm/trunk-jpl/src/c/classes/Params/BoolParam.h

    r19198 r19216  
    3636                int   ObjectEnum();
    3737                Object* copy();
    38                 void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ _error_("not implemented yet!"); };
     38                void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction);
    3939                /*}}}*/
    4040                /*Param vritual function definitions: {{{*/
Note: See TracChangeset for help on using the changeset viewer.