source: issm/oecreview/Archive/23390-24306/ISSM-23702-23703.diff

Last change on this file was 24307, checked in by Mathieu Morlighem, 5 years ago

NEW: adding Archive/23390-24306
File size: 1.5 KB
RevLine 
[24307]1Index: ../trunk-jpl/src/m/classes/matdamageice.py
2===================================================================
3--- ../trunk-jpl/src/m/classes/matdamageice.py (revision 23702)
4+++ ../trunk-jpl/src/m/classes/matdamageice.py (revision 23703)
5@@ -100,7 +100,7 @@
6 self.temperateiceconductivity=0.24
7
8 #computation of effective conductivity
9- self.effectiveconductivity_averaging=2
10+ self.effectiveconductivity_averaging=1
11
12 #the melting point of ice at 1 atmosphere of pressure in K
13 self.meltingpoint=273.15
14Index: ../trunk-jpl/src/m/classes/matestar.py
15===================================================================
16--- ../trunk-jpl/src/m/classes/matestar.py (revision 23702)
17+++ ../trunk-jpl/src/m/classes/matestar.py (revision 23703)
18@@ -104,7 +104,7 @@
19 self.temperateiceconductivity=.24
20
21 #computation of effective conductivity
22- self.effectiveconductivity_averaging=2
23+ self.effectiveconductivity_averaging=1
24
25 #the melting point of ice at 1 atmosphere of pressure in K
26 self.meltingpoint=273.15
27Index: ../trunk-jpl/src/m/classes/matenhancedice.py
28===================================================================
29--- ../trunk-jpl/src/m/classes/matenhancedice.py (revision 23702)
30+++ ../trunk-jpl/src/m/classes/matenhancedice.py (revision 23703)
31@@ -101,7 +101,7 @@
32 self.temperateiceconductivity=0.24
33
34 #computation of effective conductivity
35- self.effectiveconductivity_averaging=2
36+ self.effectiveconductivity_averaging=1
37
38 #the melting point of ice at 1 atmosphere of pressure in K
39 self.meltingpoint=273.15
Note: See TracBrowser for help on using the repository browser.