source: issm/oecreview/Archive/16554-17801/ISSM-17683-17684.diff

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

Added archives
File size: 2.7 KB
RevLine 
[17802]1Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
2===================================================================
3--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17683)
4+++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17684)
5@@ -170,7 +170,7 @@
6 ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
7
8 /*Retrieve all inputs we will be needing: */
9- this->FindParam(&meshxdim,MeshTypeEnum);
10+ this->FindParam(&meshxdim,MeshXDimEnum);
11 if(meshxdim==Mesh2DhorizontalEnum) _error_("stress tensor calculation not supported for mesh of type " <<EnumToStringx(meshxdim)<<", extrude mesh or call ComputeDeviatoricStressTensor");
12 Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input);
13 Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input);
14@@ -223,7 +223,7 @@
15 ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
16
17 /*Retrieve all inputs we will be needing: */
18- this->FindParam(&meshxdim,MeshTypeEnum);
19+ this->FindParam(&meshxdim,MeshXDimEnum);
20 if(meshxdim!=Mesh2DhorizontalEnum) _error_("deviatoric stress tensor calculation not implemented for mesh of type " <<EnumToStringx(meshxdim));
21 Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input);
22 Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input);
23Index: ../trunk-jpl/src/c/classes/Elements/Element.cpp
24===================================================================
25--- ../trunk-jpl/src/c/classes/Elements/Element.cpp (revision 17683)
26+++ ../trunk-jpl/src/c/classes/Elements/Element.cpp (revision 17684)
27@@ -809,27 +809,21 @@
28 input=this->inputs->GetInput(output_enum);
29 break;
30 case StressTensorxxEnum:
31- this->ComputeStressTensor();
32- input=this->inputs->GetInput(output_enum);
33- break;
34 case StressTensorxyEnum:
35- this->ComputeStressTensor();
36- input=this->inputs->GetInput(output_enum);
37- break;
38 case StressTensorxzEnum:
39- this->ComputeStressTensor();
40- input=this->inputs->GetInput(output_enum);
41- break;
42 case StressTensoryyEnum:
43- this->ComputeStressTensor();
44- input=this->inputs->GetInput(output_enum);
45- break;
46 case StressTensoryzEnum:
47+ case StressTensorzzEnum:
48 this->ComputeStressTensor();
49 input=this->inputs->GetInput(output_enum);
50 break;
51- case StressTensorzzEnum:
52- this->ComputeStressTensor();
53+ case DeviatoricStressxxEnum:
54+ case DeviatoricStressxyEnum:
55+ case DeviatoricStressxzEnum:
56+ case DeviatoricStressyyEnum:
57+ case DeviatoricStressyzEnum:
58+ case DeviatoricStresszzEnum:
59+ this->ComputeDeviatoricStressTensor();
60 input=this->inputs->GetInput(output_enum);
61 break;
62 default:
Note: See TracBrowser for help on using the repository browser.