source: issm/oecreview/Archive/15392-16133/ISSM-15898-15899.diff@ 16134

Last change on this file since 16134 was 16134, checked in by Mathieu Morlighem, 12 years ago

Added Archive/15392-16133
File size: 2.9 KB
RevLine 
[16134]1Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
2===================================================================
3--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15898)
4+++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15899)
5@@ -6493,8 +6493,7 @@
6 int stabilization;
7 int dim;
8 IssmDouble Jdettria,D_scalar,dt,h;
9- IssmDouble vel,vx,vy,dvxdx,dvydy;
10- IssmDouble dvx[2],dvy[2];
11+ IssmDouble vel,vx,vy;
12 IssmDouble xyz_list[NUMVERTICES][3];
13
14 /*Fetch number of nodes for this finite element*/
15@@ -6526,8 +6525,6 @@
16
17 vx_input->GetInputValue(&vx,gauss);
18 vy_input->GetInputValue(&vy,gauss);
19- vx_input->GetInputDerivativeValue(&dvx[0],&xyz_list[0][0],gauss);
20- vy_input->GetInputDerivativeValue(&dvy[0],&xyz_list[0][0],gauss);
21
22 D_scalar=gauss->weight*Jdettria;
23
24@@ -6539,8 +6536,6 @@
25 GetBMasstransport(B,&xyz_list[0][0],gauss);
26 GetBprimeMasstransport(Bprime,&xyz_list[0][0],gauss);
27
28- dvxdx=dvx[0];
29- dvydy=dvy[1];
30 D_scalar=dt*gauss->weight*Jdettria;
31
32 D[0][0]=D_scalar*vx;
33@@ -6596,8 +6591,7 @@
34 int stabilization;
35 int dim;
36 IssmDouble Jdettria,D_scalar,dt,h;
37- IssmDouble vel,vx,vy,dvxdx,dvydy;
38- IssmDouble dvx[2],dvy[2];
39+ IssmDouble vel,vx,vy;
40 IssmDouble xyz_list[NUMVERTICES][3];
41
42 /*Fetch number of nodes for this finite element*/
43@@ -6629,8 +6623,6 @@
44
45 vx_input->GetInputValue(&vx,gauss);
46 vy_input->GetInputValue(&vy,gauss);
47- vx_input->GetInputDerivativeValue(&dvx[0],&xyz_list[0][0],gauss);
48- vy_input->GetInputDerivativeValue(&dvy[0],&xyz_list[0][0],gauss);
49
50 D_scalar=gauss->weight*Jdettria;
51
52@@ -6642,8 +6634,6 @@
53 GetBMasstransport(B,&xyz_list[0][0],gauss);
54 GetBprimeMasstransport(Bprime,&xyz_list[0][0],gauss);
55
56- dvxdx=dvx[0];
57- dvydy=dvy[1];
58 D_scalar=dt*gauss->weight*Jdettria;
59
60 D[0][0]=D_scalar*vx;
61@@ -6819,7 +6809,7 @@
62 this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
63 Input* vz_input = inputs->GetInput(VzEnum); _assert_(vz_input);
64 Input* ms_input = inputs->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(ms_input);
65- Input* surface_input= inputs->GetInput(ThicknessEnum); _assert_(surface_input);
66+ Input* surface_input= inputs->GetInput(SurfaceEnum); _assert_(surface_input);
67
68 /*Initialize mb_correction to 0, do not forget!:*/
69 /* Start looping on the number of gaussian points: */
70@@ -6831,6 +6821,7 @@
71 GetJacobianDeterminant(&Jdettria, &xyz_list[0][0],gauss);
72 GetNodalFunctions(basis,gauss);
73
74+ vz_input->GetInputValue(&vz,gauss);
75 ms_input->GetInputValue(&ms,gauss);
76 surface_input->GetInputValue(&surface,gauss);
77
78@@ -6876,6 +6867,7 @@
79 GetJacobianDeterminant(&Jdettria, &xyz_list[0][0],gauss);
80 GetNodalFunctions(basis,gauss);
81
82+ vz_input->GetInputValue(&vz,gauss);
83 mb_input->GetInputValue(&mb,gauss);
84 bed_input->GetInputValue(&bed,gauss);
85 if(mb_correction_input)
Note: See TracBrowser for help on using the repository browser.