source: issm/oecreview/Archive/23390-24306/ISSM-23698-23699.diff

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

NEW: adding Archive/23390-24306
File size: 8.4 KB
RevLine 
[24307]1Index: ../trunk-jpl/src/m/classes/matice.py
2===================================================================
3--- ../trunk-jpl/src/m/classes/matice.py (revision 23698)
4+++ ../trunk-jpl/src/m/classes/matice.py (revision 23699)
5@@ -52,7 +52,7 @@
6 string="%s\n%s"%(string,fielddisplay(self,"heatcapacity","heat capacity [J/kg/K]"))
7 string="%s\n%s"%(string,fielddisplay(self,"thermalconductivity","ice thermal conductivity [W/m/K]"))
8 string="%s\n%s"%(string,fielddisplay(self,"temperateiceconductivity","temperate ice thermal conductivity [W/m/K]"))
9- string="%s\n%s"%(string,fielddisplay(self,"effectiveconductivity_averaging","computation of effective conductivity: (0) arithmetic mean, (1) harmonic mean, (2) geometric mean (default)")
10+ string="%s\n%s"%(string,fielddisplay(self,"effectiveconductivity_averaging","computation of effective conductivity: (0) arithmetic mean, (1) harmonic mean, (2) geometric mean (default)"))
11 string="%s\n%s"%(string,fielddisplay(self,"meltingpoint","melting point of ice at 1atm in K"))
12 string="%s\n%s"%(string,fielddisplay(self,"latentheat","latent heat of fusion [J/m^3]"))
13 string="%s\n%s"%(string,fielddisplay(self,"beta","rate of change of melting point with pressure [K/Pa]"))
14@@ -158,7 +158,7 @@
15 WriteData(fid,prefix,'object',self,'class','materials','fieldname','latentheat','format','Double')
16 WriteData(fid,prefix,'object',self,'class','materials','fieldname','thermalconductivity','format','Double')
17 WriteData(fid,prefix,'object',self,'class','materials','fieldname','temperateiceconductivity','format','Double')
18- WriteData(fid,prefix,'object',self,'class','materials','fieldname','effectiveconductivity_averaging','format','Integer');
19+ WriteData(fid,prefix,'object',self,'class','materials','fieldname','effectiveconductivity_averaging','format','Integer')
20 WriteData(fid,prefix,'object',self,'class','materials','fieldname','meltingpoint','format','Double')
21 WriteData(fid,prefix,'object',self,'class','materials','fieldname','beta','format','Double')
22 WriteData(fid,prefix,'object',self,'class','materials','fieldname','mixed_layer_capacity','format','Double')
23Index: ../trunk-jpl/src/m/classes/matestar.py
24===================================================================
25--- ../trunk-jpl/src/m/classes/matestar.py (revision 23698)
26+++ ../trunk-jpl/src/m/classes/matestar.py (revision 23699)
27@@ -54,7 +54,7 @@
28 string="%s\n%s"%(string,fielddisplay(self,'heatcapacity','heat capacity [J/kg/K]'))
29 string="%s\n%s"%(string,fielddisplay(self,'thermalconductivity',['ice thermal conductivity [W/m/K]']))
30 string="%s\n%s"%(string,fielddisplay(self,'temperateiceconductivity','temperate ice thermal conductivity [W/m/K]'))
31- string="%s\n%s"%(string,fielddisplay(self,"effectiveconductivity_averaging","computation of effective conductivity: (0) arithmetic mean, (1) harmonic mean, (2) geometric mean (default)")
32+ string="%s\n%s"%(string,fielddisplay(self,"effectiveconductivity_averaging","computation of effective conductivity: (0) arithmetic mean, (1) harmonic mean, (2) geometric mean (default)"))
33 string="%s\n%s"%(string,fielddisplay(self,'meltingpoint','melting point of ice at 1atm in K'))
34 string="%s\n%s"%(string,fielddisplay(self,'latentheat','latent heat of fusion [J/kg]'))
35 string="%s\n%s"%(string,fielddisplay(self,'beta','rate of change of melting point with pressure [K/Pa]'))
36@@ -164,7 +164,7 @@
37 WriteData(fid,prefix,'object',self,'class','materials','fieldname','latentheat','format','Double')
38 WriteData(fid,prefix,'object',self,'class','materials','fieldname','thermalconductivity','format','Double')
39 WriteData(fid,prefix,'object',self,'class','materials','fieldname','temperateiceconductivity','format','Double')
40- WriteData(fid,prefix,'object',self,'class','materials','fieldname','effectiveconductivity_averaging','format','Integer');
41+ WriteData(fid,prefix,'object',self,'class','materials','fieldname','effectiveconductivity_averaging','format','Integer')
42 WriteData(fid,prefix,'object',self,'class','materials','fieldname','meltingpoint','format','Double')
43 WriteData(fid,prefix,'object',self,'class','materials','fieldname','beta','format','Double')
44 WriteData(fid,prefix,'object',self,'class','materials','fieldname','mixed_layer_capacity','format','Double')
45Index: ../trunk-jpl/src/m/classes/matdamageice.py
46===================================================================
47--- ../trunk-jpl/src/m/classes/matdamageice.py (revision 23698)
48+++ ../trunk-jpl/src/m/classes/matdamageice.py (revision 23699)
49@@ -51,7 +51,7 @@
50 string="%s\n%s"%(string,fielddisplay(self,"heatcapacity","heat capacity [J/kg/K]"))
51 string="%s\n%s"%(string,fielddisplay(self,"thermalconductivity","ice thermal conductivity [W/m/K]"))
52 string="%s\n%s"%(string,fielddisplay(self,"temperateiceconductivity","temperate ice thermal conductivity [W/m/K]"))
53- string="%s\n%s"%(string,fielddisplay(self,"effectiveconductivity_averaging","computation of effective conductivity: (0) arithmetic mean, (1) harmonic mean, (2) geometric mean (default)")
54+ string="%s\n%s"%(string,fielddisplay(self,"effectiveconductivity_averaging","computation of effective conductivity: (0) arithmetic mean, (1) harmonic mean, (2) geometric mean (default)"))
55 string="%s\n%s"%(string,fielddisplay(self,"meltingpoint","melting point of ice at 1atm in K"))
56 string="%s\n%s"%(string,fielddisplay(self,"latentheat","latent heat of fusion [J/m^3]"))
57 string="%s\n%s"%(string,fielddisplay(self,"beta","rate of change of melting point with pressure [K/Pa]"))
58@@ -157,7 +157,7 @@
59 WriteData(fid,prefix,'object',self,'class','materials','fieldname','latentheat','format','Double')
60 WriteData(fid,prefix,'object',self,'class','materials','fieldname','thermalconductivity','format','Double')
61 WriteData(fid,prefix,'object',self,'class','materials','fieldname','temperateiceconductivity','format','Double')
62- WriteData(fid,prefix,'object',self,'class','materials','fieldname','effectiveconductivity_averaging','format','Integer');
63+ WriteData(fid,prefix,'object',self,'class','materials','fieldname','effectiveconductivity_averaging','format','Integer')
64 WriteData(fid,prefix,'object',self,'class','materials','fieldname','meltingpoint','format','Double')
65 WriteData(fid,prefix,'object',self,'class','materials','fieldname','beta','format','Double')
66 WriteData(fid,prefix,'object',self,'class','materials','fieldname','mixed_layer_capacity','format','Double')
67Index: ../trunk-jpl/src/m/classes/matenhancedice.py
68===================================================================
69--- ../trunk-jpl/src/m/classes/matenhancedice.py (revision 23698)
70+++ ../trunk-jpl/src/m/classes/matenhancedice.py (revision 23699)
71@@ -51,7 +51,7 @@
72 string="%s\n%s"%(string,fielddisplay(self,"heatcapacity","heat capacity [J/kg/K]"))
73 string="%s\n%s"%(string,fielddisplay(self,"thermalconductivity","ice thermal conductivity [W/m/K]"))
74 string="%s\n%s"%(string,fielddisplay(self,"temperateiceconductivity","temperate ice thermal conductivity [W/m/K]"))
75- string="%s\n%s"%(string,fielddisplay(self,"effectiveconductivity_averaging","computation of effective conductivity: (0) arithmetic mean, (1) harmonic mean, (2) geometric mean (default)")
76+ string="%s\n%s"%(string,fielddisplay(self,"effectiveconductivity_averaging","computation of effective conductivity: (0) arithmetic mean, (1) harmonic mean, (2) geometric mean (default)"))
77 string="%s\n%s"%(string,fielddisplay(self,"meltingpoint","melting point of ice at 1atm in K"))
78 string="%s\n%s"%(string,fielddisplay(self,"latentheat","latent heat of fusion [J/m^3]"))
79 string="%s\n%s"%(string,fielddisplay(self,"beta","rate of change of melting point with pressure [K/Pa]"))
80@@ -160,7 +160,7 @@
81 WriteData(fid,prefix,'object',self,'class','materials','fieldname','latentheat','format','Double')
82 WriteData(fid,prefix,'object',self,'class','materials','fieldname','thermalconductivity','format','Double')
83 WriteData(fid,prefix,'object',self,'class','materials','fieldname','temperateiceconductivity','format','Double')
84- WriteData(fid,prefix,'object',self,'class','materials','fieldname','effectiveconductivity_averaging','format','Integer');
85+ WriteData(fid,prefix,'object',self,'class','materials','fieldname','effectiveconductivity_averaging','format','Integer')
86 WriteData(fid,prefix,'object',self,'class','materials','fieldname','meltingpoint','format','Double')
87 WriteData(fid,prefix,'object',self,'class','materials','fieldname','beta','format','Double')
88 WriteData(fid,prefix,'object',self,'class','materials','fieldname','mixed_layer_capacity','format','Double')
Note: See TracBrowser for help on using the repository browser.