Changeset 16916


Ignore:
Timestamp:
11/24/13 18:08:19 (11 years ago)
Author:
Mathieu Morlighem
Message:

CHG: moved more stuff from Tria to Element.cpp

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

Legend:

Unmodified
Added
Removed

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

    r16915 r16916  
    296296        for(i=0;i<3;i++) epsilon[i]=epsilonvx[i]+epsilonvy[i];
    297297}/*}}}*/
     298void Element::TransformLoadVectorCoord(ElementVector* pe,int transformenum){/*{{{*/
     299        ::TransformLoadVectorCoord(pe,this->nodes,this->GetNumberOfNodes(),transformenum);
     300}/*}}}*/
     301void Element::TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list){/*{{{*/
     302        ::TransformLoadVectorCoord(pe,this->nodes,this->GetNumberOfNodes(),transformenum_list);
     303}/*}}}*/
     304void Element::TransformSolutionCoord(IssmDouble* values,int transformenum){/*{{{*/
     305        ::TransformSolutionCoord(values,this->nodes,this->GetNumberOfNodes(),transformenum);
     306}/*}}}*/
     307void Element::TransformSolutionCoord(IssmDouble* values,int* transformenum_list){/*{{{*/
     308        ::TransformSolutionCoord(values,this->nodes,this->GetNumberOfNodes(),transformenum_list);
     309}/*}}}*/
     310void Element::TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){/*{{{*/
     311        ::TransformSolutionCoord(values,this->nodes,numnodes,transformenum);
     312}/*}}}*/
     313void Element::TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list){/*{{{*/
     314        ::TransformSolutionCoord(values,this->nodes,numnodes,transformenum_list);
     315}/*}}}*/
     316void Element::TransformStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum){/*{{{*/
     317        ::TransformStiffnessMatrixCoord(Ke,this->nodes,this->GetNumberOfNodes(),transformenum);
     318}/*}}}*/
     319void Element::TransformStiffnessMatrixCoord(ElementMatrix* Ke,int* transformenum_list){/*{{{*/
     320        ::TransformStiffnessMatrixCoord(Ke,this->nodes,this->GetNumberOfNodes(),transformenum_list);
     321}/*}}}*/
     322void Element::TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes_list,int numnodes,int* transformenum_list){/*{{{*/
     323        ::TransformStiffnessMatrixCoord(Ke,nodes_list,numnodes,transformenum_list);
     324}/*}}}*/

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

    r16915 r16916  
    7373                void       ViscosityHODerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon);
    7474                void       ViscosityFSDerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon);
     75                void       TransformLoadVectorCoord(ElementVector* pe,int transformenum);
     76                void       TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list);
     77                void       TransformLoadVectorCoord(ElementVector* pe,int numnodes,int transformenum){_error_("not implemented yet");};      /*Tiling only*/
     78                void       TransformLoadVectorCoord(ElementVector* pe,int numnodes,int* transformenum_list){_error_("not implemented yet");};      /*Tiling only*/
     79                void       TransformSolutionCoord(IssmDouble* values,int transformenum);
     80                void       TransformSolutionCoord(IssmDouble* values,int* transformenum_list);
     81                void       TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum);
     82                void       TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list);
     83                void       TransformStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum);
     84                void       TransformStiffnessMatrixCoord(ElementMatrix* Ke,int* transformenum_list);
     85                void       TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int transformenum);
     86                void       TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int* transformenum_list){_error_("not implemented yet");};      /*Tiling only*/
     87                void       TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes_list,int numnodes,int* transformenum_list);
    7588
    7689                /*Virtual functions*/
    … …  
    101114                virtual void   NormalBase(IssmDouble* normal,IssmDouble* xyz_list)=0;
    102115                virtual IssmDouble PureIceEnthalpy(IssmDouble pressure)=0;
    103                 virtual void   TransformLoadVectorCoord(ElementVector* pe,int transformenum)=0;
    104                 virtual void   TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list)=0;
    105                 virtual void   TransformLoadVectorCoord(ElementVector* pe,int numnodes,int transformenum)=0;
    106                 virtual void   TransformLoadVectorCoord(ElementVector* pe,int numnodes,int* transformenum_list)=0;
    107                 virtual void   TransformSolutionCoord(IssmDouble* values,int transformenum)=0;
    108                 virtual void   TransformSolutionCoord(IssmDouble* values,int* transformenum_list)=0;
    109                 virtual void   TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum)=0;
    110                 virtual void   TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list)=0;
    111                 virtual void   TransformStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum)=0;
    112                 virtual void   TransformStiffnessMatrixCoord(ElementMatrix* Ke,int* transformenum_list)=0;
    113                 virtual void   TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int transformenum)=0;
    114                 virtual void   TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int* transformenum_list)=0;
    115                 virtual void   TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes_list,int numnodes,int* transformenum_list)=0;
     116
    116117                virtual Element* GetBasalElement(void)=0;
    117118                virtual void    GetDofList(int** pdoflist,int approximation_enum,int setenum)=0;

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

    r16915 r16916  
    30953095        return dt;
    30963096}/*}}}*/
    3097 /*FUNCTION Penta::TransformLoadVectorCoord(ElementVector* pe,int transformenum){{{*/
    3098 void Penta::TransformLoadVectorCoord(ElementVector* pe,int transformenum){
    3099 
    3100         ::TransformLoadVectorCoord(pe,this->nodes,this->NumberofNodes(),transformenum);
    3101 
    3102 }
    3103 /*}}}*/
    3104 /*FUNCTION Penta::TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list){{{*/
    3105 void Penta::TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list){
    3106 
    3107         ::TransformLoadVectorCoord(pe,this->nodes,this->NumberofNodes(),transformenum_list);
    3108 
    3109 }
    3110 /*}}}*/
    3111 /*FUNCTION Penta::TransformSolutionCoord(IssmDouble* values,int transformenum){{{*/
    3112 void Penta::TransformSolutionCoord(IssmDouble* values,int transformenum){
    3113 
    3114         ::TransformSolutionCoord(values,this->nodes,this->NumberofNodes(),transformenum);
    3115 
    3116 }
    3117 /*}}}*/
    3118 /*FUNCTION Penta::TransformSolutionCoord(IssmDouble* values,int* transformenum_list){{{*/
    3119 void Penta::TransformSolutionCoord(IssmDouble* values,int* transformenum_list){
    3120 
    3121         ::TransformSolutionCoord(values,this->nodes,this->NumberofNodes(),transformenum_list);
    3122 
    3123 }
    3124 /*}}}*/
    3125 /*FUNCTION Penta::TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){{{*/
    3126 void Penta::TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){
    3127 
    3128         ::TransformSolutionCoord(values,this->nodes,numnodes,transformenum);
    3129 
    3130 }
    3131 /*}}}*/
    3132 /*FUNCTION Penta::TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list){{{*/
    3133 void Penta::TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list){
    3134 
    3135         ::TransformSolutionCoord(values,this->nodes,numnodes,transformenum_list);
    3136 
    3137 }
    3138 /*}}}*/
    3139 /*FUNCTION Penta::TransformStiffnessMatrixCoord(ElementMatrix* pe,int transformenum){{{*/
    3140 void Penta::TransformStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum){
    3141 
    3142         ::TransformStiffnessMatrixCoord(Ke,this->nodes,this->NumberofNodes(),transformenum);
    3143 
    3144 }
    3145 /*}}}*/
    3146 /*FUNCTION Penta::TransformStiffnessMatrixCoord(ElementMatrix* pe,int* transformenum_list){{{*/
    3147 void Penta::TransformStiffnessMatrixCoord(ElementMatrix* Ke,int* transformenum_list){
    3148 
    3149         ::TransformStiffnessMatrixCoord(Ke,this->nodes,this->NumberofNodes(),transformenum_list);
    3150 
    3151 }
    3152 /*}}}*/
    3153 /*FUNCTION Penta::TransformStiffnessMatrixCoord(ElementMatrix* pe,Node** nodes_list,int numnodesint* transformenum_list){{{*/
    3154 void Penta::TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes_list,int numnodes,int* transformenum_list){
    3155 
    3156         ::TransformStiffnessMatrixCoord(Ke,nodes_list,numnodes,transformenum_list);
    3157 
    3158 }
    3159 /*}}}*/
    31603097/*FUNCTION Penta::Update {{{*/
    31613098void Penta::Update(int index,IoModel* iomodel,int analysis_counter,int analysis_type,int finiteelement_type){

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

    r16915 r16916  
    265265                Tria*            SpawnTria(int location);
    266266                IssmDouble     StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa);
    267                 void           TransformLoadVectorCoord(ElementVector* pe,int transformenum);
    268                 void           TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list);
    269                 void           TransformLoadVectorCoord(ElementVector* pe,int numnodes,int transformenum){_error_("not implemented yet");};      /*Tiling only*/
    270                 void           TransformLoadVectorCoord(ElementVector* pe,int numnodes,int* transformenum_list){_error_("not implemented yet");};/*Tiling only*/
    271                 void           TransformSolutionCoord(IssmDouble* values,int transformenum);
    272                 void           TransformSolutionCoord(IssmDouble* values,int* transformenum_list);
    273                 void           TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum);      /*Tiling only*/
    274                 void           TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list);/*Tiling only*/
    275                 void           TransformStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum);
    276                 void           TransformStiffnessMatrixCoord(ElementMatrix* Ke,int* transformenum_list);
    277                 void           TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int transformenum){_error_("not implemented yet");};
    278                 void           TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int* transformenum_list){_error_("not implemented yet");};
    279                 void           TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes_list,int numnodes,int* transformenum_list);
    280267
    281268                #ifdef _HAVE_STRESSBALANCE_

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

    r16915 r16916  
    185185                void        Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finitelement){_error_("not implemented yet");};
    186186                IssmDouble  TimeAdapt(){_error_("not implemented yet");};
    187                 void        TransformLoadVectorCoord(ElementVector* pe,int transformenum){_error_("not implemented yet");};
    188                 void        TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list){_error_("not implemented yet");};
    189                 void        TransformLoadVectorCoord(ElementVector* pe,int numnodes,int transformenum){_error_("not implemented yet");};
    190                 void        TransformLoadVectorCoord(ElementVector* pe,int numnodes,int* transformenum_list){_error_("not implemented yet");};
    191                 void        TransformSolutionCoord(IssmDouble* values,int transformenum){_error_("not implemented yet");};
    192                 void        TransformSolutionCoord(IssmDouble* values,int* transformenum_list){_error_("not implemented yet");};
    193                 void        TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){_error_("not implemented yet");};
    194                 void        TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list){_error_("not implemented yet");};
    195                 void        TransformStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum){_error_("not implemented yet");};
    196                 void        TransformStiffnessMatrixCoord(ElementMatrix* Ke,int* transformenum_list){_error_("not implemented yet");};
    197                 void        TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int transformenum){_error_("not implemented yet");};
    198                 void        TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int* transformenum_list){_error_("not implemented yet");};
    199                 void        TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes_list,int numnodes,int* transformenum_list){_error_("not implemented yet");};
    200187                void UpdateConstraintsExtrudeFromBase(){_error_("not implemented");};
    201188                void UpdateConstraintsExtrudeFromTop(){_error_("not implemented");};

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

    r16915 r16916  
    27982798
    27992799        return dt;
    2800 }
    2801 /*}}}*/
    2802 /*FUNCTION Tria::TransformSolutionCoord(IssmDouble* values,int transformenum){{{*/
    2803 void Tria::TransformSolutionCoord(IssmDouble* values,int transformenum){
    2804 
    2805         ::TransformSolutionCoord(values,this->nodes,this->NumberofNodes(),transformenum);
    2806 
    2807 }
    2808 /*}}}*/
    2809 /*FUNCTION Tria::TransformSolutionCoord(IssmDouble* values,int* transformenum_list){{{*/
    2810 void Tria::TransformSolutionCoord(IssmDouble* values,int* transformenum_list){
    2811 
    2812         ::TransformSolutionCoord(values,this->nodes,this->NumberofNodes(),transformenum_list);
    2813 
    2814 }
    2815 /*}}}*/
    2816 /*FUNCTION Tria::TransformLoadVectorCoord(ElementVector* pe,int transformenum){{{*/
    2817 void Tria::TransformLoadVectorCoord(ElementVector* pe,int transformenum){
    2818 
    2819         ::TransformLoadVectorCoord(pe,this->nodes,this->NumberofNodes(),transformenum);
    2820 
    2821 }
    2822 /*}}}*/
    2823 /*FUNCTION Tria::TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list){{{*/
    2824 void Tria::TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list){
    2825 
    2826         ::TransformLoadVectorCoord(pe,this->nodes,this->NumberofNodes(),transformenum_list);
    2827 
    2828 }
    2829 /*}}}*/
    2830 /*FUNCTION Tria::TransformStiffnessMatrixCoord(ElementMatrix* pe,int transformenum){{{*/
    2831 void Tria::TransformStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum){
    2832 
    2833         ::TransformStiffnessMatrixCoord(Ke,this->nodes,this->NumberofNodes(),transformenum);
    2834 
    2835 }
    2836 /*}}}*/
    2837 /*FUNCTION Tria::TransformStiffnessMatrixCoord(ElementMatrix* pe,int* transformenum_list){{{*/
    2838 void Tria::TransformStiffnessMatrixCoord(ElementMatrix* Ke,int* transformenum_list){
    2839 
    2840         ::TransformStiffnessMatrixCoord(Ke,this->nodes,this->NumberofNodes(),transformenum_list);
    2841 
    28422800}
    28432801/*}}}*/

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

    r16915 r16916  
    295295                Seg*             SpawnSeg(int index1,int index2);
    296296                IssmDouble     StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa){_error_("not implemented yet");};
    297                 void           TransformLoadVectorCoord(ElementVector* pe,int transformenum);
    298                 void           TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list);
    299                 void           TransformLoadVectorCoord(ElementVector* pe,int numnodes,int transformenum){_error_("not implemented yet");};
    300                 void           TransformLoadVectorCoord(ElementVector* pe,int numnodes,int* transformenum_list){_error_("not implemented yet");};
    301                 void           TransformSolutionCoord(IssmDouble* values,int transformenum);
    302                 void           TransformSolutionCoord(IssmDouble* values,int* transformenum_list);
    303                 void           TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){_error_("not implemented yet");};
    304                 void           TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list){_error_("not implemented yet");};
    305                 void           TransformStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum);
    306                 void           TransformStiffnessMatrixCoord(ElementMatrix* Ke,int* transformenum_list);
    307                 void           TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int transformenum){_error_("not implemented yet");};
    308                 void           TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int* transformenum_list){_error_("not implemented yet");};
    309                 void           TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes_list,int numnodes,int* transformenum_list){_error_("not implemented yet");};
    310297                void           ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){_error_("not implemented yet");};
    311298
Note: See TracChangeset for help on using the changeset viewer.