[25834] | 1 | Index: ../trunk-jpl/src/c/analyses/HydrologyShaktiAnalysis.cpp
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/c/analyses/HydrologyShaktiAnalysis.cpp (revision 25391)
|
---|
| 4 | +++ ../trunk-jpl/src/c/analyses/HydrologyShaktiAnalysis.cpp (revision 25392)
|
---|
| 5 | @@ -470,7 +470,7 @@
|
---|
| 6 | /*Intermediaries */
|
---|
| 7 | IssmDouble newgap = 0.;
|
---|
| 8 | IssmDouble Jdet,meltrate,G,dh[2],B,A,n,dt;
|
---|
| 9 | - IssmDouble gap,bed,thickness,head,ieb;
|
---|
| 10 | + IssmDouble gap,bed,thickness,head;
|
---|
| 11 | IssmDouble lr,br,vx,vy,beta;
|
---|
| 12 | IssmDouble alpha2,frictionheat;
|
---|
| 13 | IssmDouble* xyz_list = NULL;
|
---|
| 14 | @@ -492,7 +492,6 @@
|
---|
| 15 | Input* base_input = element->GetInput(BaseEnum); _assert_(base_input);
|
---|
| 16 | Input* B_input = element->GetInput(MaterialsRheologyBEnum); _assert_(B_input);
|
---|
| 17 | Input* n_input = element->GetInput(MaterialsRheologyNEnum); _assert_(n_input);
|
---|
| 18 | - Input* englacial_input = element->GetInput(HydrologyEnglacialInputEnum); _assert_(englacial_input);
|
---|
| 19 | Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input);
|
---|
| 20 | Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input);
|
---|
| 21 | Input* lr_input = element->GetInput(HydrologyBumpSpacingEnum); _assert_(lr_input);
|
---|
| 22 | @@ -521,7 +520,6 @@
|
---|
| 23 | gap_input->GetInputValue(&gap,gauss);
|
---|
| 24 | head_input->GetInputValue(&head,gauss);
|
---|
| 25 | head_input->GetInputDerivativeValue(&dh[0],xyz_list,gauss);
|
---|
| 26 | - englacial_input->GetInputValue(&ieb,gauss);
|
---|
| 27 | lr_input->GetInputValue(&lr,gauss);
|
---|
| 28 | br_input->GetInputValue(&br,gauss);
|
---|
| 29 | vx_input->GetInputValue(&vx,gauss);
|
---|