source: issm/oecreview/Archive/21724-22754/ISSM-22351-22352.diff@ 22755

Last change on this file since 22755 was 22755, checked in by Mathieu Morlighem, 7 years ago

CHG: added 21724-22754
File size: 5.9 KB
RevLine 
[22755]1Index: ../trunk-jpl/src/m/classes/esa.m
2===================================================================
3--- ../trunk-jpl/src/m/classes/esa.m (revision 22351)
4+++ ../trunk-jpl/src/m/classes/esa.m (revision 22352)
5@@ -43,6 +43,7 @@
6 md = checkfield(md,'fieldname','esa.deltathickness','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]);
7 md = checkfield(md,'fieldname','esa.love_h','NaN',1,'Inf',1);
8 md = checkfield(md,'fieldname','esa.love_l','NaN',1,'Inf',1);
9+ md = checkfield(md,'fieldname','esa.hemisphere','NaN',1,'Inf',1);
10 md = checkfield(md,'fieldname','esa.degacc','size',[1 1],'>=',1e-10);
11 md = checkfield(md,'fieldname','esa.requested_outputs','stringrow',1);
12
13Index: ../trunk-jpl/src/m/classes/esa.py
14===================================================================
15--- ../trunk-jpl/src/m/classes/esa.py (revision 22351)
16+++ ../trunk-jpl/src/m/classes/esa.py (revision 22352)
17@@ -17,6 +17,7 @@
18 self.deltathickness = float('NaN')
19 self.love_h = 0 #provided by PREM model()
20 self.love_l = 0 #ideam
21+ self.hemisphere = 0
22 self.degacc = 0
23 self.requested_outputs = []
24 self.transitions = []
25@@ -29,6 +30,7 @@
26 string="%s\n%s"%(string,fielddisplay(self,'deltathickness','thickness change: ice height equivalent [m]'))
27 string="%s\n%s"%(string,fielddisplay(self,'love_h','load Love number for radial displacement'))
28 string="%s\n%s"%(string,fielddisplay(self,'love_l','load Love number for horizontal displaements'))
29+ string="%s\n%s"%(string,fielddisplay(self,'hemisphere','North-south, East-west components of 2-D horiz displacement vector: -1 south, 1 north'))
30 string="%s\n%s"%(string,fielddisplay(self,'degacc','accuracy (default .01 deg) for numerical discretization of the Green''s functions'))
31 string="%s\n%s"%(string,fielddisplay(self,'transitions','indices into parts of the mesh that will be icecaps'))
32 string="%s\n%s"%(string,fielddisplay(self,'requested_outputs','additional outputs requested (default: EsaUmotion)'))
33@@ -39,7 +41,10 @@
34
35 #numerical discretization accuracy
36 self.degacc=.01
37-
38+
39+ #computational flags:
40+ self.hemisphere=0;
41+
42 #output default:
43 self.requested_outputs=['default']
44
45@@ -59,6 +64,7 @@
46 md = checkfield(md,'fieldname','esa.deltathickness','NaN',1,'Inf',1,'size',[md.mesh.numberofelements,1])
47 md = checkfield(md,'fieldname','esa.love_h','NaN',1,'Inf',1)
48 md = checkfield(md,'fieldname','esa.love_l','NaN',1,'Inf',1)
49+ md = checkfield(md,'fieldname','esa.hemisphere','NaN',1,'Inf',1)
50 md = checkfield(md,'fieldname','esa.degacc','size',[1,1],'>=',1e-10)
51 md = checkfield(md,'fieldname','esa.requested_outputs','stringrow',1)
52
53@@ -74,6 +80,7 @@
54 WriteData(fid,prefix,'object',self,'fieldname','deltathickness','format','DoubleMat','mattype',2)
55 WriteData(fid,prefix,'object',self,'fieldname','love_h','format','DoubleMat','mattype',1)
56 WriteData(fid,prefix,'object',self,'fieldname','love_l','format','DoubleMat','mattype',1)
57+ WriteData(fid,prefix,'object',self,'fieldname','hemisphere','format','Integer')
58 WriteData(fid,prefix,'object',self,'fieldname','degacc','format','Double')
59 WriteData(fid,prefix,'object',self,'fieldname','transitions','format','MatArray')
60
61Index: ../trunk-jpl/src/m/classes/esa.js
62===================================================================
63--- ../trunk-jpl/src/m/classes/esa.js (revision 22351)
64+++ ../trunk-jpl/src/m/classes/esa.js (revision 22352)
65@@ -9,7 +9,10 @@
66
67 //numerical discretization accuracy
68 this.degacc=.01;
69-
70+
71+ //computational flags:
72+ this.hemisphere=0;
73+
74 //output default:
75 this.requested_outputs=['default'];
76
77@@ -25,6 +28,7 @@
78 md = checkfield(md,'fieldname','esa.deltathickness','NaN',1,'Inf',1,'size',[md.mesh.numberofelements, 1]);
79 md = checkfield(md,'fieldname','esa.love_h','NaN',1,'Inf',1);
80 md = checkfield(md,'fieldname','esa.love_l','NaN',1,'Inf',1);
81+ md = checkfield(md,'fieldname','esa.hemisphere','NaN',1,'Inf',1);
82 md = checkfield(md,'fieldname','esa.degacc','size',[1, 1],'>=',1e-10);
83 md = checkfield(md,'fieldname','esa.requested_outputs','stringrow',1);
84
85@@ -47,6 +51,7 @@
86 fielddisplay(this,'deltathickness','thickness change: ice height equivalent [m]');
87 fielddisplay(this,'love_h','load Love number for radial displacement');
88 fielddisplay(this,'love_l','load Love number for horizontal displacements');
89+ fielddisplay(this,'hemisphere','North-south, East-west components of 2-D horiz displacement vector: -1 south, 1 north');
90 fielddisplay(this,'degacc',"accuracy (default .01 deg) for numerical discretization of the Green's functions");
91 fielddisplay(this,'transitions','indices into parts of the mesh that will be icecaps');
92 fielddisplay(this,'requested_outputs','additional outputs requested (default: EsaUmotion)');
93@@ -56,6 +61,7 @@
94 WriteData(fid,prefix,'object',this,'fieldname','deltathickness','format','DoubleMat','mattype',2);
95 WriteData(fid,prefix,'object',this,'fieldname','love_h','format','DoubleMat','mattype',1);
96 WriteData(fid,prefix,'object',this,'fieldname','love_l','format','DoubleMat','mattype',1);
97+ WriteData(fid,prefix,'object',this,'fieldname','hemisphere','format','Integer');
98 WriteData(fid,prefix,'object',this,'fieldname','degacc','format','Double');
99 WriteData(fid,prefix,'object',this,'fieldname','transitions','format','MatArray');
100
101@@ -74,6 +80,7 @@
102 this.deltathickness=NullFix(this.deltathickness,NaN);
103 this.love_h=NullFix(this.love_h,NaN);
104 this.love_l=NullFix(this.love_l,NaN);
105+ this.hemisphere=NullFix(this.hemisphere,NaN);
106 this.degacc=NullFix(this.degacc,NaN);
107 }//}}}
108 //properties
109@@ -81,6 +88,7 @@
110 this.deltathickness = NaN;
111 this.love_h = 0; //provided by PREM model
112 this.love_l = 0; //idam
113+ this.hemisphere = 0;
114 this.degacc = 0;
115 this.requested_outputs = [];
116 this.transitions = [];
Note: See TracBrowser for help on using the repository browser.