source: issm/oecreview/Archive/16554-17801/ISSM-16774-16775.diff@ 17802

Last change on this file since 17802 was 17802, checked in by Mathieu Morlighem, 11 years ago

Added archives
File size: 6.3 KB
RevLine 
[17802]1Index: ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp
2===================================================================
3--- ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 16774)
4+++ ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 16775)
5@@ -1171,8 +1171,8 @@
6 for(i=0;i<numdofFSp;i++) FSvalues[numdofFSv+i]=solution[doflistFSp[i]];
7
8 /*Transform solution in Cartesian Space*/
9- element->TransformSolutionCoord(FSvalues,cs_list);
10- element->TransformSolutionCoord(HOvalues,XYEnum);
11+ element->TransformSolutionCoord(FSvalues,2*numnodes,cs_list);
12+ element->TransformSolutionCoord(HOvalues,numnodes,XYEnum);
13
14 /*Ok, we have vx and vy in values, fill in vx and vy arrays: */
15 for(i=0;i<numnodes;i++){
16Index: ../trunk-jpl/src/c/classes/Elements/Element.h
17===================================================================
18--- ../trunk-jpl/src/c/classes/Elements/Element.h (revision 16774)
19+++ ../trunk-jpl/src/c/classes/Elements/Element.h (revision 16775)
20@@ -52,6 +52,8 @@
21 virtual IssmDouble GetMaterialParameter(int enum_in)=0;
22 virtual void TransformSolutionCoord(IssmDouble* values,int transformenum)=0;
23 virtual void TransformSolutionCoord(IssmDouble* values,int* transformenum_list)=0;
24+ virtual void TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum)=0;
25+ virtual void TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list)=0;
26 virtual Element* GetBasalElement(void)=0;
27 virtual void GetDofList(int** pdoflist,int approximation_enum,int setenum)=0;
28 virtual void GetDofListVelocity(int** pdoflist,int setenum)=0;
29Index: ../trunk-jpl/src/c/classes/Elements/Tria.h
30===================================================================
31--- ../trunk-jpl/src/c/classes/Elements/Tria.h (revision 16774)
32+++ ../trunk-jpl/src/c/classes/Elements/Tria.h (revision 16775)
33@@ -272,6 +272,8 @@
34 void SurfaceNormal(IssmDouble* surface_normal, IssmDouble xyz_list[3][3]);
35 void TransformSolutionCoord(IssmDouble* values,int transformenum);
36 void TransformSolutionCoord(IssmDouble* values,int* transformenum_list);
37+ void TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){_error_("not implemented yet");};
38+ void TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list){_error_("not implemented yet");};
39 #ifdef _HAVE_STRESSBALANCE_
40 ElementMatrix* CreateKMatrixStressbalanceSSA(void);
41 ElementMatrix* CreateKMatrixStressbalanceSSAViscous(void);
42Index: ../trunk-jpl/src/c/classes/Elements/Penta.cpp
43===================================================================
44--- ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 16774)
45+++ ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 16775)
46@@ -2015,8 +2015,6 @@
47 else if (original_input->ObjectEnum()==DoubleInputEnum)
48 total_integrated_input=new DoubleInput(average_enum_type,0.0);
49 else{
50- printf("id %i \n",this->id);
51- printf("enum %i \n",average_enum_type);
52 _error_("object " << EnumToStringx(original_input->ObjectEnum()) << " not supported yet");
53 }
54 }
55@@ -3328,20 +3326,34 @@
56
57 return dt;
58 }/*}}}*/
59-/*FUNCTION Penta::TransformSolutionCoord{{{*/
60+/*FUNCTION Penta::TransformSolutionCoord(IssmDouble* values,int transformenum){{{*/
61 void Penta::TransformSolutionCoord(IssmDouble* values,int transformenum){
62
63 ::TransformSolutionCoord(values,this->nodes,this->NumberofNodes(),transformenum);
64
65 }
66 /*}}}*/
67-/*FUNCTION Penta::TransformSolutionCoord{{{*/
68+/*FUNCTION Penta::TransformSolutionCoord(IssmDouble* values,int* transformenum_list){{{*/
69 void Penta::TransformSolutionCoord(IssmDouble* values,int* transformenum_list){
70
71 ::TransformSolutionCoord(values,this->nodes,this->NumberofNodes(),transformenum_list);
72
73 }
74 /*}}}*/
75+/*FUNCTION Penta::TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){{{*/
76+void Penta::TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){
77+
78+ ::TransformSolutionCoord(values,this->nodes,numnodes,transformenum);
79+
80+}
81+/*}}}*/
82+/*FUNCTION Penta::TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list){{{*/
83+void Penta::TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list){
84+
85+ ::TransformSolutionCoord(values,this->nodes,numnodes,transformenum_list);
86+
87+}
88+/*}}}*/
89 /*FUNCTION Penta::Update {{{*/
90 void Penta::Update(int index,IoModel* iomodel,int analysis_counter,int analysis_type,int finiteelement_type){
91
92Index: ../trunk-jpl/src/c/classes/Elements/Penta.h
93===================================================================
94--- ../trunk-jpl/src/c/classes/Elements/Penta.h (revision 16774)
95+++ ../trunk-jpl/src/c/classes/Elements/Penta.h (revision 16775)
96@@ -248,6 +248,8 @@
97 void SurfaceNormal(IssmDouble* surface_normal, IssmDouble xyz_list[3][3]);
98 void TransformSolutionCoord(IssmDouble* values,int transformenum);
99 void TransformSolutionCoord(IssmDouble* values,int* transformenum_list);
100+ void TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum); /*Tiling only*/
101+ void TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list);/*Tiling only*/
102
103 #ifdef _HAVE_STRESSBALANCE_
104 ElementMatrix* CreateKMatrixCouplingSSAHO(void);
105Index: ../trunk-jpl/src/c/classes/Elements/Seg.h
106===================================================================
107--- ../trunk-jpl/src/c/classes/Elements/Seg.h (revision 16774)
108+++ ../trunk-jpl/src/c/classes/Elements/Seg.h (revision 16775)
109@@ -153,6 +153,8 @@
110 IssmDouble TimeAdapt(){_error_("not implemented yet");};
111 void TransformSolutionCoord(IssmDouble* values,int transformenum){_error_("not implemented yet");};
112 void TransformSolutionCoord(IssmDouble* values,int* transformenum_list){_error_("not implemented yet");};
113+ void TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){_error_("not implemented yet");};
114+ void TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list){_error_("not implemented yet");};
115 void UpdateConstraintsExtrudeFromBase(){_error_("not implemented");};
116 void UpdateConstraintsExtrudeFromTop(){_error_("not implemented");};
117 void UpdateConstraintsL2ProjectionEPL(){_error_("not implemented");};
Note: See TracBrowser for help on using the repository browser.