source: issm/oecreview/Archive/17984-18295/ISSM-18142-18143.diff@ 18296

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

Added 17984-18295
File size: 2.0 KB
RevLine 
[18296]1Index: ../trunk-jpl/src/c/classes/Elements/TetraRef.cpp
2===================================================================
3--- ../trunk-jpl/src/c/classes/Elements/TetraRef.cpp (revision 18142)
4+++ ../trunk-jpl/src/c/classes/Elements/TetraRef.cpp (revision 18143)
5@@ -353,6 +353,7 @@
6 case MINIcondensedEnum: return NUMNODESP1b+NUMNODESP1;
7 case MINIEnum: return NUMNODESP1b+NUMNODESP1;
8 case TaylorHoodEnum: return NUMNODESP2+NUMNODESP1;
9+ case XTaylorHoodEnum: return NUMNODESP2+NUMNODESP1;
10 default: _error_("Element type "<<EnumToStringx(finiteelement)<<" not supported yet");
11 }
12
13@@ -367,13 +368,14 @@
14 case MINIcondensedEnum: return P1bubbleEnum;
15 case MINIEnum: return P1bubbleEnum;
16 case TaylorHoodEnum: return P2Enum;
17+ case XTaylorHoodEnum: return P2Enum;
18 default: _error_("Element type "<<EnumToStringx(fe_stokes)<<" not supported yet");
19 }
20
21 return -1;
22 }
23 /*}}}*/
24-int TetraRef::PressureInterpolation(int fe_stokes){/*{{{*/
25+int TetraRef::PressureInterpolation(int fe_stokes){/*{{{*/
26
27 switch(fe_stokes){
28 case P1P1Enum: return P1Enum;
29@@ -381,6 +383,7 @@
30 case MINIcondensedEnum: return P1Enum;
31 case MINIEnum: return P1Enum;
32 case TaylorHoodEnum: return P1Enum;
33+ case XTaylorHoodEnum: return P1Enum;
34 default: _error_("Element type "<<EnumToStringx(fe_stokes)<<" not supported yet");
35 }
36
37Index: ../trunk-jpl/src/c/classes/Elements/Tetra.cpp
38===================================================================
39--- ../trunk-jpl/src/c/classes/Elements/Tetra.cpp (revision 18142)
40+++ ../trunk-jpl/src/c/classes/Elements/Tetra.cpp (revision 18143)
41@@ -843,6 +843,7 @@
42 tetra_node_ids[8]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofelements+iomodel->elements[4*index+3];
43 break;
44 case TaylorHoodEnum:
45+ case XTaylorHoodEnum:
46 numnodes = 14;
47 tetra_node_ids = xNew<int>(numnodes);
48 tetra_node_ids[0]=iomodel->nodecounter+iomodel->elements[4*index+0];
Note: See TracBrowser for help on using the repository browser.