Changeset 17281


Ignore:
Timestamp:
02/14/14 08:04:42 (11 years ago)
Author:
Mathieu Morlighem
Message:

CHG: renamed new copy function copy2 to avoid shadowing Object->copy()

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

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

    r17275 r17281  
    24712471
    24722472        /*Spawn material*/
    2473         tria->material=(Material*)this->material->copy(tria);
     2473        tria->material=(Material*)this->material->copy2(tria);
    24742474
    24752475        /*recover nodes, material and matpar: */

  • issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

    r17275 r17281  
    22102210
    22112211        /*Spawn material*/
    2212         seg->material=(Material*)this->material->copy(seg);
     2212        seg->material=(Material*)this->material->copy2(seg);
    22132213
    22142214        /*recover nodes, material and matpar: */

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

    r17275 r17281  
    2323
    2424                /*Numerics*/
    25                 virtual Material*  copy(Element* element)=0;
     25                virtual Material*  copy2(Element* element)=0;
    2626                virtual void       Configure(Elements* elements)=0;
    2727                virtual void       GetViscosity(IssmDouble* pviscosity,IssmDouble epseff)=0;

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

    r17275 r17281  
    105105}
    106106/*}}}*/
    107 /*FUNCTION Matice::copy(Element* element) {{{*/
    108 Material* Matice::copy(Element* element_in) {
     107/*FUNCTION Matice::copy2(Element* element) {{{*/
     108Material* Matice::copy2(Element* element_in) {
    109109
    110110        /*Output*/

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

    r17275 r17281  
    5151                /*Material virtual functions resolution: {{{*/
    5252                void   Configure(Elements* elements);
    53                 Material*  copy(Element* element);
     53                Material*  copy2(Element* element);
    5454                void       SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
    5555                void       GetViscosity(IssmDouble* pviscosity, IssmDouble eps_eff);

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

    r17275 r17281  
    7979                /*}}}*/
    8080                /*Material virtual functions resolution: {{{*/
    81                 Material*  copy(Element* element){_error_("not implemented");};
     81                Material*  copy2(Element* element){_error_("not implemented");};
    8282                void       Configure(Elements* elements);
    8383                void       GetViscosity(IssmDouble* pviscosity,IssmDouble eps_eff){_error_("not supported");};
Note: See TracChangeset for help on using the changeset viewer.