Index: /issm/trunk-jpl/src/c/classes/Elements/Element.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 16915) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 16916) @@ -296,2 +296,29 @@ for(i=0;i<3;i++) epsilon[i]=epsilonvx[i]+epsilonvy[i]; }/*}}}*/ +void Element::TransformLoadVectorCoord(ElementVector* pe,int transformenum){/*{{{*/ + ::TransformLoadVectorCoord(pe,this->nodes,this->GetNumberOfNodes(),transformenum); +}/*}}}*/ +void Element::TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list){/*{{{*/ + ::TransformLoadVectorCoord(pe,this->nodes,this->GetNumberOfNodes(),transformenum_list); +}/*}}}*/ +void Element::TransformSolutionCoord(IssmDouble* values,int transformenum){/*{{{*/ + ::TransformSolutionCoord(values,this->nodes,this->GetNumberOfNodes(),transformenum); +}/*}}}*/ +void Element::TransformSolutionCoord(IssmDouble* values,int* transformenum_list){/*{{{*/ + ::TransformSolutionCoord(values,this->nodes,this->GetNumberOfNodes(),transformenum_list); +}/*}}}*/ +void Element::TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){/*{{{*/ + ::TransformSolutionCoord(values,this->nodes,numnodes,transformenum); +}/*}}}*/ +void Element::TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list){/*{{{*/ + ::TransformSolutionCoord(values,this->nodes,numnodes,transformenum_list); +}/*}}}*/ +void Element::TransformStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum){/*{{{*/ + ::TransformStiffnessMatrixCoord(Ke,this->nodes,this->GetNumberOfNodes(),transformenum); +}/*}}}*/ +void Element::TransformStiffnessMatrixCoord(ElementMatrix* Ke,int* transformenum_list){/*{{{*/ + ::TransformStiffnessMatrixCoord(Ke,this->nodes,this->GetNumberOfNodes(),transformenum_list); +}/*}}}*/ +void Element::TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes_list,int numnodes,int* transformenum_list){/*{{{*/ + ::TransformStiffnessMatrixCoord(Ke,nodes_list,numnodes,transformenum_list); +}/*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Elements/Element.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 16915) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 16916) @@ -73,4 +73,17 @@ void ViscosityHODerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon); void ViscosityFSDerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon); + void TransformLoadVectorCoord(ElementVector* pe,int transformenum); + void TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list); + void TransformLoadVectorCoord(ElementVector* pe,int numnodes,int transformenum){_error_("not implemented yet");}; /*Tiling only*/ + void TransformLoadVectorCoord(ElementVector* pe,int numnodes,int* transformenum_list){_error_("not implemented yet");}; /*Tiling only*/ + void TransformSolutionCoord(IssmDouble* values,int transformenum); + void TransformSolutionCoord(IssmDouble* values,int* transformenum_list); + void TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum); + void TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list); + void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum); + void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int* transformenum_list); + void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int transformenum); + void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int* transformenum_list){_error_("not implemented yet");}; /*Tiling only*/ + void TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes_list,int numnodes,int* transformenum_list); /*Virtual functions*/ @@ -101,17 +114,5 @@ virtual void NormalBase(IssmDouble* normal,IssmDouble* xyz_list)=0; virtual IssmDouble PureIceEnthalpy(IssmDouble pressure)=0; - virtual void TransformLoadVectorCoord(ElementVector* pe,int transformenum)=0; - virtual void TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list)=0; - virtual void TransformLoadVectorCoord(ElementVector* pe,int numnodes,int transformenum)=0; - virtual void TransformLoadVectorCoord(ElementVector* pe,int numnodes,int* transformenum_list)=0; - virtual void TransformSolutionCoord(IssmDouble* values,int transformenum)=0; - virtual void TransformSolutionCoord(IssmDouble* values,int* transformenum_list)=0; - virtual void TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum)=0; - virtual void TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list)=0; - virtual void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum)=0; - virtual void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int* transformenum_list)=0; - virtual void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int transformenum)=0; - virtual void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int* transformenum_list)=0; - virtual void TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes_list,int numnodes,int* transformenum_list)=0; + virtual Element* GetBasalElement(void)=0; virtual void GetDofList(int** pdoflist,int approximation_enum,int setenum)=0; Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 16915) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 16916) @@ -3095,67 +3095,4 @@ return dt; }/*}}}*/ -/*FUNCTION Penta::TransformLoadVectorCoord(ElementVector* pe,int transformenum){{{*/ -void Penta::TransformLoadVectorCoord(ElementVector* pe,int transformenum){ - - ::TransformLoadVectorCoord(pe,this->nodes,this->NumberofNodes(),transformenum); - -} -/*}}}*/ -/*FUNCTION Penta::TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list){{{*/ -void Penta::TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list){ - - ::TransformLoadVectorCoord(pe,this->nodes,this->NumberofNodes(),transformenum_list); - -} -/*}}}*/ -/*FUNCTION Penta::TransformSolutionCoord(IssmDouble* values,int transformenum){{{*/ -void Penta::TransformSolutionCoord(IssmDouble* values,int transformenum){ - - ::TransformSolutionCoord(values,this->nodes,this->NumberofNodes(),transformenum); - -} -/*}}}*/ -/*FUNCTION Penta::TransformSolutionCoord(IssmDouble* values,int* transformenum_list){{{*/ -void Penta::TransformSolutionCoord(IssmDouble* values,int* transformenum_list){ - - ::TransformSolutionCoord(values,this->nodes,this->NumberofNodes(),transformenum_list); - -} -/*}}}*/ -/*FUNCTION Penta::TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){{{*/ -void Penta::TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){ - - ::TransformSolutionCoord(values,this->nodes,numnodes,transformenum); - -} -/*}}}*/ -/*FUNCTION Penta::TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list){{{*/ -void Penta::TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list){ - - ::TransformSolutionCoord(values,this->nodes,numnodes,transformenum_list); - -} -/*}}}*/ -/*FUNCTION Penta::TransformStiffnessMatrixCoord(ElementMatrix* pe,int transformenum){{{*/ -void Penta::TransformStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum){ - - ::TransformStiffnessMatrixCoord(Ke,this->nodes,this->NumberofNodes(),transformenum); - -} -/*}}}*/ -/*FUNCTION Penta::TransformStiffnessMatrixCoord(ElementMatrix* pe,int* transformenum_list){{{*/ -void Penta::TransformStiffnessMatrixCoord(ElementMatrix* Ke,int* transformenum_list){ - - ::TransformStiffnessMatrixCoord(Ke,this->nodes,this->NumberofNodes(),transformenum_list); - -} -/*}}}*/ -/*FUNCTION Penta::TransformStiffnessMatrixCoord(ElementMatrix* pe,Node** nodes_list,int numnodesint* transformenum_list){{{*/ -void Penta::TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes_list,int numnodes,int* transformenum_list){ - - ::TransformStiffnessMatrixCoord(Ke,nodes_list,numnodes,transformenum_list); - -} -/*}}}*/ /*FUNCTION Penta::Update {{{*/ void Penta::Update(int index,IoModel* iomodel,int analysis_counter,int analysis_type,int finiteelement_type){ Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 16915) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 16916) @@ -265,17 +265,4 @@ Tria* SpawnTria(int location); IssmDouble StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa); - void TransformLoadVectorCoord(ElementVector* pe,int transformenum); - void TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list); - void TransformLoadVectorCoord(ElementVector* pe,int numnodes,int transformenum){_error_("not implemented yet");}; /*Tiling only*/ - void TransformLoadVectorCoord(ElementVector* pe,int numnodes,int* transformenum_list){_error_("not implemented yet");};/*Tiling only*/ - void TransformSolutionCoord(IssmDouble* values,int transformenum); - void TransformSolutionCoord(IssmDouble* values,int* transformenum_list); - void TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum); /*Tiling only*/ - void TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list);/*Tiling only*/ - void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum); - void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int* transformenum_list); - void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int transformenum){_error_("not implemented yet");}; - void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int* transformenum_list){_error_("not implemented yet");}; - void TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes_list,int numnodes,int* transformenum_list); #ifdef _HAVE_STRESSBALANCE_ Index: /issm/trunk-jpl/src/c/classes/Elements/Seg.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Seg.h (revision 16915) +++ /issm/trunk-jpl/src/c/classes/Elements/Seg.h (revision 16916) @@ -185,17 +185,4 @@ void Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finitelement){_error_("not implemented yet");}; IssmDouble TimeAdapt(){_error_("not implemented yet");}; - void TransformLoadVectorCoord(ElementVector* pe,int transformenum){_error_("not implemented yet");}; - void TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list){_error_("not implemented yet");}; - void TransformLoadVectorCoord(ElementVector* pe,int numnodes,int transformenum){_error_("not implemented yet");}; - void TransformLoadVectorCoord(ElementVector* pe,int numnodes,int* transformenum_list){_error_("not implemented yet");}; - void TransformSolutionCoord(IssmDouble* values,int transformenum){_error_("not implemented yet");}; - void TransformSolutionCoord(IssmDouble* values,int* transformenum_list){_error_("not implemented yet");}; - void TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){_error_("not implemented yet");}; - void TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list){_error_("not implemented yet");}; - void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum){_error_("not implemented yet");}; - void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int* transformenum_list){_error_("not implemented yet");}; - void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int transformenum){_error_("not implemented yet");}; - void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int* transformenum_list){_error_("not implemented yet");}; - void TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes_list,int numnodes,int* transformenum_list){_error_("not implemented yet");}; void UpdateConstraintsExtrudeFromBase(){_error_("not implemented");}; void UpdateConstraintsExtrudeFromTop(){_error_("not implemented");}; Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 16915) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 16916) @@ -2798,46 +2798,4 @@ return dt; -} -/*}}}*/ -/*FUNCTION Tria::TransformSolutionCoord(IssmDouble* values,int transformenum){{{*/ -void Tria::TransformSolutionCoord(IssmDouble* values,int transformenum){ - - ::TransformSolutionCoord(values,this->nodes,this->NumberofNodes(),transformenum); - -} -/*}}}*/ -/*FUNCTION Tria::TransformSolutionCoord(IssmDouble* values,int* transformenum_list){{{*/ -void Tria::TransformSolutionCoord(IssmDouble* values,int* transformenum_list){ - - ::TransformSolutionCoord(values,this->nodes,this->NumberofNodes(),transformenum_list); - -} -/*}}}*/ -/*FUNCTION Tria::TransformLoadVectorCoord(ElementVector* pe,int transformenum){{{*/ -void Tria::TransformLoadVectorCoord(ElementVector* pe,int transformenum){ - - ::TransformLoadVectorCoord(pe,this->nodes,this->NumberofNodes(),transformenum); - -} -/*}}}*/ -/*FUNCTION Tria::TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list){{{*/ -void Tria::TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list){ - - ::TransformLoadVectorCoord(pe,this->nodes,this->NumberofNodes(),transformenum_list); - -} -/*}}}*/ -/*FUNCTION Tria::TransformStiffnessMatrixCoord(ElementMatrix* pe,int transformenum){{{*/ -void Tria::TransformStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum){ - - ::TransformStiffnessMatrixCoord(Ke,this->nodes,this->NumberofNodes(),transformenum); - -} -/*}}}*/ -/*FUNCTION Tria::TransformStiffnessMatrixCoord(ElementMatrix* pe,int* transformenum_list){{{*/ -void Tria::TransformStiffnessMatrixCoord(ElementMatrix* Ke,int* transformenum_list){ - - ::TransformStiffnessMatrixCoord(Ke,this->nodes,this->NumberofNodes(),transformenum_list); - } /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 16915) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 16916) @@ -295,17 +295,4 @@ Seg* SpawnSeg(int index1,int index2); IssmDouble StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa){_error_("not implemented yet");}; - void TransformLoadVectorCoord(ElementVector* pe,int transformenum); - void TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list); - void TransformLoadVectorCoord(ElementVector* pe,int numnodes,int transformenum){_error_("not implemented yet");}; - void TransformLoadVectorCoord(ElementVector* pe,int numnodes,int* transformenum_list){_error_("not implemented yet");}; - void TransformSolutionCoord(IssmDouble* values,int transformenum); - void TransformSolutionCoord(IssmDouble* values,int* transformenum_list); - void TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){_error_("not implemented yet");}; - void TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list){_error_("not implemented yet");}; - void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum); - void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int* transformenum_list); - void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int transformenum){_error_("not implemented yet");}; - void TransformStiffnessMatrixCoord(ElementMatrix* Ke,int numnodes,int* transformenum_list){_error_("not implemented yet");}; - void TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes_list,int numnodes,int* transformenum_list){_error_("not implemented yet");}; void ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){_error_("not implemented yet");};