source: issm/oecreview/Archive/17802-17983/ISSM-17949-17950.diff

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

New release
File size: 3.2 KB
RevLine 
[17986]1Index: ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp
2===================================================================
3--- ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 17949)
4+++ ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 17950)
5@@ -415,11 +415,13 @@
6 transfer=0.0;
7 }
8 else{
9- transfer=(epl_specificstoring*epl_thickness*sediment_transmitivity)/(sediment_thickness*leakage);
10+ transfer=(sediment_transmitivity)/(sediment_thickness*leakage);
11+ // transfer=(epl_specificstoring*epl_thickness*sediment_transmitivity)/(sediment_thickness*leakage);
12 }
13 }
14 else{
15- transfer=(sediment_storing*sediment_transmitivity)/(sediment_thickness*leakage);
16+ transfer=(sediment_transmitivity)/(sediment_thickness*leakage);
17+ // transfer=(sediment_storing*sediment_transmitivity)/(sediment_thickness*leakage);
18 }
19 break;
20 default:
21@@ -466,11 +468,13 @@
22 transfer=0.0;
23 }
24 else{
25- transfer=(epl_specificstoring*epl_thickness*sediment_transmitivity*sediment_head)/(sediment_thickness*leakage);
26+ transfer=(sediment_transmitivity*sediment_head)/(sediment_thickness*leakage);
27+ // transfer=(epl_specificstoring*epl_thickness*sediment_transmitivity*sediment_head)/(sediment_thickness*leakage);
28 }
29 }
30 else{
31- transfer=(sediment_storing*sediment_transmitivity*sediment_head)/(sediment_thickness*leakage);
32+ transfer=(sediment_transmitivity*sediment_head)/(sediment_thickness*leakage);
33+ // transfer=(sediment_storing*sediment_transmitivity*sediment_head)/(sediment_thickness*leakage);
34 }
35 break;
36 default:
37Index: ../trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp
38===================================================================
39--- ../trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 17949)
40+++ ../trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 17950)
41@@ -607,11 +607,13 @@
42 transfer=0.0;
43 }
44 else{
45- transfer=(epl_specificstoring*epl_thickness*sediment_transmitivity)/(sediment_thickness*leakage);
46+ transfer=(sediment_transmitivity)/(sediment_thickness*leakage);
47+ // transfer=(epl_specificstoring*epl_thickness*sediment_transmitivity)/(sediment_thickness*leakage);
48 }
49 }
50 else{
51- transfer=(sediment_storing*sediment_transmitivity)/(sediment_thickness*leakage);
52+ transfer=(sediment_transmitivity)/(sediment_thickness*leakage);
53+ // transfer=(sediment_storing*sediment_transmitivity)/(sediment_thickness*leakage);
54 }
55 break;
56 default:
57@@ -662,11 +664,13 @@
58 transfer=0.0;
59 }
60 else{
61- transfer=(epl_specificstoring*epl_thickness*sediment_transmitivity*epl_head)/(sediment_thickness*leakage);
62+ transfer=(sediment_transmitivity*epl_head)/(sediment_thickness*leakage);
63+ // transfer=(epl_specificstoring*epl_thickness*sediment_transmitivity*epl_head)/(sediment_thickness*leakage);
64 }
65 }
66 else{
67- transfer=(sediment_storing*sediment_transmitivity*epl_head)/(sediment_thickness*leakage);
68+ transfer=(sediment_transmitivity*epl_head)/(sediment_thickness*leakage);
69+ // transfer=(sediment_storing*sediment_transmitivity*epl_head)/(sediment_thickness*leakage);
70 }
71 break;
72 default:
Note: See TracBrowser for help on using the repository browser.