Changeset 17514


Ignore:
Timestamp:
03/21/14 09:18:17 (11 years ago)
Author:
Mathieu Morlighem
Message:

CHG: removed duplicate SpawnTria that required location only

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

Legend:

Unmodified
Added
Removed

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

    r17513 r17514  
    8989/*}}}*/
    9090/*FUNCTION ElementHook::SpawnTriaHook{{{*/
    91 void ElementHook::SpawnTriaHook(ElementHook* triahook,int location){
    92 
    93         /*Create arrow of indices depending on location (0=base 1=surface)*/
    94         int indices[3];
    95         switch(location){
    96                 case 0:
    97                         indices[0] = 0;
    98                         indices[1] = 1;
    99                         indices[2] = 2;
    100                         break;
    101                 case 1:
    102                         indices[0] = 3;
    103                         indices[1] = 4;
    104                         indices[2] = 5;
    105                         break;
    106                 default:
    107                         _error_("case "<<location<<" not supported");
    108         }
    109 
    110         triahook->numanalyses=this->numanalyses;
    111 
    112         /*Spawn nodes hook*/
    113         triahook->hnodes=new Hook*[this->numanalyses];
    114         for(int i=0;i<this->numanalyses;i++){
    115                 /*Do not do anything if Hook is empty*/
    116                 if (!this->hnodes[i] || this->hnodes[i]->GetNum()==0){
    117                         triahook->hnodes[i]=NULL;
    118                 }
    119                 else{
    120                         triahook->hnodes[i]=this->hnodes[i]->Spawn(indices,3);
    121                 }
    122         }
    123 
    124         /*do not spawn hmaterial. material will be taken care of by Penta*/
    125         triahook->hmaterial=NULL;
    126         triahook->hvertices=(Hook*)this->hvertices->Spawn(indices,3);
    127         triahook->hmatpar=(Hook*)this->hmatpar->copy();
    128 }
    129 /*}}}*/
    130 /*FUNCTION ElementHook::SpawnTriaHook{{{*/
    13191void ElementHook::SpawnTriaHook(ElementHook* triahook,int index1,int index2,int index3){
    13292

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

    r17513 r17514  
    2525
    2626                void SetHookNodes(int* node_ids,int numnodes,int analysis_counter);
    27                 void SpawnTriaHook(ElementHook* triahook,int location); //3d only TO BE REMOVED (replaced by the one below)
    2827                void SpawnTriaHook(ElementHook* triahook,int index1,int index2,int index3); //3d only
    2928                void SpawnSegHook(ElementHook* triahook,int ndex1,int index2); //2d only

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

    r17472 r17514  
    21442144/*}}}*/
    21452145/*FUNCTION Penta::SpawnTria {{{*/
    2146 Tria*  Penta::SpawnTria(int location){
     2146Tria*  Penta::SpawnTria(int index1,int index2,int index3){
    21472147
    21482148        int analysis_counter;
    … …  
    21542154        Tria* tria=new Tria();
    21552155        tria->id=this->id;
    2156         tria->inputs=(Inputs*)this->inputs->SpawnTriaInputs(location);
     2156        tria->inputs=(Inputs*)this->inputs->SpawnTriaInputs(index1,index2,index3);
    21572157        tria->parameters=this->parameters;
    21582158        tria->element_type=P1Enum; //Only P1 CG for now (TO BE CHANGED)
    2159         this->SpawnTriaHook(dynamic_cast<ElementHook*>(tria),location);
     2159        this->SpawnTriaHook(dynamic_cast<ElementHook*>(tria),index1,index2,index3);
    21602160
    21612161        /*Spawn material*/
    … …  
    21802180        if(this->inputs->GetInput(VxEnum)) this->InputDepthAverageAtBase(VxEnum,VxAverageEnum);
    21812181        if(this->inputs->GetInput(VyEnum)) this->InputDepthAverageAtBase(VyEnum,VyAverageEnum);
    2182         Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1.
     2182        Tria* tria=(Tria*)SpawnTria(0,1,2);
    21832183        this->inputs->DeleteInput(MaterialsRheologyBbarEnum);
    21842184        this->inputs->DeleteInput(DamageDbarEnum);
    … …  
    21942194        _assert_(this->IsOnSurface());
    21952195
    2196         Tria* tria=(Tria*)SpawnTria(1); //lower face is 0, upper face is 1.
     2196        Tria* tria=(Tria*)SpawnTria(3,4,5);
    21972197
    21982198        return tria;
    … …  
    22682268                /*This element should be collapsed into a tria element at its base. Create this tria element,
    22692269                 * and compute SurfaceArea*/
    2270                 tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1.
     2270                tria=(Tria*)SpawnTria(0,1,2);
    22712271                S=tria->SurfaceArea();
    22722272                delete tria->material; delete tria;
    … …  
    22752275        else{
    22762276
    2277                 tria=(Tria*)SpawnTria(1); //lower face is 0, upper face is 1.
     2277                tria=(Tria*)SpawnTria(3,4,5);
    22782278                S=tria->SurfaceArea();
    22792279                delete tria->material; delete tria;
    … …  
    28922892
    28932893        /*Spawn Tria element from the base of the Penta: */
    2894         Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1.
     2894        Tria* tria=(Tria*)SpawnTria(0,1,2);
    28952895        mass_flux=tria->MassFlux(segment);
    28962896        delete tria->material; delete tria;
    … …  
    29162916
    29172917        /*Spawn Tria element from the base of the Penta: */
    2918         Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1.
     2918        Tria* tria=(Tria*)SpawnTria(0,1,2);
    29192919        mass_flux=tria->MassFlux(x1,y1,x2,y2,segment_id);
    29202920        delete tria->material; delete tria;
    … …  
    32683268                case DragCoefficientAbsGradientEnum:
    32693269                        if(IsOnBed()){
    3270                                 tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1.
     3270                                tria=(Tria*)SpawnTria(0,1,2);
    32713271                                tria->GradjDragGradient(gradient,control_index);
    32723272                                delete tria->material; delete tria;
    … …  
    32753275                case RheologyBbarAbsGradientEnum:
    32763276                        if(IsOnBed()){
    3277                                 tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1.
     3277                                tria=(Tria*)SpawnTria(0,1,2);
    32783278                                tria->GradjBGradient(gradient,control_index);
    32793279                                delete tria->material; delete tria;
    … …  
    32933293
    32943294        /*Spawn tria*/
    3295         Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1.
     3295        Tria* tria=(Tria*)SpawnTria(0,1,2);
    32963296        tria->GradjDragSSA(gradient,control_index);
    32973297        delete tria->material; delete tria;
    … …  
    34723472
    34733473        /*Collapse element to the base*/
    3474         Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1.
     3474        Tria* tria=(Tria*)SpawnTria(0,1,2);
    34753475        tria->GradjBSSA(gradient,control_index);
    34763476        delete tria->material; delete tria;
    … …  
    34923492
    34933493        /*Collapse element to the base*/
    3494         Tria* tria=(Tria*)SpawnTria(0);
     3494        Tria* tria=(Tria*)SpawnTria(0,1,2);
    34953495        tria->GradjBSSA(gradient,control_index);    //We use SSA as an estimate for now
    34963496        delete tria->material; delete tria;
    … …  
    35113511
    35123512        /*Collapse element to the base*/
    3513         Tria* tria=(Tria*)SpawnTria(0);
     3513        Tria* tria=(Tria*)SpawnTria(0,1,2);
    35143514        tria->GradjBSSA(gradient,control_index);    //We use SSA as an estimate for now
    35153515        delete tria->material; delete tria;
    … …  
    35863586                /*This element should be collapsed into a tria element at its base. Create this tria element,
    35873587                 * and compute SurfaceAverageVelMisfit*/
    3588                 tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1.
     3588                tria=(Tria*)SpawnTria(0,1,2);
    35893589                J=tria->SurfaceAverageVelMisfit();
    35903590                delete tria->material; delete tria;
    … …  
    35933593        else{
    35943594
    3595                 tria=(Tria*)SpawnTria(1); //lower face is 0, upper face is 1.
     3595                tria=(Tria*)SpawnTria(3,4,5);
    35963596                J=tria->SurfaceAverageVelMisfit();
    35973597                delete tria->material; delete tria;
    … …  
    36233623                /*This element should be collapsed into a tria element at its base. Create this tria element,
    36243624                 * and compute SurfaceAbsVelMisfit*/
    3625                 tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1.
     3625                tria=(Tria*)SpawnTria(0,1,2);
    36263626                J=tria->SurfaceAbsVelMisfit();
    36273627                delete tria->material; delete tria;
    … …  
    36303630        else{
    36313631
    3632                 tria=(Tria*)SpawnTria(1); //lower face is 0, upper face is 1.
     3632                tria=(Tria*)SpawnTria(3,4,5);
    36333633                J=tria->SurfaceAbsVelMisfit();
    36343634                delete tria->material; delete tria;
    … …  
    36603660                /*This element should be collapsed into a tria element at its base. Create this tria element,
    36613661                 * and compute SurfaceLogVelMisfit*/
    3662                 tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1.
     3662                tria=(Tria*)SpawnTria(0,1,2); //lower face is 0, upper face is 1.
    36633663                J=tria->SurfaceLogVelMisfit();
    36643664                delete tria->material; delete tria;
    … …  
    36673667        else{
    36683668
    3669                 tria=(Tria*)SpawnTria(1); //lower face is 0, upper face is 1.
     3669                tria=(Tria*)SpawnTria(3,4,5); //lower face is 0, upper face is 1.
    36703670                J=tria->SurfaceLogVelMisfit();
    36713671                delete tria->material; delete tria;
    … …  
    36993699                /*This element should be collapsed into a tria element at its base. Create this tria element,
    37003700                 * and compute SurfaceLogVxVyMisfit*/
    3701                 tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1.
     3701                tria=(Tria*)SpawnTria(0,1,2);
    37023702                J=tria->SurfaceLogVxVyMisfit();
    37033703                delete tria->material; delete tria;
    … …  
    37063706        else{
    37073707
    3708                 tria=(Tria*)SpawnTria(1); //lower face is 0, upper face is 1.
     3708                tria=(Tria*)SpawnTria(3,4,5);
    37093709                J=tria->SurfaceLogVxVyMisfit();
    37103710                delete tria->material; delete tria;
    … …  
    37363736                /*This element should be collapsed into a tria element at its base. Create this tria element,
    37373737                 * and compute SurfaceRelVelMisfit*/
    3738                 tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1.
     3738                tria=(Tria*)SpawnTria(0,1,2);
    37393739                J=tria->SurfaceRelVelMisfit();
    37403740                delete tria->material; delete tria;
    … …  
    37433743        else{
    37443744
    3745                 tria=(Tria*)SpawnTria(1); //lower face is 0, upper face is 1.
     3745                tria=(Tria*)SpawnTria(3,4,5);
    37463746                J=tria->SurfaceRelVelMisfit();
    37473747                delete tria->material; delete tria;
    … …  
    37703770        _error_("Not implemented yet");
    37713771
    3772         tria=(Tria*)SpawnTria(0);
     3772        tria=(Tria*)SpawnTria(0,1,2);
    37733773        J=tria->ThicknessAbsMisfit();
    37743774        delete tria->material; delete tria;
    … …  
    37853785        if(!IsIceInElement()|| IsFloating() || !IsOnBed()) return 0;
    37863786
    3787         tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1
     3787        tria=(Tria*)SpawnTria(0,1,2); //lower face is 0, upper face is 1
    37883788        J=tria->DragCoefficientAbsGradient();
    37893789        delete tria->material; delete tria;
    … …  
    38003800        if(!IsIceInElement() || !IsOnBed()) return 0;
    38013801
    3802         tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1
     3802        tria=(Tria*)SpawnTria(0,1,2);
    38033803        J=tria->RheologyBbarAbsGradient();
    38043804        delete tria->material; delete tria;

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

    r17472 r17514  
    227227                IssmDouble     MinEdgeLength(IssmDouble* xyz_list);
    228228                void             SetClone(int* minranks);
    229                 Tria*            SpawnTria(int location);
     229                Tria*            SpawnTria(int index1,int index2,int index3);
    230230                IssmDouble     StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa);
    231231

  • issm/trunk-jpl/src/c/classes/Inputs/BoolInput.cpp

    r17513 r17514  
    6666
    6767        return this->enum_type;
    68 
    69 }
    70 /*}}}*/
    71 /*FUNCTION BoolInput::SpawnTriaInput{{{*/
    72 Input* BoolInput::SpawnTriaInput(int location){
    73 
    74                 /*output*/
    75                 BoolInput* outinput=new BoolInput();
    76 
    77                 /*only copy current value*/
    78                 outinput->enum_type=this->enum_type;
    79                 outinput->value=this->value;
    80 
    81                 /*Assign output*/
    82                 return outinput;
    8368
    8469}

  • issm/trunk-jpl/src/c/classes/Inputs/BoolInput.h

    r17513 r17514  
    3030                /*BoolInput management: {{{*/
    3131                int   InstanceEnum();
    32                 Input* SpawnTriaInput(int location);
    3332                Input* SpawnTriaInput(int index1,int index2,int index3);
    3433                Input* SpawnSegInput(int index1,int index2);

  • issm/trunk-jpl/src/c/classes/Inputs/ControlInput.cpp

    r17513 r17514  
    193193}/*}}}*/
    194194/*FUNCTION ControlInput::SpawnTriaInput{{{*/
    195 Input* ControlInput::SpawnTriaInput(int location){
    196         return values->SpawnTriaInput(location);
    197 }/*}}}*/
    198 /*FUNCTION ControlInput::SpawnTriaInput{{{*/
    199195Input* ControlInput::SpawnTriaInput(int index1,int index2,int index3){
    200196        return values->SpawnTriaInput(index1,index2,index3);

  • issm/trunk-jpl/src/c/classes/Inputs/ControlInput.h

    r17513 r17514  
    3838                /*ControlInput management: {{{*/
    3939                int    InstanceEnum();
    40                 Input* SpawnTriaInput(int location);
    4140                Input* SpawnTriaInput(int index1,int index2,int index3);
    4241                Input* SpawnSegInput(int index1,int index2);

  • issm/trunk-jpl/src/c/classes/Inputs/DatasetInput.cpp

    r17513 r17514  
    7676
    7777        return output;
    78 }
    79 /*}}}*/
    80 /*FUNCTION DatasetInput::SpawnTriaInput{{{*/
    81 Input* DatasetInput::SpawnTriaInput(int location){
    82 
    83         /*output*/
    84         DatasetInput* outinput=NULL;
    85 
    86         /*Create new Datasetinput (copy of current input)*/
    87         outinput=new DatasetInput();
    88         outinput->enum_type=this->enum_type;
    89         outinput->inputs=dynamic_cast<Inputs*>(this->inputs->SpawnTriaInputs(location));
    90         outinput->numids=this->numids;
    91         outinput->ids=xNew<int>(this->numids);
    92         xMemCpy(outinput->ids,this->ids,this->numids);
    93 
    94         /*Assign output*/
    95         return outinput;
    9678}
    9779/*}}}*/

  • issm/trunk-jpl/src/c/classes/Inputs/DatasetInput.h

    r17513 r17514  
    3636                void   AddInput(Input* input,int id);
    3737                int    InstanceEnum();
    38                 Input* SpawnTriaInput(int location);
    3938                Input* SpawnTriaInput(int index1,int index2,int index3);
    4039                Input* SpawnSegInput(int index1,int index2);

  • issm/trunk-jpl/src/c/classes/Inputs/DoubleInput.cpp

    r17513 r17514  
    7070/*}}}*/
    7171/*FUNCTION DoubleInput::SpawnTriaInput{{{*/
    72 Input* DoubleInput::SpawnTriaInput(int location){
    73 
    74         /*output*/
    75         DoubleInput* outinput=new DoubleInput();
    76 
    77         /*only copy current value*/
    78         outinput->enum_type=this->enum_type;
    79         outinput->value=this->value;
    80 
    81         /*Assign output*/
    82         return outinput;
    83 
    84 }
    85 /*}}}*/
    86 /*FUNCTION DoubleInput::SpawnTriaInput{{{*/
    8772Input* DoubleInput::SpawnTriaInput(int index1,int index2,int index3){
    8873

  • issm/trunk-jpl/src/c/classes/Inputs/DoubleInput.h

    r17513 r17514  
    3333                /*DoubleInput management: {{{*/
    3434                int   InstanceEnum();
    35                 Input* SpawnTriaInput(int location);
    3635                Input* SpawnTriaInput(int index1,int index2,int index3);
    3736                Input* SpawnSegInput(int index1,int index2);

  • issm/trunk-jpl/src/c/classes/Inputs/Input.h

    r17513 r17514  
    5454                virtual void   GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist)=0;
    5555
    56                 virtual Input* SpawnTriaInput(int location)=0;
    5756                virtual Input* SpawnTriaInput(int index1,int index2,int index3)=0;
    5857                virtual Input* SpawnSegInput(int index1,int index2)=0;

  • issm/trunk-jpl/src/c/classes/Inputs/Inputs.cpp

    r17513 r17514  
    370370/*}}}*/
    371371/*FUNCTION Inputs::SpawnTriaInputs{{{*/
    372 Inputs* Inputs::SpawnTriaInputs(int location){
    373 
    374         /*Intermediary*/
    375         vector<Object*>::iterator object;
    376         Input* inputin=NULL;
    377         Input* inputout=NULL;
    378 
    379         /*Output*/
    380         Inputs* newinputs=new Inputs();
    381 
    382         /*Go through inputs and call Spawn function*/
    383         for ( object=objects.begin() ; object < objects.end(); object++ ){
    384 
    385                 /*Create new input*/
    386                 inputin=dynamic_cast<Input*>(*object);
    387                 inputout=inputin->SpawnTriaInput(location);
    388 
    389                 /*Add input to new inputs*/
    390                 newinputs->AddObject(inputout);
    391         }
    392 
    393         /*Assign output pointer*/
    394         return newinputs;
    395 }
    396 /*}}}*/
    397 /*FUNCTION Inputs::SpawnTriaInputs{{{*/
    398372Inputs* Inputs::SpawnTriaInputs(int index1,int index2,int index3){
    399373

  • issm/trunk-jpl/src/c/classes/Inputs/IntInput.cpp

    r17513 r17514  
    6767        return this->enum_type;
    6868
    69 }
    70 /*}}}*/
    71 /*FUNCTION IntInput::SpawnTriaInput{{{*/
    72 Input* IntInput::SpawnTriaInput(int location){
    73 
    74         /*output*/
    75         IntInput* outinput=new IntInput();
    76 
    77         /*only copy current value*/
    78         outinput->enum_type=this->enum_type;
    79         outinput->value=this->value;
    80 
    81         /*Assign output*/
    82         return outinput;
    8369}
    8470/*}}}*/

  • issm/trunk-jpl/src/c/classes/Inputs/IntInput.h

    r17513 r17514  
    3434                /*IntInput management: {{{*/
    3535                int   InstanceEnum();
    36                 Input* SpawnTriaInput(int location);
    3736                Input* SpawnTriaInput(int index1,int index2,int index3);
    3837                Input* SpawnSegInput(int index1,int index2);

  • issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp

    r17513 r17514  
    7979        return this->enum_type;
    8080
    81 }
    82 /*}}}*/
    83 /*FUNCTION PentaInput::SpawnTriaInput{{{*/
    84 Input* PentaInput::SpawnTriaInput(int location){
    85 
    86         /*output*/
    87         TriaInput* outinput=NULL;
    88 
    89         if(this->element_type==P0Enum){
    90                 outinput=new TriaInput(this->enum_type,&this->values[0],P0Enum);
    91         }
    92         else{
    93                 /*Assume P1 interpolation only for now*/
    94                 IssmDouble newvalues[3];
    95 
    96                 /*Create array of indices depending on location (0=base 1=surface)*/
    97                 int indices[3];
    98                 switch(location){
    99                         case 0:
    100                                 indices[0] = 0;
    101                                 indices[1] = 1;
    102                                 indices[2] = 2;
    103                                 break;
    104                         case 1:
    105                                 indices[0] = 3;
    106                                 indices[1] = 4;
    107                                 indices[2] = 5;
    108                                 break;
    109                         default:
    110                                 _error_("case "<<location<<" not supported");
    111                 }
    112 
    113                 /*Create new input*/
    114                 for(int i=0;i<3;i++){
    115                         _assert_(indices[i]>=0 && indices[i]<6);
    116                         newvalues[i]=this->values[indices[i]];
    117                 }
    118                 outinput=new TriaInput(this->enum_type,&newvalues[0],P1Enum);
    119         }
    120 
    121         /*Assign output*/
    122         return outinput;
    12381}
    12482/*}}}*/

  • issm/trunk-jpl/src/c/classes/Inputs/PentaInput.h

    r17513 r17514  
    3434                /*PentaInput management*/
    3535                int   InstanceEnum();
    36                 Input* SpawnTriaInput(int location);
    3736                Input* SpawnTriaInput(int index1,int index2,int index3);
    3837                Input* SpawnSegInput(int index1,int index2);

  • issm/trunk-jpl/src/c/classes/Inputs/SegInput.h

    r17513 r17514  
    3434                /*SegInput management:*/
    3535                int    InstanceEnum();
    36                 Input* SpawnTriaInput(int location){_error_("not supported yet");};
    3736                Input* SpawnTriaInput(int index1,int index2,int index3){_error_("not supported yet");};
    3837                Input* SpawnSegInput(int index1,int index2){_error_("not implemented yet");};

  • issm/trunk-jpl/src/c/classes/Inputs/TetraInput.h

    r17513 r17514  
    3434                /*TetraInput management:*/
    3535                int    InstanceEnum();
    36                 Input* SpawnTriaInput(int location){_error_("not supported yet");};
    3736                Input* SpawnTriaInput(int index1,int index2,int index3);
    3837                Input* SpawnSegInput(int index1,int index2){_error_("not supported yet");};

  • issm/trunk-jpl/src/c/classes/Inputs/TransientInput.cpp

    r17513 r17514  
    119119
    120120        return this->enum_type;
    121 
    122 }
    123 /*}}}*/
    124 /*FUNCTION TransientInput::SpawnTriaInput{{{*/
    125 Input* TransientInput::SpawnTriaInput(int location){
    126 
    127         /*output*/
    128         TransientInput* outinput=NULL;
    129 
    130         /*Create new Transientinput (copy of current input)*/
    131         outinput=new TransientInput();
    132         outinput->enum_type=this->enum_type;
    133         outinput->numtimesteps=this->numtimesteps;
    134         outinput->timesteps=xNew<IssmDouble>(this->numtimesteps);
    135         xMemCpy(outinput->timesteps,this->timesteps,this->numtimesteps);
    136         outinput->inputs=(Inputs*)this->inputs->SpawnTriaInputs(location);
    137         outinput->parameters=this->parameters;
    138 
    139         /*Assign output*/
    140         return outinput;
    141121
    142122}

  • issm/trunk-jpl/src/c/classes/Inputs/TransientInput.h

    r17513 r17514  
    4040                /*TransientInput management: {{{*/
    4141                int    InstanceEnum();
    42                 Input* SpawnTriaInput(int location);
    4342                Input* SpawnTriaInput(int index1,int index2,int index3);
    4443                Input* SpawnSegInput(int index1,int index2);

  • issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp

    r17513 r17514  
    8282/*}}}*/
    8383/*FUNCTION TriaInput::SpawnTriaInput{{{*/
    84 Input* TriaInput::SpawnTriaInput(int location){
    85 
    86         /*output*/
    87         TriaInput* outinput=NULL;
    88 
    89         /*Create new Tria input (copy of current input)*/
    90         outinput=new TriaInput(this->enum_type,&this->values[0],this->element_type);
    91 
    92         /*Assign output*/
    93         return outinput;
    94 
    95 }
    96 /*}}}*/
    97 /*FUNCTION TriaInput::SpawnTriaInput{{{*/
    9884Input* TriaInput::SpawnTriaInput(int index1,int index2,int index3){
    9985

  • issm/trunk-jpl/src/c/classes/Inputs/TriaInput.h

    r17513 r17514  
    3434                /*TriaInput management:*/
    3535                int    InstanceEnum();
    36                 Input* SpawnTriaInput(int location);
    3736                Input* SpawnTriaInput(int index1,int index2,int index3);
    3837                Input* SpawnSegInput(int index1,int index2);
Note: See TracChangeset for help on using the changeset viewer.