[26740] | 1 | Index: ../trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp (revision 26459)
|
---|
| 4 | +++ ../trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp (revision 26460)
|
---|
| 5 | @@ -359,8 +359,8 @@
|
---|
| 6 | IssmDouble g = element->FindParam(ConstantsGEnum);
|
---|
| 7 | IssmDouble e_v = element->FindParam(HydrologyEnglacialVoidRatioEnum);
|
---|
| 8 | Input* hr_input = element->GetInput(HydrologyBumpHeightEnum);_assert_(hr_input);
|
---|
| 9 | - Input* vx_input = element->GetInput(VxEnum);_assert_(vx_input);
|
---|
| 10 | - Input* vy_input = element->GetInput(VyEnum);_assert_(vy_input);
|
---|
| 11 | + Input* vx_input = element->GetInput(VxBaseEnum);_assert_(vx_input);
|
---|
| 12 | + Input* vy_input = element->GetInput(VyBaseEnum);_assert_(vy_input);
|
---|
| 13 | Input* h_input = element->GetInput(HydrologySheetThicknessEnum);_assert_(h_input);
|
---|
| 14 | Input* H_input = element->GetInput(ThicknessEnum); _assert_(H_input);
|
---|
| 15 | Input* b_input = element->GetInput(BedEnum); _assert_(b_input);
|
---|
| 16 | @@ -494,8 +494,8 @@
|
---|
| 17 | IssmDouble rho_water = element->FindParam(MaterialsRhoFreshwaterEnum);
|
---|
| 18 | IssmDouble g = element->FindParam(ConstantsGEnum);
|
---|
| 19 | Input* hr_input = element->GetInput(HydrologyBumpHeightEnum);_assert_(hr_input);
|
---|
| 20 | - Input* vx_input = element->GetInput(VxEnum);_assert_(vx_input);
|
---|
| 21 | - Input* vy_input = element->GetInput(VyEnum);_assert_(vy_input);
|
---|
| 22 | + Input* vx_input = element->GetInput(VxBaseEnum);_assert_(vx_input);
|
---|
| 23 | + Input* vy_input = element->GetInput(VyBaseEnum);_assert_(vy_input);
|
---|
| 24 | Input* H_input = element->GetInput(ThicknessEnum); _assert_(H_input);
|
---|
| 25 | Input* b_input = element->GetInput(BedEnum); _assert_(b_input);
|
---|
| 26 | Input* hold_input = element->GetInput(HydrologySheetThicknessOldEnum);_assert_(hold_input);
|
---|